Merge "Imported Translations from Launchpad"

author: OpenStack Jenkins <jenkins@openstack.org> 2012-05-24 02:39:15 +0000
committer: Gerrit Code Review <review@openstack.org> 2012-05-24 02:39:15 +0000
commit: bae7d8a1e8af0c0303862420ad552c05b955ccff (patch)
tree: 459e9832579e7d8db38fbf5ee82da2c120460f7e
parent: 10c5d74dcd7cddc4dcefe27180eae5eb8587b1b6 (diff)
parent: 66073a454eb6d44bf1afd33d972b0b582e46b971 (diff)
download: nova-bae7d8a1e8af0c0303862420ad552c05b955ccff.tar.gz
nova-bae7d8a1e8af0c0303862420ad552c05b955ccff.tar.xz
nova-bae7d8a1e8af0c0303862420ad552c05b955ccff.zip
19 files changed, 15396 insertions, 13737 deletions
diff --git a/nova/locale/bs/LC_MESSAGES/nova.po b/nova/locale/bs/LC_MESSAGES/nova.po
index 24cdb7b81..6218c2a95 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-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -88,7 +88,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -151,7 +151,8 @@ msgstr ""
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -211,131 +212,127 @@ msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, 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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -343,777 +340,813 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:722
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
@@ -1123,22 +1156,22 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1150,193 +1183,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1372,135 +1420,135 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1509,245 +1557,247 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
+msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
+msgid "Key pair '%s' already exists."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:736
+#: nova/api/ec2/cloud.py:712
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1283
+msgid "Unable to associate IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2399,7 +2449,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2496,19 +2546,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2633,35 +2670,36 @@ msgstr ""
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:330
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, python-format
-msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:376
+#: nova/api/openstack/compute/contrib/volumes.py:342
 #, python-format
-msgid "Instance %s is not attached."
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:482
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2847,111 +2885,119 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:199
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2966,452 +3012,495 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, python-format
 msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3471,17 +3560,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3500,17 +3589,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3528,13 +3617,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3557,6 +3648,14 @@ msgstr ""
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3589,22 +3688,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3614,17 +3713,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3723,42 +3822,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3766,41 +3865,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3808,73 +3907,73 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3885,31 +3984,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3989,36 +4088,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4035,12 +4134,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr ""
@@ -4055,42 +4154,55 @@ msgstr ""
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -4170,59 +4282,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4287,19 +4399,19 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -4322,6 +4434,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4346,11 +4473,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4416,12 +4543,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4436,12 +4563,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4554,21 +4681,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4577,19 +4704,19 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4601,12 +4728,12 @@ msgstr ""
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4856,7 +4983,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4871,7 +4998,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5000,182 +5127,170 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5185,38 +5300,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5234,17 +5349,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5372,46 +5487,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5806,35 +5921,35 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 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:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -6553,88 +6668,57 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6851,37 +6935,37 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -6992,108 +7076,108 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -8013,6 +8097,9 @@ msgstr ""
 #~ msgid "no partitions found"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index afc005282..09cc75adc 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-05-13 23:02+0000\n"
-"PO-Revision-Date: 2012-05-12 21:13+0000\n"
+"POT-Creation-Date: 2012-05-20 23:02+0000\n"
+"PO-Revision-Date: 2012-05-17 20:04+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 && "
@@ -96,7 +96,7 @@ msgstr "Vyjímka DB zabalena."
 msgid "An unknown exception occurred."
 msgstr "Vyskytla se neočekávaná výjimka."
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -159,7 +159,8 @@ msgstr "Neplatný snímek"
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Svazek %(volume_id)s není k ničemu připojen"
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr "Data páru klíčů jsou neplatná"
 
@@ -219,19 +220,15 @@ msgid "Invalid cidr %(cidr)s."
 msgstr "Neplatný cidr %(cidr)s."
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr "Neplatné znovu použití připojení RPC."
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -240,12 +237,12 @@ msgstr ""
 "Nelze provést činnost '%(action)s' na agregátu %(aggregate_id)s. Důvod: "
 "%(reason)s."
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Nebyl nalezen žádný platný hostitel. %(reason)s"
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -254,96 +251,96 @@ msgstr ""
 "Instance %(instance_uuid)s v %(attr)s %(state)s.  Nelze %(method)s "
 "zatímco je instance v tomto stavu."
 
-#: nova/exception.py:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Instance %(instance_id)s není spuštěna."
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr "Instance %(instance_id)s není pozastavena."
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, 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:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr "Server nemůže pokračovat"
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr "Nelze restartovat instanci"
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Nelze restartovat instanci"
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr "Služba je v tuto chvíli nedostupná."
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr "Služba výpočtu je v tuto chvíli nedostupná."
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, 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:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr "Cílový výpočetní hostitel je v současnosti nedostupný."
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr "Původní výpočetní hostitel je v současnosti nedostupný."
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr "Zadaný typ hypervizoru je neplatný."
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 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:373
+#: nova/exception.py:369
 #, 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:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "Zadaná cesta zařízení (%(path)s) je neplatná."
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "Zadaná cesta zařízení (%(path)s) je neplatná."
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr "Nepřijatelné informace o procesoru"
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, 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:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
@@ -352,7 +349,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:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -363,74 +360,74 @@ msgstr ""
 " fyzickým adaptérem. Očekávaný vSwitch je %(expected)s, ale spojený je "
 "%(actual)s."
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Formát disku %(disk_format)s není přijatelný"
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Obraz %(image_id)s je nepřijatelný: %(reason)s"
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "Instance %(instance_id)s je nepřijatelná: %(reason)s"
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Id Ec2 %(ec2_id)s je nepřijatelné."
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr "Zdroj nemohl být nalezen."
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr "Požadovaný příznak %(flag)s není nastaven."
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Svazek %(volume_id)s nemohl být nastaven."
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, 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:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, 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:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr "Nalezeno nula typů svazku."
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, 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:462
+#: nova/exception.py:458
 #, 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:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
@@ -439,42 +436,42 @@ msgstr ""
 "Typ svazku %(volume_type_id)s nemá žádné dodatečné parametry s klíčem "
 "%(extra_specs_key)s."
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Snímek %(snapshot_id)s nemohl být nalezen."
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, 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:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, 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:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "Źádný disk ve %(location)s"
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, 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:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Neplatný href %(image_href)s obrazu."
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
@@ -482,80 +479,80 @@ msgstr ""
 "Některé obrazy byly uloženy pomocí href. Tato verze api nepodporuje "
 "zobrazování href obrazů."
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Obraz %(image_id)s nemohl být nalezen."
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr "Kernel nenalezen v obrazu %(image_id)s."
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr "Uživatel %(user_id)s nemohl být nalezen."
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Projekt %(project_id)s nemohl být nalezen."
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, 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:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr "Role %(role_id)s nemohla být nalezena."
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr "Nelze najít SR pro čtení/zápis VDI."
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, 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:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, 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:550
+#: nova/exception.py:546
 #, 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:554
+#: nova/exception.py:550
 #, 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:558
+#: nova/exception.py:554
 #, 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:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr "Źádné sítě nejsou určeny."
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -564,190 +561,222 @@ msgstr ""
 "Buď síť uuid %(network_uuid)s není přítomna nebo je přidělena projektu "
 "%(project_id)s."
 
-#: nova/exception.py:571
+#: nova/exception.py:567
 #, 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:575
+#: nova/exception.py:571
 #, fuzzy, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr "Síť %s má aktivní porty, nelze smazat"
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 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:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "Žádná pevná IP není spojena s %(id)s."
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "Pevná ip není pro adresu %(address)s nalezena."
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr "Instance %(instance_id)s má nula pevných ip."
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, 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:600
+#: nova/exception.py:596
 #, 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:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr "Hostitel %(host)s má nula pevných ip."
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, 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:613
+#: nova/exception.py:609
 #, 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:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "Pevná IP adresa (%(address)s) je neplatná."
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr "Je dostupno nula pevných ip."
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr "Bylo nalezeno nula pevných ip."
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "Plovoucí ip není nalezena pro id %(id)s."
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, 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:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "Plovoucí ip nenalezeno pro adresu %(address)s."
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "Plovoucí ip nenalezeno pro hostitele %(host)s."
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr "Je dostupných nula plovoucích ip."
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "Plovoucí ip %(address)s je přidružena."
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "Plovoucí ip %(address)s není přidružena."
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr "Existuje nula plovoucích ip."
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Rozhraní %(interface)s nenalezeno."
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, 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:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "Certifikát %(certificate_id)s nenalezen."
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Služba %(service_id)s nemohla být nalezena."
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Hostitel %(host)s nemohl být nalezen."
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, 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:685
+#: nova/exception.py:681
 #, 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:689
+#: nova/exception.py:685
 #, 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:693
+#: nova/exception.py:689
 #, 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:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr "Kvóta nemohla být nalezena."
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, 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:705
+#: nova/exception.py:714
 #, 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:709
+#: nova/exception.py:718
+#, fuzzy, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr "Kvóta pro projekt %(project_id)s nemohla být nalezena."
+
+#: nova/exception.py:722
+#, fuzzy, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr "Uživatel %(user_id)s nemohl být nalezen."
+
+#: nova/exception.py:726
+#, fuzzy, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr "Rozšířený zdroj: %s"
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Bezpečnostní skupina %(security_group_id)s není nalezena."
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, 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:718
+#: nova/exception.py:739
 #, 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:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -756,7 +785,7 @@ msgstr ""
 "Bezpečnostní skupina %(security_group_id)s je již přidružena k instanci "
 "%(instance_id)s"
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -765,22 +794,22 @@ msgstr ""
 "Bezpečnostní skupina %(security_group_id)s není přidružena k instanci "
 "%(instance_id)s"
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Přesun %(migration_id)s nemohl být nalezen."
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, 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:741
+#: nova/exception.py:762
 #, 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:745
+#: nova/exception.py:766
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
@@ -789,17 +818,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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "Konzole %(console_id)s nemohla být nalezena."
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, 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:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
@@ -808,63 +837,63 @@ msgstr ""
 "Konzole pro instanci %(instance_id)s v zásobě %(pool_id)s nemohla být "
 "nalezena."
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr "Neplatná konzole typu %(console_type)s "
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr "Nalezeno nula typů instancí."
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, 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:776
+#: nova/exception.py:797
 #, 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:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "Konfigurace %(flavor_id)s nemohla být nalezena."
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, 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:789
+#: nova/exception.py:810
 #, 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:793
+#: nova/exception.py:814
 #, 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:798
+#: nova/exception.py:819
 #, 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:802
+#: nova/exception.py:823
 #, 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:807
+#: nova/exception.py:828
 #, 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
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
@@ -873,287 +902,292 @@ msgstr ""
 "Instance typu %(instance_type_id)s nemá žádné dodatečné specifikace s "
 "klíčem %(extra_specs_key)s."
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr "Objekt LDAP nemohl být nalezen"
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, 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:825
+#: nova/exception.py:846
 #, 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:829
+#: nova/exception.py:850
 #, 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:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "Soubor %(file_path)s nemohl být nalezen."
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr "Nalezeno nula souborů."
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, 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:846
+#: nova/exception.py:867
 #, 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:850
+#: nova/exception.py:871
 #, 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:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr "Činnost není povolena."
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr "Nelze použít globální roli %(role_id)s"
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr "Střídání není povoleno pro snímky"
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr "Parametr rotation je vyžadován pro backup image_type"
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr "Dvojice klíčů %(key_name)s již existuje."
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr "Uživatel %(user)s již existuje."
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr "LDAP uživatel %(user)s již existuje."
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr "LDAP skupina %(group)s již existuje."
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, 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:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr "Projekt %(project)s již existuje."
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Instance %(name)s již existuje."
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr "Instance typu %(name)s již existuje."
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr "Typ svazku %(name)s již existuje."
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, 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:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr "Chyba přesunu"
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Poškozené tělo zprávy: %(reason)s"
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Nelze najít nastavení v %(path)s"
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, 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:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr "Při změně velikosti ji musí instance změnit také!"
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr "Obraz je větší než typ instance povoluje"
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 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:944
+#: nova/exception.py:965
 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:948
+#: nova/exception.py:969
 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:952
+#: nova/exception.py:973
 #, 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:956
+#: nova/exception.py:977
 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:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Nebyl nalezen žádný platný hostitel. %(reason)s"
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr "Hostitel %(host)s není dostupný nebo neexistuje."
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr "Kvóta překročena"
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, 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
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, 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
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr "Překročen limit osobnostního souboru"
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr "Cesta osobnostního souboru je příliš dlouhá"
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr "Obsah osobnostního souboru je příliš dlouhý"
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+#, fuzzy, python-format
+msgid "Maximum number of key pairs exceeded"
+msgstr "Vybrán maximální počet hostitelů (%d)"
+
+#: nova/exception.py:1022
 #, 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:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "Agregát %(aggregate_id)s nemohl být nalezen."
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "Agregát %(aggregate_name)s již existuje."
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, 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:1014
+#: nova/exception.py:1039
 #, 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:1019
+#: nova/exception.py:1044
 #, 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:1023
+#: nova/exception.py:1048
 #, 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:1027
+#: nova/exception.py:1052
 #, 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:1031
+#: nova/exception.py:1056
 #, 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:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr "Nelze vytvořit typ instance"
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr "Špatná odpověď od SolidFire API"
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr "Chyba v odpovědi SolidFire API: stav=%(status)s"
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr "Chyba v odpovědi SolidFire API: data=%(data)s"
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, fuzzy, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "Zjišťěna existující vlan s id %(vlan)"
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Instance %(instance_id)s nemohla být nastavena."
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
 msgstr "Získávání obrazu %(image)s"
@@ -1163,24 +1197,24 @@ msgstr "Získávání obrazu %(image)s"
 msgid "syslog facility must be one of: %s"
 msgstr "zařízení záznamu systému musí být jedno z: %s"
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 "Přeskakování %(full_task_name)s, zbývá %(ticks_to_skip)s tiků do dalšího "
 "spuštění"
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr "Spuštění pravidelné úlohy %(full_task_name)s"
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr "Chyba při %(full_task_name)s: %(e)s"
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "Oznamování schopností plánovačům ..."
 
@@ -1192,193 +1226,208 @@ msgstr "Soubor JSON představující zásady"
 msgid "Rule checked when requested rule is not found"
 msgstr "Kontrolované pravidlo, když požadované není nalezeno"
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, 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:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr "Vytváření připojení zákazníka pro službu %s"
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr "Ukončena služba bez záznamu v databázi"
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr "Objekt databáze služby zmizel, je znovu vytvářen."
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr "Obnoveno připojení modelového serveru!"
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr "modelový server je nedostupný"
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr "Úplná sada PŘÍZNAKŮ:"
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr "%(flag)s : SADA PŽÍZNAKŮ "
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr "Získávání %s"
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, 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:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Spouštění příkazu (podproces): %s"
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr "Výsledek byl %s"
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r selhalo. Opakování."
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Spouštění příkazu (SSH): %s"
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr "Prostředí není podporováno přes SSH"
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr "process_input není podporován přes SSH"
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr "ladění ve zpětném volání: %s"
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Adresa místního spojení nenalezena.: %s"
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, 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:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Neplatná podpůrná vrstva: %s"
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr "podpůrná vrstva: %s"
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr "v opakujícím volání"
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, 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:864
+#: nova/utils.py:764
 #, 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:868
+#: nova/utils.py:768
 #, 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:875
+#: nova/utils.py:775
 #, 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:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Očekáván objekt typu: %s"
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Neplatný  server_string: %s"
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' trvalo %(total_time).2f sek"
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, fuzzy, python-format
 msgid "Reloading cached file %s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr "Třída %(fullname)s je zastaralá: %(msg)s"
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr "Třída %(fullname)s je zastaralá"
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, 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:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr "Funkce %(name)s v %(location)s je zastaralá"
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Nelze odstranit kontejner: %s"
@@ -1414,21 +1463,21 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr "%(code)s: %(message)s"
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr "Obalovačchyb: %s"
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr "Příliš mnoho ověření selhalo."
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1437,114 +1486,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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr "Podpis není zadán"
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr "Přístupový klíč není zadán"
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr "Chyba při komunikaci s keystone"
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Selhání ověření: %s"
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, 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:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr "činnost: %s"
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\thod: %(value)s"
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, 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:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "Vyvoláno InstanceNenalezena: %s"
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "Vyvoláno SvazekNenalezen: %s"
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr "Vyvoláno SnímekNenalzen: %s"
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "Vyvoláno Nenalezeno: %s"
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr "Vyvoláno ChybaApiEC2: %s"
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr "Vyvoláno DvojiceKlíčůExistuje: %s"
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr "Vyvoláno NeplatnáHodnotaParametru: %s"
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr "Vyvoláno NeplatnýROzsahPortů: %s"
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr "Vyvoláno NeníOprávněno: %s"
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr "Vyvoláno NeplatnáOperace: %s"
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Vyvolána neznámá chyba: %s"
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Vyvolána neznámá chyba: %s"
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr "Prostředí: %s"
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 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."
 
@@ -1555,90 +1604,80 @@ msgstr ""
 "Nepodporovaný požadavek API: ovladač = %(controller)s, činnost = "
 "%(action)s"
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "Vytvořit snímek svazku %s"
 
-#: 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 ""
-"Hodnota (%s) parametru GroupName je neplatná. Obsah je omezen na "
-"alfanumerické znaky, mezery, pomlčky a podtržítka."
+#: nova/api/ec2/cloud.py:350
+#, python-format
+msgid "Create key pair %s"
+msgstr "Vytvořit dvojici klíčů %s"
 
-#: nova/api/ec2/cloud.py:384
-#, fuzzy, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
-"Hodnota (%s) parametru GroupName je neplatná. Délka překračuje maximum "
-"255 znaků."
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
-msgstr "Vytvořit dvojici klíčů %s"
+msgid "Key pair '%s' already exists."
+msgstr "Dvojice klíčů '%s' již existuje."
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr "Imprtovat klíč %s"
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Smazat dvojici klíčů %s"
 
-#: nova/api/ec2/cloud.py:562
-#, fuzzy, python-format
+#: nova/api/ec2/cloud.py:538
+#, fuzzy
 msgid "Invalid CIDR"
-msgstr "Neplatný cidr %(cidr)s."
+msgstr "Neplatná data jednotky"
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: 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:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, 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:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr "Pro zadané parametry není žádné pravidlo."
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: 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:736
+#: nova/api/ec2/cloud.py:712
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Toto pravidlo již existuje ve skupině %s"
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 #, fuzzy, python-format
 msgid "Quota exceeded, too many security group rules."
 msgstr "Přidávání pravidla bezpečnostní skupiny: %r"
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
@@ -1647,7 +1686,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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
@@ -1656,155 +1695,167 @@ msgstr ""
 "Hodnota (%s) parametru GroupName je neplatná. Délka překračuje maximum "
 "255 znaků."
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: 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:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr "skupina %s již existuje"
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: 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:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Vytvořit svazek ze snímku %s"
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: 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:943
+#: nova/api/ec2/cloud.py:924
+#, fuzzy
 msgid "Delete Failed"
-msgstr ""
+msgstr "Vytvoření selhalo"
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, 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:961
+#: nova/api/ec2/cloud.py:942
+#, fuzzy
 msgid "Attach Failed."
-msgstr ""
+msgstr "Vytvoření selhalo"
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr "Odpojit svazek %s"
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Odpojit svazek %s"
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "vlastnost není podporována: %s"
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr "svz = %s\n"
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr "Přidělit adresu"
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr "Uvolnit adresu %s"
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+#, fuzzy, python-format
+msgid "Unable to release IP Address."
+msgstr "Nelze najít adresu %r"
+
+#: nova/api/ec2/cloud.py:1273
 #, 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:1299
+#: nova/api/ec2/cloud.py:1283
+#, fuzzy, python-format
+msgid "Unable to associate IP Address."
+msgstr "Nelze najít adresu %r"
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Oddělit adresu %s"
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr "Obraz musí být dostupný"
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr "BUde spuštěno ukončování insatncí"
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Restratovat instanci %r"
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr "Instance budou zastaveny"
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr "Instance budou spuštěny"
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr "Zrušení registrace obrazu %s"
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, 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:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr "uživatel nebo skupina nebyly zadány"
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr "podporována je pouze skupina \"all\""
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr "operation_type musí být add nebo remove"
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Aktualizace publicity obrazu %s"
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "Nelze zastavit instanci za %d sek"
@@ -1896,7 +1947,7 @@ msgstr "Informace o síti instance: |%s|"
 #: nova/api/openstack/common.py:318
 #, fuzzy, python-format
 msgid "Converted networks: %s"
-msgstr "Informace o síti instance: |%s|"
+msgstr "Neočekávaná chyba: %s"
 
 #: nova/api/openstack/common.py:351
 #, python-format
@@ -2231,8 +2282,9 @@ msgid "Invalid key_name provided."
 msgstr "Zadán neplatný název_klíče."
 
 #: nova/api/openstack/compute/servers.py:784
+#, fuzzy
 msgid "HostId cannot be updated."
-msgstr ""
+msgstr "id nemůže být None"
 
 #: nova/api/openstack/compute/servers.py:808
 #: nova/api/openstack/compute/servers.py:828
@@ -2465,7 +2517,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr "Může být získán pouze kořenový certifikát."
 
@@ -2565,19 +2617,6 @@ msgstr "Describe-resource je funkce pouze pro správce"
 msgid "Host not found"
 msgstr "Hostitel nenalezen"
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr "Dvojice klíčů '%s' již existuje."
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr "Chybí argument 'networkId' pro addFixedIp"
@@ -2705,35 +2744,36 @@ msgstr "začátek instance %r"
 msgid "stop instance"
 msgstr "zastavit instanci %r"
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: 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/compute/contrib/volumes.py:148
 #: 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: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:376
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, 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/compute/contrib/volumes.py:342
+#, 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:510
 #: 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:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2924,24 +2964,24 @@ msgstr "Nezadán žádný počítačový hostitel"
 msgid "Unable to find host for Instance %s"
 msgstr "Nelze najít hostitele pro instanci %s"
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 #, 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:198
+#: nova/compute/api.py:199
 #, 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:201
+#: nova/compute/api.py:202
 #, 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:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -2950,86 +2990,86 @@ msgstr ""
 "Překročena kvóta pro %(pid)s, pokus o nastavení %(num_metadata)s "
 "vlastností metadat"
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 #, 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
+#: nova/compute/api.py:234
 #, 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
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Chystá se spuštění %s instancí..."
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, 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:928
+#: nova/compute/api.py:929
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "Pokus o jemné smazání %s"
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 #, fuzzy, python-format
 msgid "No host for instance, deleting immediately"
 msgstr "Žádný hostitel pro instnaci %s, okamžitě smazána"
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "Pokus o ukončení %s"
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "Pokus o zastavení %s"
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "Pokus o spuštění %s"
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, 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:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 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:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr "Nerozpoznaný typ obrazu %s"
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id je None. Předpokládán přesun."
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -3038,11 +3078,19 @@ msgstr ""
 "Stará instance typu %(current_instance_type_name)s, nová instance typu "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr "existuje mnoho pevných ip, použita je první: %s"
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr "Dvojice klíčů musí být dlouhá 1 až 255 znaků."
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr "argumenty create musí být kladná celá čísla"
@@ -3057,79 +3105,83 @@ 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:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: zdobení: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, 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:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: uzamknuto: |%s|"
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: správce: |%s|"
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: spouštění: |%s|"
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: nespouštění |%s|"
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr "Nelze načíst ovladač virtualizace: %s"
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, 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:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr "Restartování instance po restartu nova-compute."
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Ovladač hypervizoru nepodporuje pravidla firewallu"
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr "Kontrola stavu"
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "Nastavování bdm %s"
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 #, fuzzy
 msgid "Instance not found."
 msgstr "Instance nenalezena"
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr "Instance již byla vytvořena"
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -3138,7 +3190,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:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -3147,79 +3199,80 @@ 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:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr "Spouštění instance..."
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr "Přeskakování přidělení sítě pro instanci"
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr "Instance selhala v nastavení sítě"
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Informace o síti instance: |%s|"
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr "Instance selhala nastavení blokového zařízení"
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr "Instance nemohla být spuštěna"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s nstance"
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Ignorování DiskNenalezen: %s"
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr "ukončování bdm %s"
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Nastavování stavu vm instance na ERROR"
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 #, 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:824
+#: nova/compute/manager.py:848
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "Nelze znovu sestavit instanci [%(instance_uuid)s]: %(exc)s"
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Znovu sestavování instance %s"
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Restartování instance %s"
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -3228,12 +3281,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:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instance %s: pořizování snímku"
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -3242,40 +3295,40 @@ 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:1021
+#: nova/compute/manager.py:1045
 #, 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:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "Střídání %d záloh"
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr "Mazání obrazu %s"
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, 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:1069
+#: nova/compute/manager.py:1093
 #, fuzzy, python-format
 msgid "Root password set"
 msgstr "Instance %s: Nastavení hesla root"
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr "set_admin_password není tímto ovladačem zavedeno"
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr "Chyba při nastavování hesla správce"
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, fuzzy, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
@@ -3284,12 +3337,12 @@ 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:1110
+#: nova/compute/manager.py:1134
 #, fuzzy, python-format
 msgid "injecting file to %(path)s"
 msgstr "Vkládání cesty souboru: '%s'"
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, fuzzy, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
@@ -3298,122 +3351,122 @@ 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:1128
+#: nova/compute/manager.py:1152
 #, fuzzy, python-format
 msgid "updating agent to %(url)s"
 msgstr "Aktualizace agenta na %s"
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 #, fuzzy, python-format
 msgid "Unrescuing"
 msgstr "instance %s: rušení záchrany"
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr "cíl stejný jako zdroj!"
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 #, fuzzy
 msgid "Pausing"
 msgstr "Aktualizování!"
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 #, fuzzy, python-format
 msgid "Retrieving diagnostics"
 msgstr "instance %s: získávání diagnostik"
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 #, fuzzy, python-format
 msgid "Suspending"
 msgstr "instance %s: přerušování"
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 #, fuzzy, python-format
 msgid "Getting locked state"
 msgstr "instance %s: získávání uzamčeného stavu"
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 #, fuzzy
 msgid "Reset network"
 msgstr "Reset sítě"
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 #, fuzzy, python-format
 msgid "Inject network info"
 msgstr "instance %s: vkládání informací o síti"
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "network_info vkládá: |%s|"
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 #, fuzzy, python-format
 msgid "Get console output"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 #, fuzzy, python-format
 msgid "Getting vnc console"
 msgstr "instance %s: získávání konzole vnc"
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, 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:1744
+#: nova/compute/manager.py:1775
 #, 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:1753
+#: nova/compute/manager.py:1784
 #, fuzzy, python-format
 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:1764
+#: nova/compute/manager.py:1795
 #, 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:1796
+#: nova/compute/manager.py:1827
 #, 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:1800
+#: nova/compute/manager.py:1831
 #, fuzzy, python-format
 msgid "Detaching volume from unknown instance"
 msgstr "Odpojování svazku z neznámé instance %s"
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -3422,35 +3475,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:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr "Instance nemá svazek."
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, 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:2013
+#: nova/compute/manager.py:2044
 #, 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:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr "zahájen přesun po spuštění."
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr "Nenalezeny žádné plovoucí ip"
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr "Nenalezeny žádné plovoucí ip."
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
@@ -3459,12 +3512,12 @@ msgstr ""
 "Přesun za provozu: Neočekávaná chyba: nelze zdědit plovoucí ip.\n"
 "%(e)s"
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, 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:2110
+#: nova/compute/manager.py:2141
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -3472,23 +3525,64 @@ 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr "Spuštěna operace po migraci"
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, 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/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, fuzzy, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr "Vypínání VM pro instanci %(instance_uuid)s"
+
+#: nova/compute/manager.py:2343
+#, fuzzy, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr "Instance %(instance_id)s nenalezena"
+
+#: nova/compute/manager.py:2347
+#, fuzzy
+msgid "In ERROR state"
+msgstr "Uzel je v neznámém chybovém stavu."
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr "Aktualizace mezipaměti využití šířky pásma"
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr "Aktualizace stavu hostitele"
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -3497,20 +3591,20 @@ msgstr ""
 "Nalezeno %(num_db_instances)s v databázi a %(num_vm_instances)s na "
 "hypervizoru."
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 #, fuzzy, python-format
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
@@ -3519,15 +3613,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:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, překskování..."
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr "Znovu získávání smazané instance"
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, fuzzy, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
@@ -3536,7 +3630,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:2503
+#: nova/compute/manager.py:2584
 #, fuzzy, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
@@ -3545,14 +3639,14 @@ 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:2510
+#: nova/compute/manager.py:2591
 #, 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:2578
+#: nova/compute/manager.py:2659
 #, fuzzy, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3612,17 +3706,17 @@ msgstr "Restartování xvp"
 msgid "xvp not running..."
 msgstr "xvp není spuštěno"
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr "Mazání vypršené známky: (%s)"
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr "Obdržena známka: %(token)s, %(token_dict)s)"
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr "Kontrola známky: %(token)s, %(token_valid)s)"
@@ -3641,17 +3735,17 @@ msgstr "Nerozpoznaná hodnota read_deleted '%s'"
 msgid "No ComputeNode for %(host)s"
 msgstr "Žádný počítačový uzel pro %(host)s"
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, 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:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, 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:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr "Žádný svazek sm s id %(volume_id)s"
@@ -3669,13 +3763,15 @@ msgstr ""
 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/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr "Tabulka |%s| není vytvořena!"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 #, fuzzy
 msgid "quota_classes table not dropped"
 msgstr "tabulka instance_info_caches nesmazána"
@@ -3702,6 +3798,16 @@ msgstr "omezení cizího klíče nemohlo být vynecháno"
 msgid "foreign key could not be created"
 msgstr "omezení cizího klíče nemohlo být odstraněno"
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+#, fuzzy
+msgid "quota_usages table not dropped"
+msgstr "tabulka dns_domains nesmazána"
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+#, fuzzy
+msgid "reservations table not dropped"
+msgstr "tabulka dns_domains nesmazána"
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr "Chyba připojení během kontaktování serveru glance, další pokus"
@@ -3734,22 +3840,22 @@ msgstr "Není vlastníkem obrazu"
 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"
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr "Nelze stáhnout %(image_location)s do %(image_path)s"
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr "Nelze dešifrovat %(image_location)s do %(image_path)s"
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr "Nelze rozbalit %(image_location)s do %(image_path)s"
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr "Nelze nahrát %(image_location)s do %(image_path)s"
@@ -3759,17 +3865,17 @@ msgstr "Nelze nahrát %(image_location)s do %(image_path)s"
 msgid "Failed to decrypt private key: %s"
 msgstr "Nelze dešifrovat soukromý klíč: %s"
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "Nelze dešifrovat vektor zavedení: %s"
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "Nelze dešifrovat soubor obrazu %(image_file)s: %(err)s"
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr "Nebezpečné názvy souboru v obrazu"
 
@@ -3870,42 +3976,42 @@ msgstr "Nelze při odpojení vif instance '%s'"
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, fuzzy, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr "Certifikát %(certificate_id)s nenalezen."
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr "Rozhraní %(interface)s nenalezeno"
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr "Přidělení plovoucí IP pro |%s|"
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr "Odebrání plovoucí IP pro |%s|"
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr "Adresa |%(address)s| není přidělena"
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, 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:402
+#: nova/network/manager.py:403
 #, 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:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3915,41 +4021,41 @@ 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:683
+#: nova/network/manager.py:684
 #, 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:693
+#: nova/network/manager.py:694
 #, 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:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr "%s odloučených zastaralých ip"
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr "nastavování hostitele sítě"
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr "přidělení sítě pro instanci |%s|"
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, 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:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr "oddělení sítě pro instanci |%s|"
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, fuzzy, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3960,53 +4066,53 @@ msgstr ""
 " Instance |%(instance)s| je v zóně |%(zone2)s|. Nebude vytvořen žádný "
 "záznam DNS."
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "Vypůjčená IP |%(address)s|"
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "Vypůjčená IP %s není přidělena"
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, 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:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "Uvolněna IP |%(address)s|"
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "Uvolněna IP %s, která není přidělena"
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "Uvolněna IP %s, která nebyla vypůjčena"
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr "cidr je již používáno"
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, 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:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -4015,22 +4121,22 @@ msgstr ""
 "požadovaný cidr (%(cidr)s) je v konfliktu s existujícím menším cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr "Síť již existuje!"
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, 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:1853
+#: nova/network/manager.py:1854
 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:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4043,31 +4149,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr "Tento ovladač podporuje pouze typ 'a'"
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr "ID nájemce nenastaveno"
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr "Požadavek kvantového klienta: %(method)s %(action)s"
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr "Kvantový objekt nenalezen: %s"
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr "Server %(status_code)s chyba: %(data)s"
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr "Nelze kontaktovat server. Získána chyba: %s"
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr "nelze deserializovat object typu = '%s'"
@@ -4155,36 +4261,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr "get_project_and_global_net_ids musí být zavolány s nenulovým id projektu"
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr "Chyba při vytváření položky sítě"
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr "Žádná síť s net_id  = %s"
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, fuzzy, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr "Žádné pevné IP k odloučení pro vif %sid"
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr "Připojování rozhraní %(interface_id)s k síti %(net_id)s pro %(tenant_id)s"
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 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:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr "%s není v platných prioritách"
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4201,12 +4307,12 @@ msgstr "Problém '%(e)s' se pokouší poslat do ovladače oznámení %(driver)s.
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr "rozbalený kontext: %s"
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr "obdrženo: %s"
@@ -4221,31 +4327,36 @@ msgstr "pro zprávu není metoda: %s"
 msgid "No method for message: %s"
 msgstr "Pro zprávu není metoda: %s"
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr "Provádění asynchronního volání na %s ..."
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID je %s"
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr "Provádění asynchronního obsazení na %s ..."
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr "Provádění asynchronního obsazení rozvětvení..."
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+#, fuzzy
+msgid "An unknown RPC related exception occurred."
+msgstr "Vyskytla se neočekávaná výjimka."
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
@@ -4254,11 +4365,20 @@ msgstr ""
 "Vzdálená chyba: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr "Při čekání na odpověď RPC vypršel časový limit."
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr "Neplatné znovu použití připojení RPC."
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Volajícímu je vrácena výjimka: %s"
@@ -4342,53 +4462,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:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr "Obsazena '%(method)s' do svazku '%(host)s'"
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr "Obsazena '%(method)s' do '%(host)s' výpočtu"
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr "Obsazena '%(method)s' do sítě '%(host)s'"
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr "Obsazena '%(method)s' do %(topic)s '%(host)s'"
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr "Musí být zaveden náhradní plán"
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 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:321
+#: nova/scheduler/driver.py:322
 #, 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:358
+#: nova/scheduler/driver.py:359
 #, 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:407
+#: nova/scheduler/driver.py:408
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4397,7 +4517,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:458
+#: nova/scheduler/driver.py:459
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4464,19 +4584,19 @@ msgstr "host_manager zaveden pouze pro 'compute'"
 msgid "No service for compute ID %s"
 msgstr "Žádná služba pro ID výpočtu %s"
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, fuzzy, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr "Metoda ovladače %(driver_method)s chybí: %(e)s. Vrácení na schedule()"
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "Nelze naplánovat_%(method)s: %(ex)s"
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, fuzzy, python-format
 msgid "Setting instance to %(state)s state."
 msgstr "Nastavování instance %(instance_uuid)s do stavu ERROR"
@@ -4499,6 +4619,21 @@ msgstr "Nezbývá dostatek přidělitelných jader CPU"
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr "Nezbývá dostatek přidělitelných svazků gigabajtů"
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr "VCPU nenastaveny; předpokládáno poškození sbírky CPU"
@@ -4523,11 +4658,11 @@ msgstr "Předstíraný příkaz způsobil výjimku %s"
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr "Odpověď na předstíraný příkaz je stdout='%(stdout)s' stderr='%(stderr)s'"
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr "Prosím rozšiřte nepravý modul libvirt aby podporoval příznaky"
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr "Prosím rozšiřte falešný modul libvirt aby podporoval tuto metodu ověření"
 
@@ -4595,12 +4730,12 @@ msgstr "projekt"
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr "Cíl %s přidělen"
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr "Nelze potvrdit exportované id svazku: %s."
@@ -4615,12 +4750,12 @@ msgstr "Zadaná data: %s"
 msgid "Result data: %s"
 msgstr "Výsledná data: %s"
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Vytváření souborů v %s pro simulaci agenta hosta"
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Odstraňování souborů simulovaného agenta hosta v %s"
@@ -4736,21 +4871,21 @@ msgstr "Neočekávaný kód stavu"
 msgid "Decoding JSON: %s"
 msgstr "Dekódování JSON: %s"
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "Vnořená obdržela %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr "Vnořená vrátila %s"
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr "Podpůrná vrstva RPC nepodporuje časové limity"
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr "Přijato %s"
@@ -4759,19 +4894,19 @@ msgstr "Přijato %s"
 msgid "Failed to open connection to the hypervisor"
 msgstr "Nelze otevřít spojení s hypervizorem"
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr "Pro %s vytvořen záznam compute_service "
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr "Záznam compute_service aktualizován pro %s "
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr "Pokus o odfiltrování instance, která není filtrována"
 
@@ -4784,12 +4919,12 @@ msgstr "Filtry přidány do instance %s"
 msgid "Provider Firewall Rules refreshed"
 msgstr "Pravidla firewallu poskytovatele obnovena"
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr "Přidávání pravidla bezpečnostní skupiny: %r"
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr "Přidávání pravidla poskytovatele: %s"
@@ -5043,7 +5178,7 @@ msgstr "instance %s: spoučtění metody toXML"
 msgid "instance %s: finished toXML method"
 msgstr "instance %s: dokončena metoda toXML"
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5060,7 +5195,7 @@ msgstr "#### RLK: cpu_arch = %s "
 msgid "Updating!"
 msgstr "Aktualizování!"
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr "Aktualizace statistik hostitele"
@@ -5191,21 +5326,21 @@ msgstr "chyba qemu-nbd: %s"
 msgid "nbd device %s did not show up"
 msgstr "zařízení nbd %s se nezobrazilo"
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Připojování k libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr "Připojení k libvirt poškozeno"
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr "Chyba od libvirt během ničení. Kód=%(errcode)s Chyba=%(e)s"
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
@@ -5214,140 +5349,126 @@ msgstr ""
 "Chyba od libvirt během odstraňování uložení instance. Kód=%(errcode)s "
 "Chyba=%(e)s"
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr "Chyba od libvirt během rušení určení. Kód=%(errcode)s Chyba=%(e)s"
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr "Instance úspěšně zničena."
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, fuzzy, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr "Chyba od libvirt během rušení určení. Kód=%(errcode)s Chyba=%(e)s"
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr "Mazání souborů instance %(target)s"
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr "Nelze zjistit název zavaděče iscsi"
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr "připojování bloku zařízení LXC"
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr "odpojování bloku zařízení LXC"
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "Instance úspěšně restartována."
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Nelze restartovat instanci"
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "Instance úspěšně vytvořena."
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr "Během restartu zmizela instance"
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr "Instance úspěšně restartována."
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr "Automatické potvrzení instance %d"
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr "Instance je spuštěna"
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 #, fuzzy
 msgid "During spawn, instance disappeared."
 msgstr "Během restartu zmizela instance"
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr "Instance úspěšně vytvořena."
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Uživatel nemá správcovská oprávnění"
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr "Vytváření obrazu"
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr "Vkládání %(injection)s do obrazu %(img_id)s"
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr "Ignorování chyby při vkládání dat do obrazu %(img_id)s (%(e)s)"
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr "block_device_list %s"
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr "Spuštění metody toXML"
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr "Metoda toXML dokočena"
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -5356,21 +5477,21 @@ msgstr ""
 "Chyba od libvirt při hledání %(instance_name)s: [Kód chyby "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/connection.py:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "verze libvirt je příliš stará (nepodporuje getVersion)"
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr "'<cpu>' musí být 1, ale %d\n"
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr "topologie (%(topology)s) musí být %(ks)s"
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -5379,7 +5500,7 @@ msgstr ""
 "Spuštěná instance má info o CPU:\n"
 "%s"
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5394,42 +5515,42 @@ msgstr ""
 "\n"
 "Prohlédněte si %(u)s"
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr "Při přesunu %s vypršel časový limit. nwfilter nenalezen."
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "přeskakování %(path)s protože vypadá jako svazek"
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 #, 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:2527
+#: nova/virt/libvirt/connection.py:2536
 #, fuzzy, python-format
 msgid "During wait running, instance disappeared."
 msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 #, fuzzy, python-format
 msgid "Instance running successfully."
 msgstr "Instance %s úspěšně běží."
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 #, fuzzy, python-format
 msgid "Starting finish_migration"
 msgstr "Instance %s: Spouštění dokončení přesunu"
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 #, fuzzy, python-format
 msgid "Starting finish_revert_migration"
 msgstr "Instance %s: Spuštění dokočení vrácení přesunu"
@@ -5450,17 +5571,17 @@ msgstr "Voláno základní nastavení filtrování v nwfilter"
 msgid "Ensuring static filters"
 msgstr "Zajišťování statických filtrů"
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr "Nwfilter (%(instance_filter_name)s) nenalezen."
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr "Nwfilter (%(instance_filter_name)s) pro %(name)s nenalezen."
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables firewall: Nastavení základního filtrování"
 
@@ -5598,46 +5719,46 @@ msgstr "Odstranitelné základní soubory: %s"
 msgid "Verification complete"
 msgstr "Ověření dokončeno"
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr "Nelze najít otevřený port"
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, fuzzy, python-format
 msgid "Reading image info file: %s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "_vytvořit: %s"
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, fuzzy, python-format
 msgid "Wrote: %s"
 msgstr "Přepsáno %s"
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr "Zajišťování vlan %(vlan)s a mostu %(bridge)s"
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "Zajišťování mostu %s"
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 #, fuzzy, python-format
 msgid "Failed while unplugging vif"
 msgstr "Nelze při odpojení vif instance '%s'"
@@ -6080,7 +6201,7 @@ msgstr "Získávání velikosto brazu %s"
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr "Získáná velikost %(size)s obrazu %(image)s"
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -6089,28 +6210,28 @@ 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:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Nelze dešifrovat soukromý klíč: %s"
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr "Spuštění hostitele na XenServer není podporováno."
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "Nelze se přihlásit do XenAPI (je disk Dom0 plný?)"
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr "Obdržena výjimka: %s"
@@ -6167,7 +6288,7 @@ msgstr "Nelze získat aktualizovaný stav: %s"
 #: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
-msgstr ""
+msgstr "Volání %(method)s vrátilo chybu: %(e)s."
 
 #: nova/virt/xenapi/network_utils.py:37
 #, python-format
@@ -6246,7 +6367,7 @@ msgstr "VBD v instanci %s nenalezeno"
 #: nova/virt/xenapi/vm_utils.py:263
 #, fuzzy, python-format
 msgid "VBD %s already detached"
-msgstr "skupina %s již existuje"
+msgstr "již odpojeno"
 
 #: nova/virt/xenapi/vm_utils.py:266
 #, python-format
@@ -6271,12 +6392,12 @@ msgstr "Nelze zničit VBD %s"
 #: 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 "Vytváření VBD na CD-ROM pro VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr "Vytvořeno VBD %(vbd_ref)s pro VM %(vm_ref)s, VDI %(vdi_ref)s."
 
 #: 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 ""
+msgstr "Vytvořeno VBD %(vbd_ref)s pro VM %(vm_ref)s, VDI %(vdi_ref)s."
 
 #: nova/virt/xenapi/vm_utils.py:320
 #, python-format
@@ -6674,7 +6795,7 @@ msgstr "Odstraňování souborů kernel/ramdisku z dom0"
 #: nova/virt/xenapi/vmops.py:352
 #, fuzzy
 msgid "Failed to spawn, rolling back"
-msgstr "Nelze pozastavit instanci"
+msgstr "Nelze aktualizovat svazek v db"
 
 #: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
@@ -6747,7 +6868,7 @@ msgstr "Nastavování váhy VCPU"
 #: nova/virt/xenapi/vmops.py:581
 #, fuzzy, python-format
 msgid "Could not find VM with name %s"
-msgstr "Nelze najít nastavení v %(path)s"
+msgstr "Nelze najít odkaz na VDI"
 
 #: nova/virt/xenapi/vmops.py:635
 #, fuzzy, python-format
@@ -6867,358 +6988,334 @@ msgstr ""
 "%(timeout)d vteřin"
 
 #: nova/virt/xenapi/vmops.py:1266
-msgid "Automatically hard rebooting"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1338
 #, fuzzy, python-format
-msgid ""
-"Automatically confirming migration %(migration_id)s for instance "
-"%(instance_uuid)s"
-msgstr "Vypínání VM pro instanci %(instance_uuid)s"
-
-#: 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:1347
-#, fuzzy
-msgid "In ERROR state"
-msgstr "Uzel je v neznámém chybovém stavu."
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
+msgid "Automatically hard rebooting"
+msgstr "Automatický tvrdý restart %d"
 
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
-msgstr ""
+msgstr "Nelze získat informacce o šířce pásma."
 
-#: nova/virt/xenapi/vmops.py:1429
-#, fuzzy
+#: nova/virt/xenapi/vmops.py:1373
+#, fuzzy, python-format
 msgid "Injecting network info to xenstore"
-msgstr "Navrácení sítě pro instnac"
+msgstr "Vkládání informací o síti do xs pro vm: |%s|"
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 #, fuzzy
 msgid "Creating vifs"
 msgstr "Vytváření obrazu"
 
-#: nova/virt/xenapi/vmops.py:1453
-#, python-format
+#: nova/virt/xenapi/vmops.py:1397
+#, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
-msgstr ""
+msgstr "vytváření VIF pro VM %(vm_ref)s, síť %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1456
-#, python-format
+#: nova/virt/xenapi/vmops.py:1400
+#, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
-msgstr ""
+msgstr "vytváření VIF pro VM %(vm_ref)s, síť %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1423
+#, fuzzy, python-format
 msgid "Injecting hostname to xenstore"
-msgstr ""
+msgstr "Vkládání názvu hostitele do xs pro vm: |%s|"
 
-#: nova/virt/xenapi/vmops.py:1504
-#, python-format
+#: nova/virt/xenapi/vmops.py:1448
+#, fuzzy, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
+"Volání %(method)s agentem vrátilo neplatnou odpověď: %(ret)r. VM "
+"id=%(instance_uuid)s; cesta=%(path)s; arg=%(addl_args)r"
 
-#: nova/virt/xenapi/vmops.py:1525
-#, python-format
+#: nova/virt/xenapi/vmops.py:1469
+#, fuzzy, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
+"ČASOVÝ LIMIT: Vypršel čas volání %(method)s. VM id=%(instance_uuid)s; "
+"arg=%(args)r"
 
-#: nova/virt/xenapi/vmops.py:1529
-#, python-format
+#: nova/virt/xenapi/vmops.py:1473
+#, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
+"NEZAVEDENO: Volání %(method)s není agentem podporováno. VM "
+"id=%(instance_uuid)s; arg=%(args)r"
 
-#: nova/virt/xenapi/vmops.py:1534
-#, python-format
+#: nova/virt/xenapi/vmops.py:1478
+#, fuzzy, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
-msgstr ""
+msgstr "Volání %(method)s vrátilo chybu: %(e)s."
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
-msgstr ""
+msgstr "Chyba OpenSSL: %s"
 
 #: nova/virt/xenapi/volume_utils.py:52
 msgid "creating sr within volume_utils"
-msgstr ""
+msgstr "vytváření sr bez nástrojů svazku"
 
 #: nova/virt/xenapi/volume_utils.py:55 nova/virt/xenapi/volume_utils.py:83
 #, python-format
 msgid "type is = %s"
-msgstr ""
+msgstr "typ je = %s"
 
 #: nova/virt/xenapi/volume_utils.py:58 nova/virt/xenapi/volume_utils.py:86
 #, python-format
 msgid "name = %s"
-msgstr ""
+msgstr "název = %s"
 
 #: nova/virt/xenapi/volume_utils.py:71
 #, python-format
 msgid "Created %(label)s as %(sr_ref)s."
-msgstr ""
+msgstr "Vytvořeno %(label)s jako %(sr_ref)s."
 
 #: nova/virt/xenapi/volume_utils.py:76 nova/virt/xenapi/volume_utils.py:174
 msgid "Unable to create Storage Repository"
-msgstr ""
+msgstr "Nelze vytvořit repozitář úložiště"
 
 #: nova/virt/xenapi/volume_utils.py:80
 msgid "introducing sr within volume_utils"
-msgstr ""
+msgstr "Zavádění sr uvnitř nástrojů svazku"
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
 #: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
-msgstr ""
+msgstr "Zavedeno %(label)s jako %(sr_ref)s."
 
 #: nova/virt/xenapi/volume_utils.py:106
 msgid "Creating pbd for SR"
-msgstr ""
+msgstr "Vytváření pbd pro SR"
 
 #: nova/virt/xenapi/volume_utils.py:108
 msgid "Plugging SR"
-msgstr ""
+msgstr "Zapojování SR"
 
 #: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
-msgstr ""
+msgstr "NElze zavést repozitář úložiště"
 
 #: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
-msgstr ""
+msgstr "Nelze získat SR pomocí uuid"
 
 #: nova/virt/xenapi/volume_utils.py:129
 #, python-format
 msgid "Forgetting SR %s..."
-msgstr ""
+msgstr "Zapomínání na SR %s..."
 
 #: nova/virt/xenapi/volume_utils.py:137
 msgid "Unable to forget Storage Repository"
-msgstr ""
+msgstr "Nelze zapomenout na repozitář úložiště"
 
 #: nova/virt/xenapi/volume_utils.py:157
 #, python-format
 msgid "Introducing %s..."
-msgstr ""
+msgstr "Zavádění %s..."
 
 #: nova/virt/xenapi/volume_utils.py:186
 #, python-format
 msgid "Unable to find SR from VBD %s"
-msgstr ""
+msgstr "Nelze najít SR z VBD %s"
 
 #: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
-msgstr ""
+msgstr "Ignorování výjimky %(exc)s při získávání PBD pro %(sr_ref)s"
 
 #: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
-msgstr ""
+msgstr "Ignorování výjimky %(exc)s při odpojování PBD %(pbd)s"
 
 #: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
-msgstr ""
+msgstr "Nelze zavést VDI na SR %s"
 
 #: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
-msgstr ""
+msgstr "Nelze získat záznam VDI %s na"
 
 #: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
-msgstr ""
+msgstr "Nelze zavést VDI pro SR %s"
 
 #: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
-msgstr ""
+msgstr "Chyb při hledání vdi v SR %s"
 
 #: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
-msgstr ""
+msgstr "Neůze najít vbd pro vdi %s"
 
 #: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
-msgstr ""
+msgstr "Nelze získat informace o cíli %(data)s, %(mountpoint)s"
 
 #: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
-msgstr ""
+msgstr "Bod připojení nelze přeložit: %s"
 
 #: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
-msgstr ""
+msgstr "Nelze najít odkaz na VDI"
 
 #: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
-msgstr ""
+msgstr "Vytváření SR %s"
 
 #: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
-msgstr ""
+msgstr "Nelze vytvořit SR"
 
 #: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
-msgstr ""
+msgstr "Nelze získat záznam o SR"
 
 #: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
-msgstr ""
+msgstr "Zavádění SR %s"
 
 #: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
-msgstr ""
+msgstr "SR nalezeno v databázi xapi. Není třeba zavádět"
 
 #: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
-msgstr ""
+msgstr "Nelze zavést SR"
 
 #: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
-msgstr ""
+msgstr "Kontrola SR %s"
 
 #: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
-msgstr ""
+msgstr "SR %s nenalezeno v databázoi xapi"
 
 #: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
-msgstr ""
+msgstr "Nelze zapomenou na SR"
 
 #: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
-msgstr ""
+msgstr "Připojeni svazku: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 
 #: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
-msgstr ""
+msgstr "Nelze vytvořit VDI na SR %(sr_ref)s pro instanci %(instance_name)s"
 
 #: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
-msgstr ""
+msgstr "Nelze použít SR %(sr_ref)s pro instanci %(instance_name)s"
 
 #: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
-msgstr ""
+msgstr "Nelze připojit svazek k instanci %s"
 
 #: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
-msgstr ""
+msgstr "Bod připojení %(mountpoint)s připojen k instanci %(instance_name)s"
 
 #: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
-msgstr ""
+msgstr "Odpojení svazku: %(instance_name)s, %(mountpoint)s"
 
 #: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
-msgstr ""
+msgstr "Nelze nalézt svazek %s"
 
 #: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
-msgstr ""
+msgstr "Nelze odpojit svazek %s"
 
 #: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
-msgstr ""
+msgstr "Nelze zničit vbd %s"
 
 #: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
-msgstr ""
+msgstr "Chyba při čištění SR %s"
 
 #: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
-msgstr ""
+msgstr "Bod připojení %(mountpoint)s odpojen od instance %(instance_name)s"
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
-msgstr ""
+msgstr "Chyba při zahájení komunikace: %s"
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
-msgstr ""
+msgstr "Neplatný požadavek: %s"
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
-msgstr ""
+msgstr "Požadavek: %s"
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
-msgstr ""
+msgstr "Proveden požadavek s chybějící známkou: %s"
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
-msgstr ""
+msgstr "Proveden požadavek s neplatnou známkou: %s"
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
-msgstr ""
+msgstr "Neočekávaná chyba: %s"
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
-msgstr ""
+msgstr "Spouštění uzlu nova-xvpvncproxy (verze %s)"
 
 #: nova/volume/api.py:74 nova/volume/api.py:220
 msgid "status must be available"
-msgstr ""
+msgstr "stav musí být dostupný"
 
 #: nova/volume/api.py:85
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
-msgstr ""
+msgstr "Překročena kvóta pro %(pid)s, pokus o vytvoření %(size)sG svazku"
 
 #: nova/volume/api.py:137
 #, fuzzy
 msgid "Volume status must be available or error"
-msgstr "Obraz musí být dostupný"
+msgstr "Stav svazku musí být dostupný"
 
 #: nova/volume/api.py:142
 #, python-format
@@ -7227,39 +7324,44 @@ msgstr ""
 
 #: nova/volume/api.py:223
 msgid "already attached"
-msgstr ""
+msgstr "již připojeno"
 
 #: nova/volume/api.py:230
 msgid "already detached"
-msgstr ""
+msgstr "již odpojeno"
 
 #: nova/volume/api.py:292
 msgid "must be available"
-msgstr ""
+msgstr "musí být dostupné"
 
 #: nova/volume/api.py:325
+#, fuzzy
 msgid "Volume Snapshot status must be available or error"
-msgstr ""
+msgstr "Stav svazku musí být dostupný"
 
 #: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
-msgstr ""
+msgstr "Obnova ze selhaného spuštění. Pokus číslo %s"
 
 #: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
-msgstr ""
+msgstr "skupina svazku %s neexistuje"
 
 #: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
+"Přeskakování zajištění exportu. Není dotován žádný cíl iscsi pro svazek: "
+"%d"
 
 #: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
+"Přeskakování odstranění exportu. Není dotován žádný cíl iscsi pro svazek:"
+" %d"
 
 #: nova/volume/driver.py:327
 #, python-format
@@ -7267,155 +7369,157 @@ msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
+"Přeskakování odstranění exportu. V současnosti není přítomen žádný cíl "
+"iscsi pro svazek: %d"
 
 #: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
-msgstr ""
+msgstr "Umístění poskytovatele ISCSI není uloženo, použito zjištění"
 
 #: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
-msgstr ""
+msgstr "Nelze najít export ISCSI pro svazek %s"
 
 #: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
-msgstr ""
+msgstr "Zjištění ISCSI: Nalezeno %s"
 
 #: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
-msgstr ""
+msgstr "Nelze potvrdit exportovaný svazek s id:%(volume_id)s."
 
 #: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
-msgstr ""
+msgstr "FALEŠNÉ ISCSI: %s"
 
 #: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
-msgstr ""
+msgstr "rbd nemá žádnéou zásobu %s"
 
 #: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
-msgstr ""
+msgstr "Sheepdog nefunguje: %s"
 
 #: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
-msgstr ""
+msgstr "Sheepdog nefunguje"
 
 #: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
-msgstr ""
+msgstr "Zaznamování ovladače svazku: %s"
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
-msgstr ""
+msgstr "Znovu exportování %s svazků"
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
-msgstr ""
+msgstr "svazek %s: přeskakování exportu"
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
-msgstr ""
+msgstr "svazek%s: vytváření"
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
-msgstr ""
+msgstr "svazek %(vol_name)s: vytváření lv o velikosti %(vol_size)sG"
 
-#: nova/volume/manager.py:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
-msgstr ""
+msgstr "svazek %s: vytváření exportu"
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
-msgstr ""
+msgstr "svazek %s: vytvoření bylo úspěšné"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
-msgstr ""
+msgstr "Svazek je stále připojen"
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
-msgstr ""
+msgstr "Svazek není místní v tomto uzlu"
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
-msgstr ""
+msgstr "svazek %s: odstraňování exportu"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
-msgstr ""
+msgstr "svazek %s: mazání"
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
-msgstr ""
+msgstr "svazek %s: svazek je zaneprázdněn"
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
-msgstr ""
+msgstr "svazek %s: úspěšně smazán"
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
-msgstr ""
+msgstr "snímek %s: vytváření"
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
-msgstr ""
+msgstr "snímek %(snap_name)s: vytváření"
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
-msgstr ""
+msgstr "snímek %s: úspěšně vytvořen"
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
-msgstr ""
+msgstr "snímek %s: mazání"
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
-msgstr "instance %s: pořizování snímku"
+msgstr "snímek %s: úspěšně vytvořen"
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
-msgstr ""
+msgstr "snímek %s: úspěšně smazán"
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
-msgstr ""
+msgstr "Kontrola schopností svazku"
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
-msgstr ""
+msgstr "Nalezeny nové schopnosti: %s"
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
-msgstr ""
+msgstr "Vyčistit schopnosti"
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
-msgstr ""
+msgstr "Přijato oznámení (%s)"
 
 #: nova/volume/netapp.py:79
 #, fuzzy, python-format
@@ -7438,8 +7542,9 @@ msgid "Job failed: %s"
 msgstr "Neznámý základní soubor: %s"
 
 #: nova/volume/netapp.py:240
+#, fuzzy
 msgid "Failed to provision dataset member"
-msgstr ""
+msgstr "Nelze aktualizovat db"
 
 #: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
@@ -7448,7 +7553,7 @@ msgstr ""
 #: 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"
+msgstr "Neůze najít vbd pro vdi %s"
 
 #: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
@@ -7457,7 +7562,7 @@ msgstr ""
 #: 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"
+msgstr "Nelze najít export ISCSI pro svazek %s"
 
 #: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, fuzzy, python-format
@@ -7481,11 +7586,11 @@ msgstr "Nelze získat metadata pro ip: %s"
 
 #: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
-msgstr ""
+msgstr "Zadat san_password nebo san_private_key"
 
 #: nova/volume/san.py:158
 msgid "san_ip must be set"
-msgstr ""
+msgstr "san_ip musí být nastaveno"
 
 #: nova/volume/san.py:229
 #, python-format
@@ -7495,22 +7600,22 @@ msgstr ""
 #: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
-msgstr ""
+msgstr "LUID pro %(zfs_poolname)s nenalezeno. Výstup=%(out)s"
 
 #: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
-msgstr ""
+msgstr "Příkaz QLID vrátil %s"
 
 #: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
-msgstr ""
+msgstr "Poškozená odpověď pro příkaz QLID %(verb)s %(cliq_args)s. Výsledek=%(out)s"
 
 #: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
-msgstr ""
+msgstr "Chyba při spouštění příkazu QLID %(verb)s %(cliq_args)s. Výsledek=%(out)s"
 
 #: nova/volume/san.py:499
 #, python-format
@@ -7518,152 +7623,154 @@ msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
+"Neočekávaný počet virtuálních ip pro klastr %(cluster_name)s. "
+"Výsledek=%(_xml)s"
 
 #: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
-msgstr ""
+msgstr "Informace o svazku: %(volume_name)s => %(volume_attributes)s"
 
 #: nova/volume/san.py:605
 msgid "local_path not supported"
-msgstr ""
+msgstr "místní cesta není podporována"
 
 #: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
-msgstr ""
+msgstr "Náklad volání API SolidFire: %s"
 
 #: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
-msgstr ""
+msgstr "Volání json.loads() vyvolalo výjimku: %s"
 
 #: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
-msgstr ""
+msgstr "Výsledek volání API SolidFIre: %s"
 
 #: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
-msgstr ""
+msgstr "Nalezen účet solidfire: %s"
 
 #: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
-msgstr ""
+msgstr "účet solidfire: %s neexistuje, vytváření..."
 
 #: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
-msgstr ""
+msgstr "Vstup do vytváření svazku SolidFire"
 
 #: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
-msgstr ""
+msgstr "Odchod z vytváření svazku SolidFIre"
 
 #: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
-msgstr ""
+msgstr "Vstup do smazání svazku SolidFIre"
 
 #: nova/volume/san.py:872
 #, fuzzy, python-format
 msgid "Deleting volumeID: %s"
-msgstr "Smazat svazek s id: %s"
+msgstr "Mazání svazku s ID: %s "
 
 #: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
-msgstr ""
+msgstr "Odchod ze smazání svazku SolidFire"
 
 #: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
-msgstr ""
+msgstr "Spouštění zajištění exportu SolidFire..."
 
 #: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
-msgstr ""
+msgstr "Spouštění vytváření exportu SolidFire"
 
 #: nova/volume/volume_types.py:49 nova/volume/volume_types.py:108
 msgid "name cannot be None"
-msgstr ""
+msgstr "název nemůže být None"
 
 #: nova/volume/volume_types.py:96
 msgid "id cannot be None"
-msgstr ""
+msgstr "id nemůže být None"
 
 #: nova/volume/xensm.py:55
 #, python-format
 msgid "SR name = %s"
-msgstr ""
+msgstr "Název SR = %s"
 
 #: nova/volume/xensm.py:56
 #, python-format
 msgid "Params: %s"
-msgstr ""
+msgstr "Parametry: %s"
 
 #: nova/volume/xensm.py:60
 #, python-format
 msgid "Failed to create sr %s...continuing"
-msgstr ""
+msgstr "Nelze vytvořit sr %s...pokračování"
 
 #: nova/volume/xensm.py:62
 msgid "Create failed"
-msgstr ""
+msgstr "Vytvoření selhalo"
 
 #: nova/volume/xensm.py:64
 #, python-format
 msgid "SR UUID of new SR is: %s"
-msgstr ""
+msgstr "SR UUID nového SR je: %s"
 
 #: nova/volume/xensm.py:71
 msgid "Failed to update db"
-msgstr ""
+msgstr "Nelze aktualizovat db"
 
 #: nova/volume/xensm.py:80
 #, python-format
 msgid "Failed to introduce sr %s...continuing"
-msgstr ""
+msgstr "Nelze zavést sr %s...pokračování"
 
 #: nova/volume/xensm.py:91
 #, python-format
 msgid "Failed to reach backend %d"
-msgstr ""
+msgstr "Nelze se připojit k podpůrné vrstvě %d"
 
 #: nova/volume/xensm.py:100
 msgid "XenSMDriver requires xenapi connection"
-msgstr ""
+msgstr "XenSMDriver vyžaduje připojení xenapi"
 
 #: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
-msgstr ""
+msgstr "Nelze zavést relaci"
 
 #: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
-msgstr ""
+msgstr "Svazek bude vytvořen v podpůrné vrstvě - %d"
 
 #: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
-msgstr ""
+msgstr "Nelze aktualizovat svazek v db"
 
 #: nova/volume/xensm.py:159
 msgid "Unable to create volume"
-msgstr ""
+msgstr "Nelze vytvořit svazek"
 
 #: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
-msgstr ""
+msgstr "Nelze smazat vdi"
 
 #: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
-msgstr ""
+msgstr "Nelze smazat svazek v db"
 
 #: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
-msgstr ""
+msgstr "Nelze najít svazek v db"
 
 #: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
-msgstr ""
+msgstr "Nelze najít podpůrnou vrstvu v db"
 
 #: nova/volume/nexenta/__init__.py:27
 #, fuzzy, python-format
@@ -7695,9 +7802,9 @@ msgid "Got response: %s"
 msgstr "odpověď %s"
 
 #: nova/volume/nexenta/volume.py:96
-#, python-format
+#, fuzzy, python-format
 msgid "Volume %s does not exist in Nexenta SA"
-msgstr ""
+msgstr "skupina svazku %s neexistuje"
 
 #: nova/volume/nexenta/volume.py:180
 msgid ""
@@ -7955,9 +8062,6 @@ msgstr ""
 #~ 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..."
 
@@ -8145,6 +8249,9 @@ msgstr ""
 #~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
 #~ msgstr "Úkol [%(name)s] %(task)s stav: %(status)s %(error_info)s"
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr "Automatické potvrzení instance %d"
+
 #~ msgid "virsh said: %r"
 #~ msgstr "virsh oznámil: %r"
 
@@ -8170,6 +8277,9 @@ msgstr ""
 #~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
 #~ msgstr "Vytvořeno VM %(instance_name)s jako %(vm_ref)s."
 
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr "Vytváření VBD na CD-ROM pro VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+
 #~ msgid ""
 #~ "Created a CDROM-specific VBD %(vbd_ref)s"
 #~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
@@ -8259,183 +8369,156 @@ msgstr ""
 #~ msgid "Destroying VM for Instance %(instance_uuid)s"
 #~ msgstr "Ničení VM instance %(instance_uuid)s"
 
-#~ msgid "Automatically hard rebooting %d"
-#~ msgstr ""
-
 #~ msgid "Instance for migration %d not found, skipping"
-#~ msgstr ""
-
-#~ msgid "injecting network info to xs for vm: |%s|"
-#~ msgstr ""
+#~ msgstr "Instance pro přesun %d nenalezena, přeskakování"
 
 #~ msgid "creating vif(s) for vm: |%s|"
-#~ msgstr ""
-
-#~ msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
-#~ msgstr ""
+#~ msgstr "vytváření vif pro vm: |%s|"
 
 #~ msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
-#~ msgstr ""
-
-#~ msgid "injecting hostname to xs for vm: |%s|"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "The agent call to %(method)s returned"
-#~ " an invalid response: %(ret)r. VM "
-#~ "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "TIMEOUT: The call to %(method)s timed"
-#~ " out. VM id=%(instance_uuid)s; args=%(args)r"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "NOT IMPLEMENTED: The call to %(method)s"
-#~ " is not supported by the agent. "
-#~ "VM id=%(instance_uuid)s; args=%(args)r"
-#~ msgstr ""
+#~ msgstr "Vytváření VIF %(vif_ref)s pro VM %(vm_ref)s, síť %(network_ref)s."
 
 #~ msgid ""
 #~ "The call to %(method)s returned an "
 #~ "error: %(e)s. VM id=%(instance_uuid)s; "
 #~ "args=%(args)r"
 #~ msgstr ""
+#~ "Volání %(method)s vrátilo chybu: %(e)s. "
+#~ "VM id=%(instance_uuid)s; arg=%(args)r"
 
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-#~ msgstr ""
+#~ msgstr "Vytváření VBD pro VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 
 #~ msgid "Error destroying VDI"
-#~ msgstr ""
-
-#~ msgid "Volume status must be available"
-#~ msgstr ""
+#~ msgstr "Chyba při ničení VDI"
 
 #~ msgid "\tVolume %s is NOT VSA volume"
-#~ msgstr ""
+#~ msgstr "\tSvazek %s NENÍ svazek VSA"
 
 #~ msgid "\tFE VSA Volume %s creation - do nothing"
-#~ msgstr ""
+#~ msgstr "\tVytváření svazku FE VSA %s - nic nedělat"
 
 #~ msgid "VSA BE create_volume for %s failed"
-#~ msgstr ""
+#~ msgstr "Vytvoření svazku VSA BE pro %s selhalo"
 
 #~ msgid "VSA BE create_volume for %s succeeded"
-#~ msgstr ""
+#~ msgstr "Vytvoření svazku VSA BE pro %s bylo úspěšné"
 
 #~ msgid "\tFE VSA Volume %s deletion - do nothing"
-#~ msgstr ""
+#~ msgstr "\tMazání svazku FE VSA %s - nic nedělat"
 
 #~ msgid "VSA BE delete_volume for %s failed"
-#~ msgstr ""
+#~ msgstr "Mazání svazku VSA BE pro %s selhalo"
 
 #~ msgid "VSA BE delete_volume for %s suceeded"
-#~ msgstr ""
+#~ msgstr "Smazání svazku VSA BE pro %s bylo úspěšné"
 
 #~ msgid "\tFE VSA Volume %s local path call - call discover"
-#~ msgstr ""
+#~ msgstr "\tSvazek FE VSA %s volání místní cesty - volání zjištění"
 
 #~ msgid "\tFE VSA Volume %s ensure export - do nothing"
-#~ msgstr ""
+#~ msgstr "\tSvazek FE VSA %s zajištění exportu - nic nedělat"
 
 #~ msgid "\tFE VSA Volume %s create export - do nothing"
-#~ msgstr ""
+#~ msgstr "\tSvazek FE VSA %s vytvoření exportu - nic nedělat"
 
 #~ msgid "\tFE VSA Volume %s remove export - do nothing"
-#~ msgstr ""
+#~ msgstr "\tSvazek FE VSA %s odstranění exportu - nic nedělat"
 
 #~ msgid "VSA BE remove_export for %s failed"
-#~ msgstr ""
+#~ msgstr "Odstranění exportu VSA BE pro %s selhalo"
 
 #~ msgid "Failed to retrieve QoS info"
-#~ msgstr ""
+#~ msgstr "Nelze získat informace QoS"
 
 #~ msgid "Could not determine project for volume %s, can't export"
-#~ msgstr ""
-
-#~ msgid "Deleting volumeID: %s "
-#~ msgstr ""
-
-#~ msgid "invalid drive data"
-#~ msgstr ""
+#~ msgstr "Nelze zjistit projekt pro svazek %s, nelze exportovat"
 
 #~ msgid "drive_name not defined"
-#~ msgstr ""
+#~ msgstr "název jednotky není určen"
 
 #~ msgid "invalid drive type name %s"
-#~ msgstr ""
+#~ msgstr "neplatný název typu jednotky %s"
 
 #~ msgid "*** Experimental VSA code ***"
-#~ msgstr ""
+#~ msgstr "*** Experimentální kód VSA ***"
 
 #~ msgid "Requested number of VCs (%d) is too high. Setting to default"
-#~ msgstr ""
+#~ msgstr "Požadovaný počet VC (%d) je příliš vysoký. Nastaveno na výchozí"
 
 #~ msgid "Creating VSA: %s"
-#~ msgstr ""
+#~ msgstr "Vytváření VSA: %s"
 
 #~ msgid ""
 #~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
 #~ "volume %(vol_name)s, %(vol_size)d GB, type "
 #~ "%(vol_type_id)s"
 #~ msgstr ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Vytvoření "
+#~ "svazku %(vol_name)s, %(vol_size)d GB, typ "
+#~ "%(vol_type_id)s"
 
 #~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-#~ msgstr ""
+#~ msgstr "VSA ID %(vsa_id)d: Aktualizace stavu VSA na %(status)s"
 
 #~ msgid "VSA ID %(vsa_id)d: Update VSA call"
-#~ msgstr ""
+#~ msgstr "VSA ID %(vsa_id)d: Volání aktualizace VSA"
 
 #~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-#~ msgstr ""
+#~ msgstr "Přidávání %(add_cnt)s VC do VSA %(vsa_name)s."
 
 #~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-#~ msgstr ""
+#~ msgstr "Mazání %(del_cnt)s VC z VSA %(vsa_name)s."
 
 #~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-#~ msgstr ""
+#~ msgstr "VSA ID %(vsa_id)s: Mazání %(direction)s svazku %(vol_name)s"
 
 #~ msgid "Unable to delete volume %s"
-#~ msgstr ""
+#~ msgstr "Nelze smazat svazek %s"
 
 #~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-#~ msgstr ""
+#~ msgstr "VSA ID %(vsa_id)s: Vynucené smazání. %(direction) svazek %(vol_name)s"
 
 #~ msgid "Going to try to terminate VSA ID %s"
-#~ msgstr ""
+#~ msgstr "Pokus o ukončení VSA ID %s"
 
 #~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-#~ msgstr ""
+#~ msgstr "VSA ID %(vsa_id)s: Mazání instance %(name)s"
 
 #~ msgid "Create call received for VSA %s"
-#~ msgstr ""
+#~ msgstr "Obdrženo volání vytvoření pro VSA %s"
 
 #~ msgid "Failed to find VSA %(vsa_id)d"
-#~ msgstr ""
+#~ msgstr "Nelze najít VSA %(vsa_id)d"
 
 #~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-#~ msgstr ""
+#~ msgstr "VSA ID %(vsa_id)s: Jednotka %(vol_id)s vytvořena. Stav %(status)s"
 
 #~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
 #~ msgstr ""
+#~ "Jednotka %(vol_name)s (%(vol_disp_name)s) stále "
+#~ "ve fázi vytvoření - čekejte"
 
 #~ msgid ""
 #~ "VSA ID %(vsa_id)d: Not all volumes "
 #~ "are created (%(cvol_real)d of %(cvol_exp)d)"
 #~ msgstr ""
+#~ "VSA ID %(vsa_id)d: Ne všechny svazky "
+#~ "jsou vytvořeny (%(cvol_real)d z %(cvol_exp)d)"
 
 #~ msgid ""
 #~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
 #~ "(%(vol_disp_name)s) is in %(status)s state"
 #~ msgstr ""
+#~ "VSA ID %(vsa_id)d: Jednotka %(vol_name)s "
+#~ "(%(vol_disp_name)s) je ve stavu %(status)s"
 
 #~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-#~ msgstr ""
+#~ msgstr "Nelze aktualizovat stav připojení pro svazek %(vol_name)s. %(ex)s"
 
 #~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-#~ msgstr ""
+#~ msgstr "VSA ID %(vsa_id)d: Smazat všechny svazky BE"
 
 #~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-#~ msgstr ""
+#~ msgstr "VSA ID %(vsa_id)d: Spouštění %(vc_count)d instancí"
 
diff --git a/nova/locale/da/LC_MESSAGES/nova.po b/nova/locale/da/LC_MESSAGES/nova.po
index 21cc4a063..40abb96d8 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-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -88,7 +88,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -151,7 +151,8 @@ msgstr ""
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -211,131 +212,127 @@ msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, 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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -343,777 +340,813 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:722
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
@@ -1123,22 +1156,22 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1150,193 +1183,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1372,135 +1420,135 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1509,245 +1557,247 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
+msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
+msgid "Key pair '%s' already exists."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:736
+#: nova/api/ec2/cloud.py:712
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1283
+msgid "Unable to associate IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2399,7 +2449,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2496,19 +2546,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2633,35 +2670,36 @@ msgstr ""
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:330
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, python-format
-msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:376
+#: nova/api/openstack/compute/contrib/volumes.py:342
 #, python-format
-msgid "Instance %s is not attached."
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:482
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2847,111 +2885,119 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:199
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2966,452 +3012,495 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, python-format
 msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3471,17 +3560,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3500,17 +3589,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3528,13 +3617,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3557,6 +3648,14 @@ msgstr ""
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3589,22 +3688,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3614,17 +3713,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3723,42 +3822,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3766,41 +3865,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3808,73 +3907,73 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3885,31 +3984,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3989,36 +4088,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4035,12 +4134,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr ""
@@ -4055,42 +4154,55 @@ msgstr ""
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -4170,59 +4282,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4287,19 +4399,19 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -4322,6 +4434,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4346,11 +4473,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4416,12 +4543,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4436,12 +4563,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4554,21 +4681,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4577,19 +4704,19 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4601,12 +4728,12 @@ msgstr ""
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4856,7 +4983,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4871,7 +4998,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5000,183 +5127,171 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "bind %s: slettet"
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5186,38 +5301,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5235,17 +5350,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5373,46 +5488,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5807,35 +5922,35 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 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:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -6554,88 +6669,57 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6852,37 +6936,37 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -6991,108 +7075,108 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "bind %s: slettet"
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -8012,6 +8096,9 @@ msgstr ""
 #~ msgid "no partitions found"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index d6d5ac2d2..ea44ea44a 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-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -93,7 +93,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -156,7 +156,8 @@ msgstr ""
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -216,131 +217,127 @@ msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, 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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -348,777 +345,813 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:722
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
@@ -1128,22 +1161,22 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1155,193 +1188,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr "Das Service-Datenbank-Objekt ist verschwunden, es wird erneut erzeugt."
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr "Alle vorhandenen FLAGS:"
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr "Hole %s"
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Führe Kommando (subprocess) aus: %s"
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr "Ergebnis war %s"
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1377,135 +1425,135 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1514,245 +1562,247 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
+msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
+msgid "Key pair '%s' already exists."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:736
+#: nova/api/ec2/cloud.py:712
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1283
+msgid "Unable to associate IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2404,7 +2454,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2501,19 +2551,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2638,35 +2675,36 @@ msgstr ""
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:330
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, python-format
-msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:376
+#: nova/api/openstack/compute/contrib/volumes.py:342
 #, python-format
-msgid "Instance %s is not attached."
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:482
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2852,111 +2890,119 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:199
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2971,454 +3017,497 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 #, fuzzy, python-format
 msgid "Instance not found."
 msgstr "Instanz %s pausiert"
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr "Instanz wurde bereits erstellt"
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, python-format
 msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 #, fuzzy, python-format
 msgid "Detaching volume from unknown instance"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3478,17 +3567,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3507,17 +3596,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3535,13 +3624,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3564,6 +3655,14 @@ msgstr ""
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3596,22 +3695,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3621,17 +3720,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3730,42 +3829,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3773,41 +3872,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3815,73 +3914,73 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3892,31 +3991,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3996,36 +4095,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4042,12 +4141,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr ""
@@ -4062,42 +4161,55 @@ msgstr "keine Methode für diese Nachricht gefunden: %s"
 msgid "No method for message: %s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID ist %s"
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -4177,59 +4289,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4294,19 +4406,19 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -4329,6 +4441,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4353,11 +4480,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4423,12 +4550,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4443,12 +4570,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4561,21 +4688,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4584,19 +4711,19 @@ 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:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4608,12 +4735,12 @@ msgstr ""
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4863,7 +4990,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4878,7 +5005,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5007,183 +5134,171 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "Volume %s: erfolgreich erstellt"
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5193,38 +5308,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5242,17 +5357,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5380,46 +5495,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5815,35 +5930,35 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 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:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -6562,88 +6677,57 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6860,37 +6944,37 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -6999,108 +7083,108 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr "Volume %s: wird erstellt"
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr "Volume %s: erstelle Export"
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "Volume %s: erfolgreich erstellt"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr "Volume %s: entferne Export"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr "Volume %s: wird entfernt"
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "Volume %s: erfolgreich entfernt"
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -8014,6 +8098,9 @@ msgstr ""
 #~ msgid "no partitions found"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
diff --git a/nova/locale/en_AU/LC_MESSAGES/nova.po b/nova/locale/en_AU/LC_MESSAGES/nova.po
index e58310240..7dc1b8ac9 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-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -93,7 +93,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -156,7 +156,8 @@ msgstr ""
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -216,132 +217,128 @@ msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, 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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Going to start terminating instances"
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -349,777 +346,813 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:722
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, 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:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
 msgstr "Could not attach image to loopback: %s"
@@ -1129,22 +1162,22 @@ msgstr "Could not attach image to loopback: %s"
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1156,193 +1189,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr "Starting %(topic)s node (version %(vcs_string)s)"
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr "Service killed that has no database entry"
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr "The service database object disappeared, Recreating it."
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr "Recovered model server connection!"
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr "model server went away"
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr "Fetching %s"
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, 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:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1378,21 +1426,21 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr "Too many failed authentications."
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1401,114 +1449,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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Authentication Failure: %s"
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr "Authenticated Request For %(uname)s:%(pname)s)"
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr "action: %s"
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "Unauthorised request for controller=%(controller)s and action=%(action)s"
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "InstanceNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "VolumeNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Unexpected error raised: %s"
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Unexpected error raised: %s"
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 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."
 
@@ -1517,246 +1565,249 @@ 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: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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
-msgstr ""
+msgid "Create key pair %s"
+msgstr "Create key pair %s"
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
-msgstr "Create key pair %s"
+msgid "Key pair '%s' already exists."
+msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair %s"
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: 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:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, 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:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr "No rule for the specified parameters."
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: 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:736
+#: nova/api/ec2/cloud.py:712
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "This rule already exists in group %s"
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: 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:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr "group %s already exists"
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: 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:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: 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:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, 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:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume %s"
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Detach volume %s"
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribute not supported: %s"
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr "Allocate address"
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr "Release address %s"
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, 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:1299
+#: nova/api/ec2/cloud.py:1283
+#, fuzzy, python-format
+msgid "Unable to associate IP Address."
+msgstr "Disassociate address %s"
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr "Going to start terminating instances"
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance %r"
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image %s"
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, 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:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr "user or group not specified"
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr "only group \"all\" is supported"
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr "operation_type must be add or remove"
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Updating image %s publicity"
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2409,7 +2460,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2506,19 +2557,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2646,35 +2684,36 @@ msgstr "Reboot instance %r"
 msgid "stop instance"
 msgstr "Reboot instance %r"
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: 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:376
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "instance %s: booted"
 
-#: nova/api/openstack/compute/contrib/volumes.py:482
+#: nova/api/openstack/compute/contrib/volumes.py:342
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2865,116 +2904,124 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 #, 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:198
+#: nova/compute/api.py:199
 #, 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:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2989,464 +3036,507 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorating: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: locked: |%s|"
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: executing: |%s|"
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: not executing |%s|"
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 #, fuzzy, python-format
 msgid "Instance not found."
 msgstr "instance %s: booted"
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr "Instance has already been created"
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "Running instances: %s"
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, fuzzy, python-format
 msgid "injecting file to %(path)s"
 msgstr "Injecting file path: '%s'"
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, python-format
 msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 #, fuzzy, python-format
 msgid "Unrescuing"
 msgstr "instance %s: unrescuing"
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 #, fuzzy, python-format
 msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 #, fuzzy, python-format
 msgid "Suspending"
 msgstr "instance %s: suspending"
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 #, fuzzy, python-format
 msgid "Getting locked state"
 msgstr "instance %s: getting locked state"
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 #, fuzzy
 msgid "Reset network"
 msgstr "setting network host"
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 #, fuzzy
 msgid "Inject network info"
 msgstr "setting network host"
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 #, fuzzy, python-format
 msgid "Get console output"
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Adding console"
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, 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:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 #, fuzzy, python-format
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3506,17 +3596,17 @@ msgstr "Restarting xvp"
 msgid "xvp not running..."
 msgstr "xvp not running..."
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3535,17 +3625,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3563,13 +3653,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3592,6 +3684,14 @@ msgstr ""
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3624,22 +3724,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3649,17 +3749,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "Failed to decrypt initialisation vector: %s"
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "Failed to decrypt image file %(image_file)s: %(err)s"
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3758,42 +3858,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3801,41 +3901,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr "setting network host"
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3843,67 +3943,67 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s released that was not leased"
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
@@ -3911,7 +4011,7 @@ msgstr ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3922,31 +4022,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -4026,36 +4126,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4072,12 +4172,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr "unpacked context: %s"
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr "received %s"
@@ -4092,42 +4192,55 @@ msgstr "no method for message: %s"
 msgid "No method for message: %s"
 msgstr "No method for message: %s"
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID is %s"
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Returning exception %s to caller"
@@ -4207,59 +4320,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr "Must implement a fallback schedule"
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4324,19 +4437,19 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -4359,6 +4472,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4383,11 +4511,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4453,12 +4581,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr "Target %s allocated"
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4473,12 +4601,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4591,21 +4719,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "Nested received %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr "Nested return %s"
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
@@ -4614,19 +4742,19 @@ 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:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4638,12 +4766,12 @@ msgstr ""
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4895,7 +5023,7 @@ msgstr "instance %s: starting toXML method"
 msgid "instance %s: finished toXML method"
 msgstr "instance %s: finished toXML method"
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4910,7 +5038,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5039,183 +5167,171 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr "nbd device %s did not show up"
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr "Connection to libvirt broke"
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: rebooted"
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5225,38 +5341,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5274,17 +5390,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5412,46 +5528,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr "Unable to find an open port"
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "received %s"
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, fuzzy, python-format
 msgid "Wrote: %s"
 msgstr "Re-wrote %s"
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5850,7 +5966,7 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -5860,28 +5976,28 @@ msgstr ""
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 
-#: nova/virt/xenapi/connection.py:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr "Got exception: %s"
@@ -6611,89 +6727,58 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "setting network host"
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, 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:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, 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:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL error: %s"
@@ -6910,37 +6995,37 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -7051,108 +7136,108 @@ msgstr "Sheepdog is not working"
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "Re-exporting %s volumes"
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "volume %s: skipping export"
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr "volume %s: creating"
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, 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:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr "volume %s: creating export"
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: created successfully"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr "Volume is still attached"
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr "Volume is not local to this node"
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removing export"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: deleting"
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: deleted successfully"
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instance %s: snapshotting"
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -8037,6 +8122,9 @@ msgstr ""
 #~ msgid "no partitions found"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr "virsh said: %r"
 
diff --git a/nova/locale/en_GB/LC_MESSAGES/nova.po b/nova/locale/en_GB/LC_MESSAGES/nova.po
index 1f1ed10b2..94c1970e8 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-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -93,7 +93,7 @@ msgstr "DB exception wrapped."
 msgid "An unknown exception occurred."
 msgstr "An unknown exception occurred."
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -156,7 +156,8 @@ msgstr "Invalid snapshot"
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Volume %(volume_id)s is not attached to anything"
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr "Keypair data is invalid"
 
@@ -216,19 +217,15 @@ msgid "Invalid cidr %(cidr)s."
 msgstr "Invalid cidr %(cidr)s."
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr "Invalid reuse of an RPC connection."
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -237,12 +234,12 @@ msgstr ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -251,100 +248,100 @@ msgstr ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 
-#: nova/exception.py:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -352,777 +349,813 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:722
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
@@ -1132,22 +1165,22 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1159,193 +1192,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr "Full set of FLAGS:"
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr "Fetching %s"
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, 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:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1381,135 +1429,135 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1518,246 +1566,248 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
+msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
+msgid "Key pair '%s' already exists."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 #, fuzzy, python-format
 msgid "Invalid CIDR"
 msgstr "Invalid cidr %(cidr)s."
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:736
+#: nova/api/ec2/cloud.py:712
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1283
+msgid "Unable to associate IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2409,7 +2459,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2506,19 +2556,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2643,35 +2680,36 @@ msgstr ""
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: 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:376
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "instance %s: snapshotting"
 
-#: nova/api/openstack/compute/contrib/volumes.py:482
+#: nova/api/openstack/compute/contrib/volumes.py:342
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2858,111 +2896,119 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:199
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2977,461 +3023,504 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorating: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: locked: |%s|"
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: executing: |%s|"
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: not executing |%s|"
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 #, fuzzy, python-format
 msgid "Instance not found."
 msgstr "instance %s: suspending"
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr "Instance has already been created"
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "VBD not found in instance %s"
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, python-format
 msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 #, fuzzy, python-format
 msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 #, fuzzy, python-format
 msgid "Suspending"
 msgstr "instance %s: suspending"
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 #, fuzzy, python-format
 msgid "Getting locked state"
 msgstr "instance %s: getting locked state"
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 #, fuzzy, python-format
 msgid "Reset network"
 msgstr "instance %s: reset network"
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 #, fuzzy, python-format
 msgid "Get console output"
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, 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:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 #, fuzzy, python-format
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, fuzzy, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr "Instance %(instance_id)s is not running."
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3491,17 +3580,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3520,17 +3609,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3548,13 +3637,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3577,6 +3668,14 @@ msgstr ""
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3609,22 +3708,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3634,17 +3733,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3743,42 +3842,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3786,41 +3885,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3828,73 +3927,73 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3905,31 +4004,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -4009,36 +4108,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4055,12 +4154,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr ""
@@ -4075,42 +4174,56 @@ msgstr ""
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+#, fuzzy
+msgid "An unknown RPC related exception occurred."
+msgstr "An unknown exception occurred."
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr "Invalid reuse of an RPC connection."
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -4190,59 +4303,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4307,19 +4420,19 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, fuzzy, python-format
 msgid "Setting instance to %(state)s state."
 msgstr "Invalid instance type %(instance_type)s."
@@ -4342,6 +4455,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4366,11 +4494,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4436,12 +4564,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4456,12 +4584,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4574,21 +4702,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "Nested received %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr "Nested return %s"
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
@@ -4597,19 +4725,19 @@ 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:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4621,12 +4749,12 @@ msgstr ""
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4876,7 +5004,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4891,7 +5019,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5020,184 +5148,172 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: created successfully"
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "User does not have admin privileges"
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5207,38 +5323,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5256,17 +5372,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5394,46 +5510,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5829,35 +5945,35 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 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:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -6583,88 +6699,57 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr "Instance %(instance_id)s is not running."
-
-#: nova/virt/xenapi/vmops.py:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, 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:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, 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:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6881,37 +6966,37 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -7022,108 +7107,108 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "Re-exporting %s volumes"
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "volume %s: skipping export"
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr "volume %s: creating"
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, 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:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr "volume %s: creating export"
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: created successfully"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr "Volume is still attached"
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr "Volume is not local to this node"
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removing export"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: deleting"
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: deleted successfully"
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instance %s: snapshotting"
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -8022,6 +8107,9 @@ msgstr ""
 #~ msgid "no partitions found"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index ca8377548..9113582e7 100644
--- a/nova/locale/es/LC_MESSAGES/nova.po
+++ b/nova/locale/es/LC_MESSAGES/nova.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-05-13 23:02+0000\n"
-"PO-Revision-Date: 2012-04-18 14:35+0000\n"
-"Last-Translator: nat6091 <Unknown>\n"
+"POT-Creation-Date: 2012-05-20 23:02+0000\n"
+"PO-Revision-Date: 2012-05-16 06:44+0000\n"
+"Last-Translator: Paco Molinero <paco@byasl.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr "Nombre de fichero de la clave privada"
 
 #: nova/crypto.py:54
 msgid "Filename of root Certificate Revocation List"
-msgstr ""
+msgstr "Lista de nombre de archivo de root con certificado de  revocacion"
 
 #: nova/crypto.py:57
 msgid "Where we keep our keys"
@@ -91,13 +91,13 @@ msgstr ""
 
 #: nova/exception.py:72
 msgid "DB exception wrapped."
-msgstr ""
+msgstr "excepción DB empaquetada."
 
 #: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr "Una excepcion desconocida ha ocurrido"
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -125,7 +125,7 @@ msgstr ""
 
 #: nova/exception.py:196
 msgid "Connection to glance failed"
-msgstr "Coneccion con glance fallida"
+msgstr "Conexión con glance fallida"
 
 #: nova/exception.py:200
 msgid "Connection to melange failed"
@@ -162,13 +162,14 @@ msgstr "Captura no valida"
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Volumen %(volume_id)s no está conectado con nada"
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr ""
 
 #: nova/exception.py:238
 msgid "Failed to load data into json format"
-msgstr "Fallo al ingresar informacion en formato json"
+msgstr "Fallo al ingresar información en formato json"
 
 #: nova/exception.py:242
 msgid "The request is invalid."
@@ -186,7 +187,7 @@ msgstr "Entrada invalida recibida"
 #: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
-msgstr ""
+msgstr "Tipo de instancia inválido %(instance_type)s."
 
 #: nova/exception.py:258
 msgid "Invalid volume type"
@@ -194,7 +195,7 @@ msgstr "Tipo de volumen no válido"
 
 #: nova/exception.py:262
 msgid "Invalid volume"
-msgstr ""
+msgstr "Volumen inválido"
 
 #: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
@@ -222,134 +223,130 @@ msgid "Invalid cidr %(cidr)s."
 msgstr "Cidr %(cidr)s invalido"
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr "Reuso invalido de una coneccion RPC"
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
-msgstr ""
+msgstr "%(err)s"
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, 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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "La instacia %(instance_id)s no se esta ejecutando"
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, 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:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
-msgstr "Fallo al resumir el servidor"
+msgstr "Fallo al reiniciar el servidor"
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr "El servicio no esta disponible en este momento"
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr "El servicio de computo no esta disponible en este momento"
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, 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:356
+#: nova/exception.py:352
 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:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr "El anfitrion de computo no esta disponible en este momento"
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr "Informacion del CPU inaceptable"
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, 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:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -357,777 +354,813 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Formato de disco %(disk_format)s no es aceptable"
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
-msgstr ""
+msgstr "La imagen %(image_id)s es inaceptable: %(reason)s"
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:722
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, 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
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, 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:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
 msgstr "No se puede unir la imagen con el loopback: %s"
@@ -1137,22 +1170,22 @@ msgstr "No se puede unir la imagen con el loopback: %s"
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1164,193 +1197,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr "Se detuvo un servicio sin entrada en la base de datos"
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr "El servicio objeto de base de datos ha desaparecido, recreándolo."
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr "Recuperada la conexión al servidor de modelos."
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr "el servidor de modelos se ha ido"
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr "Conjunto completo de opciones (FLAGS):"
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr "Obteniendo %s"
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Ejecutando cmd (subprocesos): %s"
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr "El resultado fue %s"
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "corriendo cmd (SSH): %s"
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr "Depuración de la devolución de llamada: %s"
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "No se encuentra la dirección del enlace local.:%s"
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, 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:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "backend inválido: %s"
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1386,135 +1434,135 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr "Demasiados intentos de autenticacion fallidos."
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Fallo de autenticación: %s"
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr "acción: %s"
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "No encontrado: %s"
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 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."
 
@@ -1523,247 +1571,250 @@ 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: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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
-msgstr ""
+msgid "Create key pair %s"
+msgstr "Creando par de claves %s"
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
-msgstr "Creando par de claves %s"
+msgid "Key pair '%s' already exists."
+msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Borrar para de claves %s"
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 #, fuzzy, python-format
 msgid "Invalid CIDR"
 msgstr "Cidr %(cidr)s invalido"
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: 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:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr "No hay regla para los parámetros especificados."
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: 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:736
+#: nova/api/ec2/cloud.py:712
 #, 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:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: 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:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr "el grupo %s ya existe"
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: 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:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: 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:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr "Desasociar volumen %s"
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Desasociar volumen %s"
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "atributo no soportado: %s"
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr "Asignar dirección"
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr "Liberar dirección %s"
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1283
+#, fuzzy, python-format
+msgid "Unable to associate IP Address."
+msgstr "Desasociar dirección %s"
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Desasociar dirección %s"
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reiniciar instancia %r"
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr "Des-registrando la imagen %s"
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr "usuario o grupo no especificado"
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr "sólo el grupo \"all\" está soportado"
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr "operation_type debe ser añadir o eliminar"
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Actualizando imagen %s públicamente"
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2416,7 +2467,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2513,19 +2564,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2653,35 +2691,36 @@ msgstr "Reiniciar instancia %r"
 msgid "stop instance"
 msgstr "Reiniciar instancia %r"
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: 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:376
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "instancia %s: arrancada"
 
-#: nova/api/openstack/compute/contrib/volumes.py:482
+#: nova/api/openstack/compute/contrib/volumes.py:342
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2842,7 +2881,7 @@ 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"
+msgstr "Tipo de instancia inválido %(instance_type)s."
 
 #: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
@@ -2870,120 +2909,128 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 #, 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:198
+#: nova/compute/api.py:199
 #, 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:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2998,462 +3045,505 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorating: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: locked: |%s|"
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: ejecutando: |%s|"
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: no ejecutando |%s|"
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 #, fuzzy, python-format
 msgid "Instance not found."
 msgstr "instancia %s: arrancada"
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr "La instancia ha sido creada previamente"
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "Ejecutando instancias: %s"
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, python-format
 msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 #, fuzzy, python-format
 msgid "Retrieving diagnostics"
 msgstr "instancia %s: obteniendo los diagnosticos"
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 #, fuzzy, python-format
 msgid "Suspending"
 msgstr "instancia %s: suspendiendo"
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 #, fuzzy, python-format
 msgid "Getting locked state"
 msgstr "instancia %s: pasando a estado bloqueado"
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 #, fuzzy
 msgid "Reset network"
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 #, fuzzy
 msgid "Inject network info"
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 #, fuzzy, python-format
 msgid "Get console output"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 #, fuzzy, python-format
 msgid "Detaching volume from unknown instance"
 msgstr "Desvinculando volumen de instancia desconocida %s"
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, fuzzy, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr "La instacia %(instance_id)s no esta suspendida"
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3513,17 +3603,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3542,17 +3632,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3570,13 +3660,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3599,6 +3691,14 @@ msgstr ""
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3631,22 +3731,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3656,17 +3756,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3765,42 +3865,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3808,41 +3908,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr "configurando la red del host"
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3850,73 +3950,73 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3927,31 +4027,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -4031,36 +4131,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4077,12 +4177,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr "contenido desempaquetado: %s"
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr "recibido %s"
@@ -4097,42 +4197,56 @@ msgstr "no hay método para el mensaje: %s"
 msgid "No method for message: %s"
 msgstr "No hay método para el mensaje: %s"
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID es %s"
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+#, fuzzy
+msgid "An unknown RPC related exception occurred."
+msgstr "Una excepcion desconocida ha ocurrido"
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr "Reuso invalido de una coneccion RPC"
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -4212,59 +4326,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr "Debe de implementar un horario de reserva"
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4329,22 +4443,22 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
-#, python-format
+#: nova/scheduler/manager.py:163
+#, fuzzy, python-format
 msgid "Setting instance to %(state)s state."
-msgstr ""
+msgstr "Tipo de instancia inválido %(instance_type)s."
 
 #: nova/scheduler/scheduler_options.py:66
 #, python-format
@@ -4364,6 +4478,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4388,11 +4517,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4458,12 +4587,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr "Destino %s asignado"
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4478,12 +4607,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4596,21 +4725,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr "Recibido %s"
@@ -4619,19 +4748,19 @@ 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:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4644,12 +4773,12 @@ msgstr "Fallo a reinicia la instancia"
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4899,7 +5028,7 @@ msgstr "instancia %s: comenzando método toXML"
 msgid "instance %s: finished toXML method"
 msgstr "instancia %s: finalizado método toXML"
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4914,7 +5043,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5043,185 +5172,173 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Conectando a libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr "Conexión a libvirt rota"
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "instancia %s: reiniciada"
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "El usuario no tiene privilegios de administrador"
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5231,38 +5348,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5280,17 +5397,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5418,46 +5535,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "recibido %s"
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Iniciando interfaz puente para %s"
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5856,7 +5973,7 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -5865,28 +5982,28 @@ msgstr ""
 "Debes especificar xenapi_connection_url, xenapi_connection_username "
 "(opcional), y xenapi_connection_password para usar connection_type=xenapi"
 
-#: nova/virt/xenapi/connection.py:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr "Obtenida excepción %s"
@@ -6614,89 +6731,58 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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: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:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "configurando la red del host"
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, 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:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, 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:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6919,37 +7005,37 @@ msgstr ""
 "El punto de montaje %(mountpoint)s se desligó de la instancia "
 "%(instance_name)s"
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -7060,116 +7146,116 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "Exportando de nuevo los volumenes %s"
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "volume %s: saltando exportación"
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr "volumen %s: creando"
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, 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:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr "volumen %s: exportando"
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volumen %s: creado satisfactoriamente"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr "El volumen todavía está asociado"
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr "Volumen no local a este nodo"
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volumen %s: eliminando exportación"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volumen %s: eliminando"
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volumen %s: eliminado satisfactoriamente"
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
 
 #: nova/volume/netapp.py:79
-#, python-format
+#, fuzzy, python-format
 msgid "API %(name)sfailed: %(reason)s"
-msgstr ""
+msgstr "La imagen %(image_id)s es inaceptable: %(reason)s"
 
 #: nova/volume/netapp.py:109
 #, python-format
@@ -8052,6 +8138,9 @@ msgstr ""
 #~ msgid "no partitions found"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr "virsh dijo: %r"
 
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index 4c944a6ef..1e1c53189 100644
--- a/nova/locale/fr/LC_MESSAGES/nova.po
+++ b/nova/locale/fr/LC_MESSAGES/nova.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-05-13 23:02+0000\n"
-"PO-Revision-Date: 2012-04-11 14:21+0000\n"
-"Last-Translator: EmmanuelLeNormand <manu@ubuntu-fr.org>\n"
+"POT-Creation-Date: 2012-05-20 23:02+0000\n"
+"PO-Revision-Date: 2012-05-14 08:35+0000\n"
+"Last-Translator: Erwan Gallen <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
@@ -95,7 +95,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr "Une exception inconnue s'est produite."
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -160,7 +160,8 @@ msgstr "Snapshot invalide"
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Le volume %(volume_id)s n'est lié à rien"
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr "La paire de clés de donnée n'est pas valide"
 
@@ -220,19 +221,15 @@ msgid "Invalid cidr %(cidr)s."
 msgstr "Le cidr %(cidr)s est invalide"
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr "Réutilisation invalide d'une connexion RPC"
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -241,12 +238,12 @@ msgstr ""
 "Impossible d'effectuer l'action '%(action)s' sur l'ensemble "
 "%(aggregate_id)s. Raison: %(reason)s."
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -255,72 +252,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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "L'instance %(instance_id)s  ne fonctionne pas."
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr "L'instance %(instance_id)s  n'est pas suspendue"
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, 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:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr "Échec de la reprise du serveur"
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr "Le service est indisponible actuellement."
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr "Le service de calcul est indisponible actuellement."
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, 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:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr "L'hôte destinataire de calcul est indisponible actuellement."
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr "L'hôte original de calcul est indisponible actuellement."
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr "Le type de l'hyperviseur fourni n'est pas valide."
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 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:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
@@ -329,26 +326,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:378
+#: nova/exception.py:374
 #, 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:382
+#: nova/exception.py:378
 #, 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:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr "Info CPU inacceptable"
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, 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:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
@@ -358,7 +355,7 @@ msgstr ""
 " VLAN prévu est %(tag)s, mais celui qui est associé avec le groupe de "
 "port est %(pgroup)s."
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -369,118 +366,118 @@ msgstr ""
 "l'adaptateur physique souhaité. VSwitch est %(expected)s, mais la "
 "principale association est %(actual)s."
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, 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:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "L'image %(image_id)s est inacceptable: %(reason)s"
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "L'instance %(instance_id)s est inacceptable: %(reason)s"
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s est inaccepatble."
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr "La ressource n'a pas pu être trouvée."
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr "Le drapeau requis %(flag)s n'est pas défini"
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, 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:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr "Volume non trouvé pour l'instance %(instance_id)s."
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, 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:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, 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:462
+#: nova/exception.py:458
 #, 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:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, 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:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, 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:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "Aucun disque sur %(location)s"
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, 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:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "L'image href %(image_href)s est invalide."
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
@@ -488,80 +485,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:506
+#: nova/exception.py:502
 #, 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:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, 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:518
+#: nova/exception.py:514
 #, 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:522
+#: nova/exception.py:518
 #, 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:526
+#: nova/exception.py:522
 #, 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:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr "Impossible de trouver le SR pour lire/écrire le VDI."
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, 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:538
+#: nova/exception.py:534
 #, 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:542
+#: nova/exception.py:538
 #, 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:546
+#: nova/exception.py:542
 #, 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:550
+#: nova/exception.py:546
 #, 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:554
+#: nova/exception.py:550
 #, 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:558
+#: nova/exception.py:554
 #, 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:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr "Aucun réseau défini."
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -570,53 +567,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:571
+#: nova/exception.py:567
 #, 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:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, 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:587
+#: nova/exception.py:583
 #, 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:591
+#: nova/exception.py:587
 #, 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:595
+#: nova/exception.py:591
 #, 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:600
+#: nova/exception.py:596
 #, 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:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr "L'hôte %(host)s n'a aucunes IPs fixes."
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
@@ -625,139 +622,171 @@ msgstr ""
 "L'adresse IP fixe (%(address)s) n'existe pas dans le réseau "
 "(%(network_uuid)s)."
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, 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:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "L'adresse IP fixe %(address)s est invalide."
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr "Aucunes IPs fixes disponibles."
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr "Aucunes IPs fixes trouvées."
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, 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:633
+#: nova/exception.py:629
 #, 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:637
+#: nova/exception.py:633
 #, 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:641
+#: nova/exception.py:637
 #, 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:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr "Aucune IPs dynamiques disponibles."
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "L'IP dynamique %(address)s n'est pas associée."
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr "Aucunes IPs dynamiques existes."
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "L'interface %(interface)s non trouvée."
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, 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:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "Le certificat %(certificate_id)s non trouvé."
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, 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:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "L'hôte %(host)s ne peut pas être trouvé."
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, 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:685
+#: nova/exception.py:681
 #, 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:689
+#: nova/exception.py:685
 #, 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:693
+#: nova/exception.py:689
 #, 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:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr "Le quota ne peut pas être trouvé"
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, 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:705
+#: nova/exception.py:714
 #, 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:709
+#: nova/exception.py:718
+#, fuzzy, python-format
+msgid "Quota usage 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:722
+#, fuzzy, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr "L'utilisateur %(user_id)s n'a pas été trouvé."
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, 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:713
+#: nova/exception.py:734
 #, 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:718
+#: nova/exception.py:739
 #, 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:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -766,7 +795,7 @@ msgstr ""
 "Le groupe de sécurité %(security_group_id)s est déjà associé avec "
 "l'instance %(instance_id)s"
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -775,97 +804,97 @@ msgstr ""
 "Le groupe de sécurité %(security_group_id)s n'est pas associé avec "
 "l'instance %(instance_id)s"
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, 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:736
+#: nova/exception.py:757
 #, 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:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, 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:755
+#: nova/exception.py:776
 #, 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:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr "Le type de console %(console_type)s est invalide "
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr "Aucuns types d'instance trouvés."
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, 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:776
+#: nova/exception.py:797
 #, 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:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "Le Flavor %(flavor_id)s ne peut être trouvé."
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, 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:789
+#: nova/exception.py:810
 #, 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:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
@@ -874,292 +903,296 @@ msgstr ""
 "Le volume %(volume_id)s n'a pas de métadonnée avec la clé "
 "%(metadata_key)s."
 
-#: nova/exception.py:812
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
-msgstr ""
+msgstr "L'utilisateur LDAP %(user_id)s n'est pas membre du groupe %(group_id)s."
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, 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:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, 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:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
@@ -1169,22 +1202,22 @@ msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1196,193 +1229,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, 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:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr "Service détruit sans entrée dans la base de données"
 
-#: nova/service.py:321
+#: nova/service.py:324
 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:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr "Récupération du modelle de connexion serveur terminée!"
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr "Le modèle de serveur à disparu"
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr "Ensemble de propriétés complet :"
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr "Récupèration de %s"
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Execution de la commande (sous-processus) : %s"
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr "Le résultat était %s"
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Execution de la cmd (SSH): %s"
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr "Debug dans le rappel : %s"
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, 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:468
+#: nova/utils.py:466
 #, 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:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend invalide : %s"
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1418,21 +1466,21 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr "Trop d'erreur d'authentification"
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1442,116 +1490,116 @@ msgstr ""
 "d'authentification et sera par conséquent vérouillée pour %(lock_mins)d "
 "minutes."
 
-#: nova/api/ec2/__init__.py:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Echec d'authentification : %s"
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr "Requête authentifiée pour : %(uname)s:%(pname)s)"
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr "action: %s"
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 "Requête non authorisé pour le controlleur=%(controller)s et "
 "l'action=%(action)s"
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "\"Instance non trouvée\" remontée : %s"
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "\"Volume non trouvé\" remonté : %s"
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "\"Non trouvé\" remonté : %s"
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 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."
 
@@ -1562,251 +1610,254 @@ msgstr ""
 "Requête API non supportée : controleur = %(controller)s, action = "
 "%(action)s"
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
-msgstr ""
+msgid "Create key pair %s"
+msgstr "Création du bi-clef %s"
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
-msgstr "Création du bi-clef %s"
+msgid "Key pair '%s' already exists."
+msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Suppression du bi-clef %s"
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 #, fuzzy, python-format
 msgid "Invalid CIDR"
 msgstr "Le cidr %(cidr)s est invalide"
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: 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:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, 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:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr "Pas de règle pour les paramètres spécifiés."
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: 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:736
+#: nova/api/ec2/cloud.py:712
 #, 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:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: 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:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr "le groupe %s existe déjà"
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: 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:845
+#: nova/api/ec2/cloud.py:821
 #, 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:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: 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:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, 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:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr "Dé-montage du volume %s"
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Dé-montage du volume %s"
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribut non reconnu : %s"
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr "Allocation d'adresse"
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr "Désallocation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, 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:1299
+#: nova/api/ec2/cloud.py:1283
+#, fuzzy, python-format
+msgid "Unable to associate IP Address."
+msgstr "Désassociation de l'adresse %s"
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Désassociation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr "Début de la destruction d'instance"
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Re-démarrage de l'instance %r"
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr "Dé-enregitrement de l'image %s"
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, 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:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr "Utilisateur ou groupe non spécifié"
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr "Seul le group \"tous\" est supporté"
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 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:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Mis à jour de la publication de l'image %s"
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2459,7 +2510,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2556,19 +2607,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2696,35 +2734,36 @@ msgstr "Re-démarrage de l'instance %r"
 msgid "stop instance"
 msgstr "Re-démarrage de l'instance %r"
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: 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:376
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, 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/compute/contrib/volumes.py:342
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2919,120 +2958,128 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 #, 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:198
+#: nova/compute/api.py:199
 #, 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:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Démarrage de %s instances..."
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -3047,464 +3094,507 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: décoration : |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin : |%s|"
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: vérouillé : |%s|"
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin : |%s|"
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: exécution : |%s|"
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: ne s'éxécute pas |%s|"
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 #, fuzzy
 msgid "Instance not found."
 msgstr "Aucuns types d'instance trouvés."
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr "L'instance a déjà été crée"
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "Instance actives : %s"
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, fuzzy, python-format
 msgid "injecting file to %(path)s"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, python-format
 msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 #, fuzzy, python-format
 msgid "Unrescuing"
 msgstr "instance %s: dé-récupération"
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 #, fuzzy, python-format
 msgid "Retrieving diagnostics"
 msgstr "instance %s: récupération des diagnostiques"
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 #, fuzzy, python-format
 msgid "Suspending"
 msgstr "instance %s: suspension"
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 #, fuzzy, python-format
 msgid "Getting locked state"
 msgstr "instance %s: récupération de l'état de vérouillage"
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 #, fuzzy
 msgid "Reset network"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 #, fuzzy
 msgid "Inject network info"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 #, 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
+#: nova/compute/manager.py:1730
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Ajout de console"
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, 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:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 #, fuzzy, python-format
 msgid "Detaching volume from unknown instance"
 msgstr "Démontage de volume d'une instance inconnue %s"
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, fuzzy, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3564,17 +3654,17 @@ msgstr "Re-démarrage xvp"
 msgid "xvp not running..."
 msgstr "xvp non actif..."
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3593,17 +3683,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3621,13 +3711,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3651,6 +3743,14 @@ msgstr "Le quota ne peut pas être trouvé"
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3683,22 +3783,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3708,17 +3808,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr "Impossible de déchiffrer la clef privée : %s"
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "Impossible de déchiffrer le vecteur d'initialisation : %s"
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "Impossible de déchiffrer le fichier image %(image_file)s: %(err)s"
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3817,42 +3917,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, fuzzy, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr "Le certificat %(certificate_id)s non trouvé."
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3860,41 +3960,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3902,73 +4002,73 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, 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:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 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:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3979,31 +4079,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -4083,36 +4183,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4129,12 +4229,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr "Contexte décompacté : %s"
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr "%s reçu"
@@ -4149,42 +4249,56 @@ msgstr "Pas de méthode pour le message : %s"
 msgid "No method for message: %s"
 msgstr "Pas de méthode pour le message : %s"
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID est %s"
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+#, fuzzy
+msgid "An unknown RPC related exception occurred."
+msgstr "Une exception inconnue s'est produite."
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr "Réutilisation invalide d'une connexion RPC"
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Renvoi de l'exception %s à l'appelant"
@@ -4264,59 +4378,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr "Doit mettre en oeuvre un calendrier de retrait"
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4381,19 +4495,19 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, fuzzy, python-format
 msgid "Setting instance to %(state)s state."
 msgstr "L'instance de type %(instance_type)s est invalide."
@@ -4416,6 +4530,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4440,11 +4569,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4510,12 +4639,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr "Destination %s allouée"
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4530,12 +4659,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4648,21 +4777,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "Reception par Nested %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr "Nested renvoi %s"
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr "%s Reçu"
@@ -4671,19 +4800,19 @@ 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:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4696,12 +4825,12 @@ msgstr "Échec du redémarrage de l'instance"
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4953,7 +5082,7 @@ msgstr "instance %s: démarrage de la méthode toXML"
 msgid "instance %s: finished toXML method"
 msgstr "instance %s: fin d'éxécution de la méthode toXML"
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4968,7 +5097,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5097,185 +5226,173 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr "Device nbd %s n'est pas apparu"
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connexion à libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr "Connexion à libvirt interrompue"
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: re-démarrée"
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "L’utilisateur n'a pas les privilèges administrateur"
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5285,38 +5402,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5334,17 +5451,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5472,46 +5589,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr "Impossible de trouver un port ouvert"
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "%s reçu"
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Démarrage de l'interface de Bridge %s"
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, fuzzy, python-format
 msgid "Wrote: %s"
 msgstr "Ré-écriture de %s"
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5910,7 +6027,7 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -5920,28 +6037,28 @@ msgstr ""
 "(optionel), et xenapi_connection_password pour utiliser "
 "connection_type=xenapi"
 
-#: nova/virt/xenapi/connection.py:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, 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
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr "Reçu exception : %s"
@@ -6675,89 +6792,58 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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: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:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, 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:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, 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:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erreur OpenSSL : %s"
@@ -6980,37 +7066,37 @@ msgstr ""
 "Le point de montage %(mountpoint)s à été détaché de l'instance "
 "%(instance_name)s"
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -7121,108 +7207,108 @@ msgstr "Sheepdog n'est pas actif"
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "Ré-exportation de %s volumes"
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "volume %s : exportation évitée"
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr "volume %s: création"
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, 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:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr "volume %s: exportation en cours"
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: crée avec succès"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr "Le volume est encore attaché"
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr "Le volume n'est pas local à ce noeud"
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: suppression de l'exportation"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: suppression"
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: supprimé avec succès"
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -8108,6 +8194,9 @@ msgstr ""
 #~ msgid "no partitions found"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr "virsh a retourné : %r"
 
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index 731c8bde3..ec2c813dc 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-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -93,7 +93,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr "E' stato riscontrato un errore sconosciuto"
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -156,7 +156,8 @@ msgstr ""
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -216,132 +217,128 @@ msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, 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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr "Impossibile ripristinare il server"
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -349,777 +346,813 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:722
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
@@ -1129,22 +1162,22 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1156,193 +1189,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr "Servizio terminato che non ha entry nel database"
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr "Il servizio é scomparso dal database, ricreo."
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr "Connessione al model server ripristinata!"
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr "model server é scomparso"
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr "Insieme di FLAGS:"
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr "Prelievo %s"
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Esecuzione del comando (sottoprocesso): %s"
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr "Il risultato é %s"
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Eseguendo cmd (SSH): %s"
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1378,135 +1426,135 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1515,245 +1563,247 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
+msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
+msgid "Key pair '%s' already exists."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:736
+#: nova/api/ec2/cloud.py:712
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1283
+msgid "Unable to associate IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2405,7 +2455,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2502,19 +2552,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2641,35 +2678,36 @@ msgstr "Impossibile riavviare l'istanza"
 msgid "stop instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: 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:376
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, 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/compute/contrib/volumes.py:342
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2855,113 +2893,121 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:199
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2976,459 +3022,502 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorazione: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: bloccato: |%s|"
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: esecuzione: |%s|"
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: non esecuzione |%s|"
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 #, fuzzy, python-format
 msgid "Instance not found."
 msgstr "istanza %s: sospensione in corso"
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr "L'istanza é stata già creata"
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, python-format
 msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 #, fuzzy, python-format
 msgid "Retrieving diagnostics"
 msgstr "istanza %s: ricezione diagnostiche"
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 #, fuzzy, python-format
 msgid "Suspending"
 msgstr "istanza %s: sospensione in corso"
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 #, fuzzy, python-format
 msgid "Reset network"
 msgstr "istanza %s: ripristino rete"
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, 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:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 #, fuzzy, python-format
 msgid "Detaching volume from unknown instance"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3488,17 +3577,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3517,17 +3606,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3545,13 +3634,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3574,6 +3665,14 @@ msgstr ""
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3606,22 +3705,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3631,17 +3730,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3740,42 +3839,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3783,41 +3882,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3825,73 +3924,73 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3902,31 +4001,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -4006,36 +4105,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4052,12 +4151,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr "contesto decompresso: %s"
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr "ricevuto %s"
@@ -4072,42 +4171,56 @@ msgstr "nessun metodo per il messaggio: %s"
 msgid "No method for message: %s"
 msgstr "nessun metodo per il messagggio: %s"
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID é %s"
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+#, fuzzy
+msgid "An unknown RPC related exception occurred."
+msgstr "E' stato riscontrato un errore sconosciuto"
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Sollevando eccezione %s al chiamante"
@@ -4187,59 +4300,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4304,19 +4417,19 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -4339,6 +4452,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4363,11 +4491,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4433,12 +4561,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4453,12 +4581,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4571,21 +4699,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4594,19 +4722,19 @@ 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:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4619,12 +4747,12 @@ msgstr "Impossibile riavviare l'istanza"
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4874,7 +5002,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4889,7 +5017,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5018,185 +5146,173 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: creato con successo"
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "L'utente non ha i privilegi dell'amministratore"
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5206,38 +5322,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5255,17 +5371,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5393,46 +5509,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "ricevuto %s"
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Avviando l'interfaccia Bridge per %s"
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5828,35 +5944,35 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 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:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -6578,88 +6694,57 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6876,37 +6961,37 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s smontato dall'istanza %(instance_name)s"
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -7017,108 +7102,108 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr "volume %s: creazione in corso"
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr "volume %s: creazione in corso per l'esportazione"
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: creato con successo"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr "Volume ancora collegato"
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: rimuovendo"
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: rimosso con successo"
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -8015,6 +8100,9 @@ msgstr ""
 #~ msgid "no partitions found"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index 9211652a7..3f63c1fd8 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-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -93,7 +93,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -156,7 +156,8 @@ msgstr ""
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -216,132 +217,128 @@ msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, 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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -349,777 +346,813 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:722
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, 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:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
 msgstr "イメージをループバック %s にアタッチできません。"
@@ -1129,22 +1162,22 @@ msgstr "イメージをループバック %s にアタッチできません。"
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1156,193 +1189,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr "%(topic)s ノードを開始しています (バージョン %(vcs_string)s)"
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr "データベースにエントリの存在しないサービスを終了します。"
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr "サービスデータベースオブジェクトが消滅しました。再作成します。"
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr "モデルサーバへの接続を復旧しました。"
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr "モデルサーバが消滅しました。"
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr "FLAGSの一覧:"
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr "ファイルをフェッチ： %s"
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "コマンド実行(subprocess): %s"
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr "コマンド実行結果： %s"
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "コマンド（SSH)を実行: %s"
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr "コールバック中のデバッグ: %s"
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "リンクローカルアドレスが見つかりません: %s"
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "%(interface)s のローカルIPアドレスのリンクが取得できません:%(ex)s"
 
-#: nova/utils.py:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "不正なバックエンドです: %s"
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr "バックエンドは %s です。"
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1378,135 +1426,135 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr "認証失敗の回数が多すぎます。"
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "%s の認証に失敗しました。"
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr "%(uname)s 用の認証リクエスト:%(pname)s)"
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr "アクション(action): %s"
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "引数: %(key)s\t\t値: %(value)s"
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "コントローラ=%(controller)s とアクション=%(action)s 用の許可されていないリクエスト"
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "InstanceNotFound が発行されました: %s"
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "VolumeNotFound が発行されました: %s"
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound 発生: %s"
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "予期しないエラー発生: %s"
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "予期しないエラー発生: %s"
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "未知のエラーが発生しました。再度リクエストを実行してください。"
 
@@ -1515,246 +1563,249 @@ msgstr "未知のエラーが発生しました。再度リクエストを実行
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "未サポートの API リクエスト: コントローラ = %(controller)s, アクション = %(action)s"
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
-msgstr ""
+msgid "Create key pair %s"
+msgstr "Create key pair: キーペア %s を作成します。"
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
-msgstr "Create key pair: キーペア %s を作成します。"
+msgid "Key pair '%s' already exists."
+msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair: キーペア %s を削除します。"
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: 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:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "有効なルールを作成する為の十分なパラメータがありません"
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr "指定されたパラメータに該当するルールがありません。"
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: 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:736
+#: nova/api/ec2/cloud.py:712
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "指定されたルールは既にグループ %s に存在しています。"
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: 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:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: 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:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: 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:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, 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:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume: ボリューム %s をデタッチします"
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Detach volume: ボリューム %s をデタッチします"
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "アトリビュート %s はサポートされていません。"
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr "Allocate address: アドレスを割り当てます。"
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr "Release address: アドレス %s を開放します。"
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, 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:1299
+#: nova/api/ec2/cloud.py:1283
+#, fuzzy, python-format
+msgid "Unable to associate IP Address."
+msgstr "Disassociate address: アドレス %s の関連付けを解除します。"
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address: アドレス %s の関連付けを解除します。"
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance: インスタンス %r を再起動します。"
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image: イメージ %s を登録解除します。"
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, 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:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr "ユーザまたはグループが指定されていません。"
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr "グループ  \"all\" のみサポートされています。"
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr "operation_type は add または remove の何れかである必要があります。"
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "イメージ %s の公開設定を更新します。"
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2407,7 +2458,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2504,19 +2555,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2644,35 +2682,36 @@ msgstr "Reboot instance: インスタンス %r を再起動します。"
 msgid "stop instance"
 msgstr "Reboot instance: インスタンス %r を再起動します。"
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: 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:376
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/api/openstack/compute/contrib/volumes.py:482
+#: nova/api/openstack/compute/contrib/volumes.py:342
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2859,116 +2898,124 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 #, fuzzy, python-format
 msgid "Cannot run any more instances of this type."
 msgstr "インスタンスのクオータを超えました。このタイプにおいてはあと %s インスタンスしか実行できません。"
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:199
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "インスタンスのクオータを超えました。このタイプにおいてはあと %s インスタンスしか実行できません。"
 
-#: nova/compute/api.py:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "%s 個のインスタンスの起動を始めます…"
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2983,464 +3030,507 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorating: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: locked: |%s|"
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: executing: |%s|"
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: not executing |%s|"
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 #, fuzzy, python-format
 msgid "Instance not found."
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr "インスタンスは既に生成されています。"
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "インスタンス %s は実行中です。"
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Rebooting instance: インスタンス %s を再起動します。"
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Rebooting instance: インスタンス %s を再起動します。"
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, fuzzy, python-format
 msgid "injecting file to %(path)s"
 msgstr "ファイルパス '%s' を埋め込んでいます"
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, python-format
 msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 #, fuzzy, python-format
 msgid "Unrescuing"
 msgstr "Unrescuing: インスタンス %s をアンレスキューします。"
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 #, fuzzy, python-format
 msgid "Retrieving diagnostics"
 msgstr "retrieving diagnostics: インスタンス %s の診断情報を取得します。"
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 #, fuzzy, python-format
 msgid "Suspending"
 msgstr "suspending: インスタンス %s をサスペンドします。"
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 #, fuzzy, python-format
 msgid "Getting locked state"
 msgstr "getting locked state: インスタンス %s のロックを取得しました。"
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 #, fuzzy
 msgid "Reset network"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 #, fuzzy
 msgid "Inject network info"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 #, fuzzy, python-format
 msgid "Get console output"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "コンソールを追加しています"
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 #, fuzzy, python-format
 msgid "Detaching volume from unknown instance"
 msgstr "ボリュームを未知のインスタンス %s からデタッチします。"
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3500,17 +3590,17 @@ msgstr "xvp を再起動しています"
 msgid "xvp not running..."
 msgstr "xvp が実行されていません…"
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3529,17 +3619,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3557,13 +3647,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3586,6 +3678,14 @@ msgstr ""
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3618,22 +3718,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3643,17 +3743,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr "プライベートキーの復号に失敗しました: %s"
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "初期化ベクタの復号に失敗しました: %s"
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "イメージファイル %(image_file)s の復号に失敗しました: %(err)s"
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3752,42 +3852,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3795,41 +3895,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3837,73 +3937,73 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "リースしていないIP %s が開放されました。"
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "ネットワークの数とVLANの開始番号の和は 4094 より大きくできません。"
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3914,31 +4014,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -4018,36 +4118,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4064,12 +4164,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr "context  %s をアンパックしました。"
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr "受信： %s"
@@ -4084,42 +4184,55 @@ msgstr "メッセージ %s に対するメソッドが存在しません。"
 msgid "No method for message: %s"
 msgstr "メッセージ %s に対するメソッドが存在しません。"
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_IDは %s です。"
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "呼び出し元に 例外 %s を返却します。"
@@ -4199,59 +4312,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr "予備の(fallback)スケジューラを実装する必要があります。"
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4316,19 +4429,19 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -4351,6 +4464,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4375,11 +4503,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4445,12 +4573,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr "ターゲット %s をアロケートしました。"
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4465,12 +4593,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4583,21 +4711,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "Nested received %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr "ネストした戻り値: %s"
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr "%s を受信。"
@@ -4606,19 +4734,19 @@ msgstr "%s を受信。"
 msgid "Failed to open connection to the hypervisor"
 msgstr "ハイパーバイザへの接続に失敗しました。"
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4630,12 +4758,12 @@ msgstr ""
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4885,7 +5013,7 @@ msgstr "インスタンス %s: toXML メソッドを開始。"
 msgid "instance %s: finished toXML method"
 msgstr "インスタンス %s: toXML メソッドを完了。"
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4900,7 +5028,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5029,183 +5157,171 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr "nbd デバイス %s が出現しません"
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "libvirt %s へ接続します。"
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr "libvirtへの接続が切れています。"
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "インスタンス%s: 再起動しました。"
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "データ: %(data)r, ファイルパス: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5215,38 +5331,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5264,17 +5380,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5402,46 +5518,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr "開いたポートが見つかりません"
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "受信： %s"
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "%s 用のブリッジインタフェースを開始します。"
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, fuzzy, python-format
 msgid "Wrote: %s"
 msgstr "%s を再度書き込みました"
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5840,7 +5956,7 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -5849,28 +5965,28 @@ msgstr ""
 "connection_type=xenapi を使用するには、以下の指定が必要です： xenapi_connection_url, "
 "xenapi_connection_username (オプション), xenapi_connection_password"
 
-#: nova/virt/xenapi/connection.py:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "プライベートキーの復号に失敗しました: %s"
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr "例外 %s が発生しました。"
@@ -6598,89 +6714,58 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, 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:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, 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:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL エラー: %s"
@@ -6897,37 +6982,37 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s からマウントポイント %(mountpoint)s を切断(detach)しました"
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -7038,108 +7123,108 @@ msgstr "Sheepdog が機能していません"
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "%s 個のボリュームを再エクスポートします。"
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "ボリューム %s のエキスポートをスキップします。"
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr "ボリューム%sを作成します。"
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, 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:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr "ボリューム %s をエクスポートします。"
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "ボリューム %s の作成に成功しました。"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr "ボリュームはアタッチされたままです。"
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr "ボリュームはこのノードのローカルではありません。"
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr "ボリューム %s のエクスポートを解除します。"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr "ボリューム %s を削除します。"
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "ボリューム %s の削除に成功しました。"
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -8024,6 +8109,9 @@ msgstr ""
 #~ msgid "no partitions found"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr "virsh の出力: %r"
 
diff --git a/nova/locale/ko/LC_MESSAGES/nova.po b/nova/locale/ko/LC_MESSAGES/nova.po
index 0baca3ee8..ea090e29e 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-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -93,7 +93,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -156,7 +156,8 @@ msgstr ""
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -216,131 +217,127 @@ msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, 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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -348,777 +345,813 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:722
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
@@ -1128,22 +1161,22 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1155,193 +1188,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1377,135 +1425,135 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1514,245 +1562,247 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
+msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
+msgid "Key pair '%s' already exists."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:736
+#: nova/api/ec2/cloud.py:712
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1283
+msgid "Unable to associate IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2404,7 +2454,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2501,19 +2551,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2638,35 +2675,36 @@ msgstr ""
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: 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:376
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/api/openstack/compute/contrib/volumes.py:482
+#: nova/api/openstack/compute/contrib/volumes.py:342
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2852,111 +2890,119 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:199
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2971,455 +3017,498 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorating: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: locked: |%s|"
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: executing: |%s|"
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: not executing |%s|"
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr "인스턴스가 이미 생성되었습니다"
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, python-format
 msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 #, fuzzy, python-format
 msgid "Detaching volume from unknown instance"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3479,17 +3568,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3508,17 +3597,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3536,13 +3625,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3565,6 +3656,14 @@ msgstr ""
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3597,22 +3696,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3622,17 +3721,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3731,42 +3830,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3774,41 +3873,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3816,73 +3915,73 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3893,31 +3992,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3997,36 +4096,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4043,12 +4142,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr ""
@@ -4063,42 +4162,55 @@ msgstr ""
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -4178,59 +4290,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4295,19 +4407,19 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -4330,6 +4442,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4354,11 +4481,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4424,12 +4551,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4444,12 +4571,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4562,21 +4689,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4585,19 +4712,19 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4609,12 +4736,12 @@ msgstr ""
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4864,7 +4991,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4879,7 +5006,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5008,182 +5135,170 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5193,38 +5308,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5242,17 +5357,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5380,46 +5495,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5814,35 +5929,35 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 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:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -6562,88 +6677,57 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6860,37 +6944,37 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "%(instance_name)s 인스턴스에 %(mountpoint)s 마운트지점이 탈착되었습니다"
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -7001,108 +7085,108 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -8019,6 +8103,9 @@ msgstr ""
 #~ msgid "no partitions found"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index f0b06438d..1cbc3439e 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-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -88,7 +88,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -151,7 +151,8 @@ msgstr ""
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -211,131 +212,127 @@ msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, 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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -343,777 +340,813 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:722
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
@@ -1123,22 +1156,22 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1150,193 +1183,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1372,135 +1420,135 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1509,245 +1557,247 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
+msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
+msgid "Key pair '%s' already exists."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:736
+#: nova/api/ec2/cloud.py:712
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1283
+msgid "Unable to associate IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2399,7 +2449,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2496,19 +2546,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2633,35 +2670,36 @@ msgstr ""
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:330
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, python-format
-msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:376
+#: nova/api/openstack/compute/contrib/volumes.py:342
 #, python-format
-msgid "Instance %s is not attached."
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:482
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2847,111 +2885,119 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:199
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2966,452 +3012,495 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, python-format
 msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3471,17 +3560,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3500,17 +3589,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3528,13 +3617,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3557,6 +3648,14 @@ msgstr ""
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3589,22 +3688,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3614,17 +3713,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3723,42 +3822,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3766,41 +3865,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3808,73 +3907,73 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3885,31 +3984,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3989,36 +4088,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4035,12 +4134,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr ""
@@ -4055,42 +4154,55 @@ msgstr ""
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -4170,59 +4282,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4287,19 +4399,19 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -4322,6 +4434,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4346,11 +4473,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4416,12 +4543,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4436,12 +4563,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4554,21 +4681,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4577,19 +4704,19 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4601,12 +4728,12 @@ msgstr ""
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4856,7 +4983,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4871,7 +4998,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5000,182 +5127,170 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5185,38 +5300,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5234,17 +5349,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5372,46 +5487,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5806,35 +5921,35 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 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:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -6553,88 +6668,57 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6851,37 +6935,37 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -6990,108 +7074,108 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index a177419a6..3efb39d3e 100644
--- a/nova/locale/pt_BR/LC_MESSAGES/nova.po
+++ b/nova/locale/pt_BR/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -93,7 +93,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -156,7 +156,8 @@ msgstr ""
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -216,132 +217,128 @@ msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr "Reutilização inválida de uma conexão RPC."
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, 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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr "Falha ao suspender instância"
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr "Serviço está indisponível neste momento"
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s não é um endereço IPv4/6 válido."
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -349,777 +346,813 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Formato do disco %(disk_format)s não é aceito"
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Volume %(volume_id)s não pode ser encontrado."
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr "Volume não encontrada para a instância %(instance_id)s."
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Imagem %(image_id)s não foi encontrada."
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr "Kernel não encontrado para a imagem %(image_id)s."
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr "Usuário %(user_id)s não foi encontrado."
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr "Usuário %(user_id)s não é um membro do projeto %(project_id)s."
 
-#: nova/exception.py:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s é necessário para criar a rede."
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr "Nenhuma rede definida."
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Interface %(interface)s não encontrada."
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "Certificado %(certificate_id)s não encontrado."
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Serviço %(service_id)s não encontrado."
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Host %(host)s não encontrado."
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Host %(host)s não encontrado."
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, fuzzy, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr "Projeto %(project_id)s não foi encontrado."
+
+#: nova/exception.py:722
+#, fuzzy, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr "Usuário %(user_id)s não foi encontrado."
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, fuzzy, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr "Usuário %(user_id)s não foi encontrado."
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, 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:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
 msgstr "Kernel não encontrado para a imagem %(image_id)s."
@@ -1129,22 +1162,22 @@ msgstr "Kernel não encontrado para a imagem %(image_id)s."
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr "Executando tarefa periódica %(full_task_name)s"
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr "Erro durante %(full_task_name)s: %(e)s"
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1156,193 +1189,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr "Encerrado serviço que não tem entrada na base de dados"
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr "O objeto da base de dados do serviço desapareceu, Recriando."
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr "Recuperada conexão servidor de modelo."
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr "servidor de modelo perdido"
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr "Conjunto completo de FLAGS:"
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr "Buscando %s"
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Executando comando (subprocesso): %s"
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr "Resultado foi %s"
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r falhou. Tentando novamente."
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Executando o comando (SSH): %s"
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr "Ambiente não suportado por SSH"
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr "depuração em retorno de chamada: %s"
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Endereço para Link Local não encontrado: %s"
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, 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:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend inválido: %s"
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Objeto esperado do tipo: %s"
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr "Classe %(fullname)s está obsoleta: %(msg)s"
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1378,135 +1426,135 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr "Muitas falhas de autenticação."
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Falha de Autenticação: %s"
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr "ação: %s"
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound lançado: %s"
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 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."
 
@@ -1515,246 +1563,249 @@ 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: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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
-msgstr ""
+msgid "Create key pair %s"
+msgstr "Criar par de chaves %s"
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
-msgstr "Criar par de chaves %s"
+msgid "Key pair '%s' already exists."
+msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Remover par de chaves %s"
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: 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:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr "Não existe regra para os parâmetros especificados"
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: 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:736
+#: nova/api/ec2/cloud.py:712
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Esta regra já existe no grupo %s"
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: 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:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr "group %s já existe"
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: 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:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: 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:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr "Desanexar volume %s"
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Desanexar volume %s"
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "atributo não suportado: %s"
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr "Alocar endereço"
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr "Liberar endereço %s"
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1283
+#, fuzzy, python-format
+msgid "Unable to associate IP Address."
+msgstr "Desatribuir endereço %s"
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Desatribuir endereço %s"
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr "Começando a terminar instâncias"
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reiniciar instância %r"
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr "Removendo o registro da imagem %s"
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr "usuário ou grupo não especificado"
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr "apenas o grupo \"all\" é suportado"
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr "operation_type deve ser add ou remove"
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Atualizando publicidade da imagem %s"
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2407,7 +2458,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2505,19 +2556,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2645,35 +2683,36 @@ msgstr "Iniciando instância %s"
 msgid "stop instance"
 msgstr "Reiniciar instância %r"
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: 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/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr "Remover volume com id: %s"
 
-#: 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:376
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, 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/compute/contrib/volumes.py:342
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2862,115 +2901,123 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:199
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2985,463 +3032,506 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorating: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: locked: |%s|"
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: executando: |%s|"
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: not executando |%s|"
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr "Não foi possível carregar o driver de virtualização: %s"
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 #, fuzzy
 msgid "Instance not found."
 msgstr "Instância não encontrada"
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr "A instância já foi criada"
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "Reconstruindo instância %s"
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Reconstruindo instância %s"
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Reiniciando a instância %s"
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instância %s: fazendo um snapshot"
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr "Removendo imagem %s"
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, fuzzy, python-format
 msgid "updating agent to %(url)s"
 msgstr "Atualizando agente para %s"
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 #, fuzzy, python-format
 msgid "Unrescuing"
 msgstr "instância %s: desfazendo o resgate"
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 #, fuzzy, python-format
 msgid "Retrieving diagnostics"
 msgstr "instância %s: recuperando os diagnósticos"
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 #, fuzzy, python-format
 msgid "Suspending"
 msgstr "instância %s: suspendendo"
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 #, fuzzy, python-format
 msgid "Getting locked state"
 msgstr "instância %s: obtendo estado de bloqueio"
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 #, fuzzy, python-format
 msgid "Reset network"
 msgstr "instância %s: reset da rede"
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 #, fuzzy, python-format
 msgid "Get console output"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Adicionando console"
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, 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:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 #, fuzzy, python-format
 msgid "Detaching volume from unknown instance"
 msgstr "Desconectando volume da instância desconhecida %s"
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, fuzzy, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr "A instância %(instance_id)s não está executando."
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3501,17 +3591,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3530,17 +3620,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3558,13 +3648,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3587,6 +3679,14 @@ msgstr ""
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3619,22 +3719,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3644,17 +3744,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3753,42 +3853,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, fuzzy, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr "Certificado %(certificate_id)s não encontrado."
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr "Endereço |%(address)s| não está alocado"
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3796,41 +3896,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3838,73 +3938,73 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr "Rede já existe!"
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3915,31 +4015,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -4019,36 +4119,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4065,12 +4165,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr "conteúdo descompactado: %s"
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr "recebido %s"
@@ -4085,42 +4185,55 @@ msgstr "sem método para mensagem: %s"
 msgid "No method for message: %s"
 msgstr "Sem método para mensagem: %s"
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID é %s"
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr "Reutilização inválida de uma conexão RPC."
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Retornando exceção %s ao método de origem"
@@ -4200,59 +4313,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4317,19 +4430,19 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, fuzzy, python-format
 msgid "Setting instance to %(state)s state."
 msgstr "Iniciando instância %s"
@@ -4352,6 +4465,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4376,11 +4504,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4446,12 +4574,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4466,12 +4594,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4584,21 +4712,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4607,19 +4735,19 @@ 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:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4632,12 +4760,12 @@ msgstr "Falhou ao reiniciar instância"
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4887,7 +5015,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4902,7 +5030,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5031,185 +5159,173 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: criado com sucesso"
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Usuário não tem privilégios de administrador"
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5219,38 +5335,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5268,17 +5384,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5406,46 +5522,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr "Impossível localizar uma porta aberta"
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "_criar: %s"
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Iniciando a Bridge para %s"
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, fuzzy, python-format
 msgid "Wrote: %s"
 msgstr "_criar: %s"
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5843,35 +5959,35 @@ msgstr "Obtendo o tamanho da imagem para a imagem %s"
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 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:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -6600,88 +6716,57 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr "A instância %(instance_id)s não está executando."
-
-#: nova/virt/xenapi/vmops.py:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, 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:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, 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:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erro de OpenSSL: %s"
@@ -6900,37 +6985,37 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Ponto de montagem %(mountpoint)s desanexada da instância %(instance_name)s"
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -7041,108 +7126,108 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "Re-exportando %s volumes"
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "volume %s: ignorando export"
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr "volume %s: criando"
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, 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:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr "volume %s: criando o export"
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: criado com sucesso"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr "O volume continua atachado"
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr "O volume não pertence à este node"
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removendo export"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: removendo"
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: remoção realizada com sucesso"
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instância %s: fazendo um snapshot"
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -8027,6 +8112,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index d7b260200..238f0e36b 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-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -96,7 +96,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr "Обнаружено неизвестное исключение."
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -161,7 +161,8 @@ msgstr "Недопустимый снимок"
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Том %(volume_id)s никуда не присоединён"
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -221,31 +222,27 @@ msgid "Invalid cidr %(cidr)s."
 msgstr "Недопустимый cidr %(cidr)s."
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Допустимый узел не найден. %(reason)s"
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -254,68 +251,68 @@ msgstr ""
 "Копия %(instance_uuid)s в %(attr)s %(state)s. Невозможно %(method)s во "
 "время нахождения копии в этом состоянии."
 
-#: nova/exception.py:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Копия %(instance_id)s не выполняется."
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr "Копия %(instance_id)s не переведена в режим приостановления."
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "Копия %(instance_id)s не переведена в режим восстановления"
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr "Ошибка приостановления копии"
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr "Ошибка возобновления работы сервера"
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr "В данный момент служба недоступна."
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr "Служба Compute недоступна в настоящее время."
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "Невозможно переместить копию (%(instance_id)s) на текущий узел (%(host)s)."
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr "Назначенный узел compute недоступен в настоящее время."
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr "Исходный узел compute недоступен в настоящее время."
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "Копии необходима новая версия гипервизора, вместо предоставленной."
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
@@ -324,33 +321,33 @@ msgstr ""
 "Предоставленный адрес диска (%(path)s) уже существует, но ожидалось, что "
 "отсутствует."
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "Недопустимое размещение предоставленного устройства (%(path)s)."
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "Недопустимое размещение предоставленного устройства (%(path)s)."
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr "Недопустимые сведения ЦПУ"
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s не является допустимым IP-адресом в4/6."
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -358,74 +355,74 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Форматирование диска %(disk_format)s недопустимо"
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Образ %(image_id)s недопустим: %(reason)s"
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "Копия %(instance_id)s недопустима: %(reason)s"
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s недопустим."
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr "Ресурс не может быть найден."
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr "Необходимый флаг %(flag)s не назначен."
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Том %(volume_id)s не найден."
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr "Не найден том для копии %(instance_id)s."
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, 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:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "Тип тома %(volume_type_id)s не может быть найден."
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "Тип тома под названием %(volume_type_name)s не может быть найден."
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
@@ -434,121 +431,121 @@ msgstr ""
 "Тип тома %(volume_type_id)s не имеет дополнительных особенностей с ключом"
 " %(extra_specs_key)s."
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Снимок %(snapshot_id)s не может быть найден."
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr "удаление тома %(volume_name)s, который имеет снимок"
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "Отсутствует диск в %(location)s"
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "Невозможно найти обработчик для тома %(driver_type)s."
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Недопустимый образ href %(image_href)s."
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Образ %(image_id)s не найден."
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr "Ядро не найдено для образа %(image_id)s."
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr "Пользователь %(user_id)s не найден."
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Проект %(project_id)s не найден."
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, 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:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr "Полномочия %(role_id)s не могут быть найдены."
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr "Невозможно найти SR для чтения/записи VDI."
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s необходимо для создания сети."
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "Сеть не может быть найдена для моста %(bridge)s"
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "Сеть не может быть найдена для uuid %(uuid)s"
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "Сеть не найдена с cidr %(cidr)s."
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "Сеть не найдена для копии %(instance_id)s."
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr "Сети не определены."
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -557,190 +554,222 @@ msgstr ""
 "Или uuid %(network_uuid)s сети не предоставлено или не присвоено проекту "
 "%(project_id)s."
 
-#: nova/exception.py:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr "Узел не назначен сети (%(network_id)s)."
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "Недопустимый фиксированный IP-адрес %(address)s."
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "Запись DNS %(name)s уже существует в домене %(domain)s."
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Интерфейс %(interface)s не найден."
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "Сертификат %(certificate_id)s не найден."
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Служба %(service_id)s не найдена."
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Узел %(host)s не найден."
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "Узел сompute %(host)s не найден."
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr "Ключ доступа %(access_key)s не найден."
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr "Квота не найдена"
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Класс %(class_name)s не найден: %(exception)s"
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, fuzzy, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr "Квота проекта %(project_id)s не найдена."
+
+#: nova/exception.py:722
+#, fuzzy, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr "Пользователь %(user_id)s не найден."
+
+#: nova/exception.py:726
+#, fuzzy, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr "Расширенный ресурс: %s"
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Группа безопасности %(security_group_id)s не найдена."
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, 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:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "Группа безопасности с правилом %(rule_id)s не найдена."
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -749,7 +778,7 @@ msgstr ""
 "Группа безопасности %(security_group_id)s уже ассоциирована с копией "
 "%(instance_id)s"
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -758,391 +787,396 @@ msgstr ""
 "Группа безопасности %(security_group_id)s не ассоциирована с копией "
 "%(instance_id)s"
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Перемещение %(migration_id)s не найдено."
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "Перемещение не найдено для копии %(instance_id)s в состоянии %(status)s."
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "Пул консоли %(pool_id)s не найден."
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "Консоль %(console_id)s не найдена."
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr "Консоль для копии %(instance_id)s не найдена."
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, 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:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr "Недопустимый тип консоли %(console_type)s "
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "Тип копии %(instance_type_id)s не найден."
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "Тип копии с названием %(instance_type_name)s не найден."
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, fuzzy, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr "Зона %(zone_id)s не найдена."
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, 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:807
+#: nova/exception.py:828
 #, 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
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr "Объект LDAP не найден"
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr "Пользователь LDAP %(user_id)s не найден."
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr "Группа LDAP %(group_id)s не найдена."
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, 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:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "Файл %(file_path)s не может быть найден."
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 "Не найден виртуальный переключатель ассоциированный с сетевым адаптером "
 "%(adapter)s."
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "Сетевой адаптер %(adapter)s не может быть найден."
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "Класс %(class_name)s не найден: %(exception)s"
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr "Действие не разрешено."
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr "Невозможно использовать глобальные полномочия %(role_id)s"
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr "Пользователь %(user)s уже существует."
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr "Пользователь LDAP %(user)s уже существует."
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr "Группа LDAP %(group)s уже существует."
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, 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:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr "Проект %(project)s уже существует."
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Копия %(name)s уже существует."
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr "Тип копии %(name)s уже существует."
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr "Тип тома %(name)s уже существует."
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr "%(path)s располагается на общедоступном накопителе: %(reason)s"
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr "Ошибка перемещения"
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Неправильное тело сообщения: %(reason)s"
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Невозможно найти конфигурацию по адресу %(path)s"
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr "При изменении размера, копии должны изменить размер!"
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr "Образ больше, чем допустимо для этого типа копии"
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr "1-а или несколько зон не могут завершить запрос"
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "Недостаточно памяти на узле сети compute для запуска %(uuid)s."
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Допустимый узел не найден. %(reason)s"
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr "Узел %(host)s не работает или не существует."
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr "Превышена квота"
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, fuzzy, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr "Превышена квота для %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+#, fuzzy, python-format
+msgid "Maximum number of key pairs exceeded"
+msgstr "Выбрано макс. количество узлов (%d)"
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, 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:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Копия %(instance_id)s не найдена."
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
 msgstr "Получение образа %(image)s"
@@ -1152,24 +1186,24 @@ msgstr "Получение образа %(image)s"
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 "Пропуск %(full_task_name)s, %(ticks_to_skip)s раз осталось, для "
 "произведения следующего запуска"
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr "Запуск повторяющегося задания %(full_task_name)s"
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr "Ошибка во время %(full_task_name)s: %(e)s"
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1181,193 +1215,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr "Запуск узла сети (версия %(vcs_string)s) %(topic)s"
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr "Служба завершила работу из-за отсутствия записи базы данных"
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr "Объект сервиса в базе данных отсутствует, Повторное создание."
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr "Полный набор ФЛАГОВ:"
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr "Получение %s"
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "Приняты неизвестные аргументы ключевого слова для utils.execute: %r"
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Выполнение команды (субпроцесс): %s"
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr "Результат %s"
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r ошибка. Выполняется повтор."
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Выполнение команды (SSH): %s"
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr "Среда не поддерживается с использованием SSH"
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr "process_input не поддерживается с использованием SSH"
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr "отладка в обратном вызове: %s"
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Недопустимый внутренний интерфейс: %s"
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr "внутренний интерфейс %s"
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Ожидался объект типа: %s"
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Недопустимая server_string: %s"
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' заняла %(total_time).2f с."
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, fuzzy, python-format
 msgid "Reloading cached file %s"
 msgstr "Выгрузка образа %s"
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr "Класс %(fullname)s устарел: %(msg)s"
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr "Класс %(fullname)s устарел"
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr "Функция %(name)s в %(location)s устарела: %(msg)s"
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr "Функция %(name)s в %(location)s устарела"
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Ошибка удаления контейнера: %s"
@@ -1403,137 +1452,137 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr "Слишком много неудачных попыток аутентификации."
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Ошибка аутентификации: %s"
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr "Запрос аутентификации для %(uname)s:%(pname)s)"
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr "действие: %s"
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 "Неавторизированный запрос для контроллера=%(controller)s и "
 "действия=%(action)s"
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 "Произошла неизвестная ошибка. Пожалуйста, попытайтесь повторить ваш "
@@ -1546,90 +1595,80 @@ msgstr ""
 "Неподдерживаемый запрос API: контроллер = %(controller)s, действие = "
 "%(action)s"
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "Создать снимок тома %s"
 
-#: 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 ""
-"Значение (%s) для параметра GroupName недопустимо. Содержание ограничено "
-"буквенно-цифровыми символами, пробелами, тире и подчёркиваниями."
+#: nova/api/ec2/cloud.py:350
+#, python-format
+msgid "Create key pair %s"
+msgstr "Создание пары ключей %s"
 
-#: nova/api/ec2/cloud.py:384
-#, fuzzy, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
-"Значение (%s) для параметра GroupName недопустимо. Длина превышает "
-"максимально допустимое значение 255."
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
-msgstr "Создание пары ключей %s"
+msgid "Key pair '%s' already exists."
+msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr "Импортировать ключ %s"
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Удаление пары ключей %s"
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 #, fuzzy, python-format
 msgid "Invalid CIDR"
 msgstr "Недопустимый cidr %(cidr)s."
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Недостаточно параметров для сбора правильного правила."
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr "Отсутствует правило для заданных параметров."
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:736
+#: nova/api/ec2/cloud.py:712
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Это правило уже существует в группе %s"
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: 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:787
+#: nova/api/ec2/cloud.py:763
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
@@ -1638,7 +1677,7 @@ msgstr ""
 "Значение (%s) для параметра GroupName недопустимо. Содержание ограничено "
 "буквенно-цифровыми символами, пробелами, тире и подчёркиваниями."
 
-#: nova/api/ec2/cloud.py:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
@@ -1647,157 +1686,167 @@ msgstr ""
 "Значение (%s) для параметра GroupName недопустимо. Длина превышает "
 "максимально допустимое значение 255."
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Создать группу безопасности %s"
 
-#: nova/api/ec2/cloud.py:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr "группа %s уже существует"
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr "Удалить группу безопасности %s"
 
-#: nova/api/ec2/cloud.py:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Получить консольный вывод для копии %s"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Создать том из снимка %s"
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Создание раздела %s ГБ"
 
-#: nova/api/ec2/cloud.py:943
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Delete Failed"
 msgstr "Ошибка создания"
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, 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:961
+#: nova/api/ec2/cloud.py:942
 #, fuzzy
 msgid "Attach Failed."
 msgstr "Ошибка создания"
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr "Отсоединить том %s"
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Отсоединить том %s"
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "аттрибут не поддерживается: %s"
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr "Выделить адрес"
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr "Присвоить адрес %s"
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+#, fuzzy, python-format
+msgid "Unable to release IP Address."
+msgstr "Невозможно найти адрес %r"
+
+#: nova/api/ec2/cloud.py:1273
 #, 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:1299
+#: nova/api/ec2/cloud.py:1283
+#, fuzzy, python-format
+msgid "Unable to associate IP Address."
+msgstr "Невозможно найти адрес %r"
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Исключить адрес %s"
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr "Образ должен быть доступен"
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr "Выполнение завершения работы копий"
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Перезагрузить копию %r"
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr "Выполнение остановки копий"
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr "Выполнение запуска копий"
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr "Исключение регистрации образа %s"
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, 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:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr "не указан пользователь или группа"
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr "поддерживается только группа \"все(all)\""
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Обновление осведомлённости об образе %s"
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "Невозможно остановить копию в течении %d с."
@@ -2457,7 +2506,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2555,19 +2604,6 @@ msgstr ""
 msgid "Host not found"
 msgstr "Узел не найден"
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr "Отсутствует аргумент 'networkId' для addFixedIp"
@@ -2695,35 +2731,36 @@ msgstr "Запуск копии %s"
 msgid "stop instance"
 msgstr "Выполнение остановки копий"
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: 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/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr "Удалить том с идентификатором: %s"
 
-#: 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:376
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "Копия %s не найдена."
 
-#: nova/api/openstack/compute/contrib/volumes.py:482
+#: nova/api/openstack/compute/contrib/volumes.py:342
+#, 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:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr "Удалить снимок с идентификатором: %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2914,24 +2951,24 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr "Невозможно найти узел для копии %s"
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr ""
 "Превышена квота копий. Вы не можете запустить дополнительные копии этого "
 "типа."
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:199
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "Превышена квота копий. Вы можете запустить только %s копий этого типа."
 
-#: nova/compute/api.py:201
+#: nova/compute/api.py:202
 #, 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:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -2940,84 +2977,84 @@ msgstr ""
 "Превышена квота для %(pid)s, попытка назначить %(num_metadata)s свойств "
 "метаданных"
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Выполняет запуск %s копий..."
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr "Отправка операции создания в расписание для %(pid)s/%(uid)s's"
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Выполнение запуска копий"
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 #, fuzzy, python-format
 msgid "No host for instance, deleting immediately"
 msgstr "Отсутствует узел для копии %s, немедленное удаление"
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "Будет выполнения попытка завершить работу %s"
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "Попытка остановить %s"
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "Попытка запустить %s"
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr "Копия %(instance_uuid)s не остановлена. (%(vm_state)s"
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr "Поиск по: %s"
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr "Тип образа не распознан %s"
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -3026,11 +3063,19 @@ msgstr ""
 "Устаревший тип копии %(current_instance_type_name)s,  новый тип копии "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -3045,79 +3090,83 @@ msgstr "Ошибка БД: %s"
 msgid "Instance type %s not found for deletion"
 msgstr "Копия типа %s не найдена для выполнения удаления"
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: оформление: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, 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:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: заблокирован: |%s|"
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: администратор: |%s|"
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: исполнение: |%s|"
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr "Невозможно загрузить драйвер виртуализации: %s"
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Драйвер гипервизора не поддерживает правила брандмауэра"
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 #, fuzzy
 msgid "Instance not found."
 msgstr "Копия не найдена"
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr "Копия уже была создана"
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -3126,7 +3175,7 @@ msgstr ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -3135,76 +3184,77 @@ msgstr ""
 "Образ '%(image_id)s' размером %(size_bytes)d, превышает exceeded "
 "instance_type допустимый размер %(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Пропуск DiskNotFound: %s"
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr "завершение работы bdm %s"
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Установка состояния копии vm_state на ERROR"
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "Обновление сборки %s"
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Обновление сборки %s"
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Перезагрузка копии %s"
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -3213,12 +3263,12 @@ msgstr ""
 "попытка перезагрузки не выполняемой копии: %(instance_uuid)s (состояние: "
 "%(state)s ожидалось: %(running)s)"
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "копия %s: выполнение снимка"
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -3227,52 +3277,52 @@ msgstr ""
 "попытка создания снимка не выполняемой копии: %(instance_uuid)s "
 "(состояние: %(state)s ожидалось: %(running)s)"
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "Найдено %(num_images)d образов (ротация: %(rotation)d)"
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr "Удаление образа %s"
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "Невозможно назначить пароль администратора. Копия %s не выполняется"
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 #, fuzzy, python-format
 msgid "Root password set"
 msgstr "Копия %s: Назначение административного пароля"
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr "set_admin_password не реализован в этой драйвере."
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr "Ошибка назначения пароля администратора"
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, fuzzy, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
@@ -3281,120 +3331,120 @@ msgstr ""
 "попытка перезагрузки не выполняемой копии: %(instance_uuid)s (состояние: "
 "%(state)s ожидалось: %(running)s)"
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, fuzzy, python-format
 msgid "updating agent to %(url)s"
 msgstr "Обновление агента до %s"
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr "назначение совпадает с источником!"
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 #, fuzzy, python-format
 msgid "Retrieving diagnostics"
 msgstr "копия %s: принятие диагностики"
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 #, fuzzy, python-format
 msgid "Suspending"
 msgstr "копия %s: приостановление"
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 #, fuzzy, python-format
 msgid "Getting locked state"
 msgstr "копия %s: получение заблокированного состояния"
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 #, fuzzy
 msgid "Reset network"
 msgstr "Восстановление сети"
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 #, fuzzy
 msgid "Inject network info"
 msgstr "установка сетевого узла"
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 #, fuzzy, python-format
 msgid "Get console output"
 msgstr "Получить консольный вывод для копии %s"
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 #, fuzzy, python-format
 msgid "Getting vnc console"
 msgstr "копия %s: получение консоли vnc"
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 #, fuzzy, python-format
 msgid "Detaching volume from unknown instance"
 msgstr "Отсоединение тома от неизвестной копии %s"
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -3403,45 +3453,45 @@ msgstr ""
 "Создание временного файла %s для оповещения других узлов сети compute о "
 "необходимости присоединения того же хранилища."
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, 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:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr "Запущено post_live_migration().."
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -3450,23 +3500,64 @@ msgstr ""
 "отсутствует домен с соответствующим именем.\" Эта ошибка может быть "
 "безопасно пропущена."
 
-#: nova/compute/manager.py:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+"Найдены %(migration_count)d неподтверждённых перемещений, старше "
+"%(confirm_window)d секунд"
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, fuzzy, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr "Завершение работы ВМ для копии %(instance_uuid)s"
+
+#: nova/compute/manager.py:2343
+#, fuzzy, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr "Копия %(instance_id)s не найдена"
+
+#: nova/compute/manager.py:2347
+#, fuzzy, python-format
+msgid "In ERROR state"
+msgstr "Ошибка БД: %s"
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr "Обновление временных данных использования полосы пропускания"
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr "Обновление состояния узла"
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -3475,55 +3566,55 @@ msgstr ""
 "Найдено %(num_db_instances)s в базе данных и %(num_vm_instances)s в "
 "гипервизоре."
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, пропуск..."
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, 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:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3583,17 +3674,17 @@ msgstr "Выполнение перезагрузки xvp"
 msgid "xvp not running..."
 msgstr "xvp не выполняется..."
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr "Удаление токена с истёкшим сроком: (%s)"
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr "Полученный токен: %(token)s, %(token_dict)s)"
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr "Проверка токена: %(token)s, %(token_valid)s)"
@@ -3612,17 +3703,17 @@ msgstr "Нераспознанное значение read_deleted '%s'"
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3640,13 +3731,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr "Ошибка соединения с SQL (%(connstring)s). %(attempts)d попыток осталось."
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr "Таблица |%s| не создана!"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3672,6 +3765,14 @@ msgstr "ограничения внешнего ключа не могут бы�
 msgid "foreign key could not be created"
 msgstr "ограничения внешнего ключа не могут быть удалены"
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3704,22 +3805,22 @@ msgstr "Не владелец образа"
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr "Ошибка загрузки %(image_location)s в %(image_path)s"
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr "Ошибка расшифрования %(image_location)s в %(image_path)s"
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr "Ошибка извлечения %(image_location)s в %(image_path)s"
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr "Ошибка выгрузки %(image_location)s в %(image_path)s"
@@ -3729,17 +3830,17 @@ msgstr "Ошибка выгрузки %(image_location)s в %(image_path)s"
 msgid "Failed to decrypt private key: %s"
 msgstr "Ошибка дешифрирования личного ключа: %s"
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "Ошибка дешифрирования вектора инициализации: %s"
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "Ошибка дешифрирования файла образа %(image_file)s: %(err)s"
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr "В образе небезопасные имена файлов"
 
@@ -3840,42 +3941,42 @@ msgstr "Ошибка отсоединения vif копии '%s'"
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, fuzzy, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr "Сертификат %(certificate_id)s не найден."
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr "Интерфейс %(interface)s не найден"
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr "Адрес |%(address)s| не выделен"
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr "Адрес |%(address)s| не выделен вашему проекту |%(project)s|"
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr "Превышена квота для %s, попытка выделения адреса"
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3883,41 +3984,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr "Домен |%(domain)s| уже существует, изменение зоны на |%(av_zone)s|."
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "Домен |%(domain)s| уже существует, изменение проекта на |%(project)s|."
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr "установка сетевого узла"
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr "исключение сетевых распределений для копии |%s|"
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, fuzzy, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3928,53 +4029,53 @@ msgstr ""
 "доступной зоне |%(zone)s|. Копия |%(instance)s| расположена в зоне "
 "|%(zone2)s|. Запись DNS не будет создана."
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "Арендованный IP |%(address)s|"
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "Присвоенный IP |%(address)s|"
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr "cidr уже используется"
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 "запрошенная cidr (%(cidr)s) конфликтует с существующей супер-сетью "
 "(%(super)s)"
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -3983,22 +4084,22 @@ msgstr ""
 "запрошенная cidr (%(cidr)s) конфликтует с существующей, меньшей cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr "Сеть уже существует!"
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "Сеть должна быть исключена из проекта %s перед удалением"
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4011,31 +4112,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr "Этот драйвер поддерживает только тип 'a'"
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr "Объект Quantum не найден: %s"
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr "Серверная %(status_code)s ошибка: %(data)s"
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr "Невозможно подключиться к серверу. Принята ошибка: %s"
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -4115,38 +4216,38 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr "Ошибка создания сетевой записи"
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr "Нет сети с net_id = %s"
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, fuzzy, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr "исключение сетевых распределений для копии |%s|"
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 "Подключение интерфейса %(interface_id)s к сети %(net_id)s для "
 "%(tenant_id)s"
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 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:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr "%s не в допустимых приоритетах"
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4165,12 +4266,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr "неизвлечённый контекст: %s"
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr "получено %s"
@@ -4185,31 +4286,36 @@ msgstr "не определен метод для сообщения: %s"
 msgid "No method for message: %s"
 msgstr "Не определен метод для сообщения: %s"
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr "Выполнение асинхронного вызова %s ..."
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID is %s"
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+#, fuzzy
+msgid "An unknown RPC related exception occurred."
+msgstr "Обнаружено неизвестное исключение."
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
@@ -4218,11 +4324,20 @@ msgstr ""
 "Удалённая ошибка: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Возврат исключения %s вызывающему"
@@ -4306,59 +4421,59 @@ msgstr "Выполняется ли соответствующая служба?
 msgid "Could not find another compute"
 msgstr "Невозможно найти другой compute"
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr "узел %(dest)s несовместим с исходным узлом %(src)s."
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4423,19 +4538,19 @@ msgstr "host_manager реализован только для 'compute'"
 msgid "No service for compute ID %s"
 msgstr "Нет службы для compute ID %s"
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "Ошибка schedule_%(method)s: %(ex)s"
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, fuzzy, python-format
 msgid "Setting instance to %(state)s state."
 msgstr "%s. Установка состояния копии vm_state на ERROR"
@@ -4458,6 +4573,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4482,11 +4612,11 @@ msgstr "Имитация команды привела к исключению %
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr "Ответ на имитацию команды в stdout='%(stdout)s' stderr='%(stderr)s'"
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4552,12 +4682,12 @@ msgstr "проект"
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr "Невозможно подтвердить идентификатор экспортированного тома:%s."
@@ -4572,12 +4702,12 @@ msgstr "Заданные данные: %s"
 msgid "Result data: %s"
 msgstr "Итоговые данные: %s"
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Создание файлов в %s для имитации гостевого агента"
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Удаление файлов имитации гостевого агента в %s"
@@ -4693,21 +4823,21 @@ msgstr "Непредвиденный код состояния"
 msgid "Decoding JSON: %s"
 msgstr "Декодирование JSON: %s"
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
@@ -4716,19 +4846,19 @@ msgstr "Получено %s"
 msgid "Failed to open connection to the hypervisor"
 msgstr "Ошибка открытия соединения c гипервизором"
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr "Запись Compute_service создана для %s "
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr "Запись Compute_service обновлена для %s "
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4741,12 +4871,12 @@ msgstr "Ошибка перезагрузки копии"
 msgid "Provider Firewall Rules refreshed"
 msgstr "Выполненое обновление правил брандмауэра поставщика"
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr "Добавление правила группы безопасности: %r"
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr "Добавление правила поставщика: %s"
@@ -4998,7 +5128,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5015,7 +5145,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5144,159 +5274,145 @@ msgstr "ошибка qemu-nbd: %s"
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Подключение к libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr "Неполадка с подключением к libvirt"
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "снимок %s: создание завершено"
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr "Автоматические подтверждение перемещения %d"
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Пользователь не имеет административных привилегий"
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr "Создание изображения"
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr "block_device_list %s"
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -5305,28 +5421,28 @@ msgstr ""
 "Ошибка libvirt во время поиска %(instance_name)s: [Код ошибки "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/connection.py:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "устаревшая версия libvirt (не поддерживается getVersion)"
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr "'<cpu>' должно быть 1, но %d\n"
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5336,39 +5452,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 #, fuzzy, python-format
 msgid "Instance running successfully."
 msgstr "Копия %s: выполнение"
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5388,17 +5504,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr "nwfilter(%(instance_filter_name)s) для%(name)s не найден."
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "Брандмауэр iptables: Настройка базовой фильтрации"
 
@@ -5526,46 +5642,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr "Невозможно найти открытый порт"
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, fuzzy, python-format
 msgid "Reading image info file: %s"
 msgstr "Выгрузка образа %s"
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "_создать: %s"
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Запуск моста интерфейса для %s"
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, fuzzy, python-format
 msgid "Wrote: %s"
 msgstr "_создать: %s"
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 #, fuzzy, python-format
 msgid "Failed while unplugging vif"
 msgstr "Ошибка отсоединения vif копии '%s'"
@@ -5982,7 +6098,7 @@ msgstr "Получение размера образа для образа %s"
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr "Принят размер образа %(size)s для образа %(image)s"
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -5992,30 +6108,30 @@ msgstr ""
 "(необязательно) и xenapi_connection_password для использования "
 "connection_type=xenapi"
 
-#: nova/virt/xenapi/connection.py:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Ошибка дешифрирования личного ключа: %s"
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr "Запуск узла на XenServer не поддерживается."
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 "Невозможно выполнить вход в XenAPI (недостаточно свободного места на "
 "Dom0?)"
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr "Исключение: %s"
@@ -6767,67 +6883,35 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr "Автоматическая безотказная перезагрузка %d"
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr "Копия %(instance_id)s не найдена"
-
-#: nova/virt/xenapi/vmops.py:1347
-#, fuzzy, python-format
-msgid "In ERROR state"
-msgstr "Ошибка БД: %s"
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr "Невозможно получить сведения о пропускной способности."
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "установка сетевого узла"
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 #, fuzzy
 msgid "Creating vifs"
 msgstr "Создание изображения"
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Создание VIF для ВМ %(vm_ref)s, сеть %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, 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:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, fuzzy, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
@@ -6836,14 +6920,14 @@ msgstr ""
 "Вызов агентом %(method)s возвратил недопустимый ответ: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 
-#: nova/virt/xenapi/vmops.py:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, 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:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -6852,12 +6936,12 @@ msgstr ""
 "НЕ РЕАЛИЗОВАНО: Вызов %(method)s не поддерживается агентом. VM "
 "id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/vmops.py:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, 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:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Ошибка OpenSSL: %s"
@@ -7074,37 +7158,37 @@ msgstr "Ошибка очистки SR %s"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Точка подключения %(mountpoint)s отсоединена от копии %(instance_name)s"
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr "Ошибка в соглашении: %s"
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr "Недопустимый запрос: %s"
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr "Запрос: %s"
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr "Запрос сделан с отсутствующим токеном: %s"
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr "Запрос сделан с недопустимым токеном: %s"
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr "Непредвиденная ошибка: %s"
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr "Запуск узла сети nova-xvpvncproxy (версия %s)"
@@ -7217,108 +7301,108 @@ msgstr "Sheepdog не выполняется"
 msgid "LoggingVolumeDriver: %s"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "Повторное экспортирование %s томов"
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "том %s: пропуск экспортирования"
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr "том %s: создание"
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, 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:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr "том %s: создание экспортирования"
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "том %s: создание завершено"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr "Том до сих пор присоединён"
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr "том %s: удаление экспортирования"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr "том %s: удаление"
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr "том %s: том занят"
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "том %s: удаление завершено"
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr "снимок %s: создание"
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr "снимок %(snap_name)s: создание"
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr "снимок %s: создание завершено"
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr "снимок %s: удаление"
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "снимок %s: создание завершено"
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr "снимок %s: удаление выполнено"
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr "Проверка возможностей тома"
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr "Обнаружены новые возможности: %s"
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr "Очистить возможности"
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr "Принято уведомление {%s}"
@@ -8161,6 +8245,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr "Автоматические подтверждение перемещения %d"
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
diff --git a/nova/locale/tl/LC_MESSAGES/nova.po b/nova/locale/tl/LC_MESSAGES/nova.po
index 659ac37ad..cf72a27b3 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-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -88,7 +88,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -151,7 +151,8 @@ msgstr ""
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -211,131 +212,127 @@ msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, 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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -343,777 +340,813 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:722
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
@@ -1123,22 +1156,22 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1150,193 +1183,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1372,135 +1420,135 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1509,245 +1557,247 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
+msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
+msgid "Key pair '%s' already exists."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:736
+#: nova/api/ec2/cloud.py:712
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1283
+msgid "Unable to associate IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2399,7 +2449,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2496,19 +2546,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2633,35 +2670,36 @@ msgstr ""
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:330
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, python-format
-msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:376
+#: nova/api/openstack/compute/contrib/volumes.py:342
 #, python-format
-msgid "Instance %s is not attached."
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:482
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2847,111 +2885,119 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:199
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2966,452 +3012,495 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, python-format
 msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3471,17 +3560,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3500,17 +3589,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3528,13 +3617,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3557,6 +3648,14 @@ msgstr ""
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3589,22 +3688,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3614,17 +3713,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3723,42 +3822,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3766,41 +3865,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3808,73 +3907,73 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3885,31 +3984,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3989,36 +4088,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4035,12 +4134,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr "natanggap %s"
@@ -4055,42 +4154,55 @@ msgstr "walang paraan para sa mensahe: %s"
 msgid "No method for message: %s"
 msgstr "Walang paraan para sa mensahe: %s"
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -4170,59 +4282,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4287,19 +4399,19 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -4322,6 +4434,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4346,11 +4473,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4416,12 +4543,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4436,12 +4563,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4554,21 +4681,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4577,19 +4704,19 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4601,12 +4728,12 @@ msgstr ""
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4856,7 +4983,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4871,7 +4998,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5000,182 +5127,170 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5185,38 +5300,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5234,17 +5349,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5372,46 +5487,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "natanggap %s"
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5806,35 +5921,35 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 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:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -6553,88 +6668,57 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6851,37 +6935,37 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -6990,108 +7074,108 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -8009,6 +8093,9 @@ msgstr ""
 #~ msgid "no partitions found"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
diff --git a/nova/locale/tr/LC_MESSAGES/nova.po b/nova/locale/tr/LC_MESSAGES/nova.po
index 8c26986a4..b00803b49 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-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -88,7 +88,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -151,7 +151,8 @@ msgstr ""
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -211,131 +212,127 @@ msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, 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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -343,777 +340,813 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:722
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
@@ -1123,22 +1156,22 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1150,193 +1183,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1372,135 +1420,135 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1509,245 +1557,247 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
+msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
+msgid "Key pair '%s' already exists."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:736
+#: nova/api/ec2/cloud.py:712
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1283
+msgid "Unable to associate IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2399,7 +2449,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2496,19 +2546,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2633,35 +2670,36 @@ msgstr ""
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:330
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, python-format
-msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:376
+#: nova/api/openstack/compute/contrib/volumes.py:342
 #, python-format
-msgid "Instance %s is not attached."
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:482
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2847,111 +2885,119 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:199
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2966,452 +3012,495 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, python-format
 msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3471,17 +3560,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3500,17 +3589,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3528,13 +3617,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3557,6 +3648,14 @@ msgstr ""
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3589,22 +3688,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3614,17 +3713,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3723,42 +3822,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3766,41 +3865,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3808,73 +3907,73 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3885,31 +3984,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3989,36 +4088,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4035,12 +4134,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr ""
@@ -4055,42 +4154,55 @@ msgstr ""
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -4170,59 +4282,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4287,19 +4399,19 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -4322,6 +4434,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4346,11 +4473,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4416,12 +4543,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4436,12 +4563,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4554,21 +4681,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4577,19 +4704,19 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4601,12 +4728,12 @@ msgstr ""
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4856,7 +4983,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4871,7 +4998,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5000,182 +5127,170 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5185,38 +5300,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5234,17 +5349,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5372,46 +5487,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5806,35 +5921,35 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 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:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -6553,88 +6668,57 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6851,37 +6935,37 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -6990,108 +7074,108 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -8011,6 +8095,9 @@ msgstr ""
 #~ msgid "no partitions found"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
diff --git a/nova/locale/uk/LC_MESSAGES/nova.po b/nova/locale/uk/LC_MESSAGES/nova.po
index a4c19645b..0efe295a1 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-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -89,7 +89,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -152,7 +152,8 @@ msgstr ""
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -212,131 +213,127 @@ msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, 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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -344,777 +341,813 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:722
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
@@ -1124,22 +1157,22 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1151,193 +1184,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1373,135 +1421,135 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr "Занадто багато невдалих аутентифікацій."
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1510,246 +1558,248 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
+msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
+msgid "Key pair '%s' already exists."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:736
+#: nova/api/ec2/cloud.py:712
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Це правило вже існує в групі %s"
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/api/ec2/cloud.py:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Створити розділ на %s ГБ"
 
-#: nova/api/ec2/cloud.py:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr "Від'єднати том %s"
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Від'єднати том %s"
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1283
+msgid "Unable to associate IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr "лише група \"всі\" підтримується"
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2401,7 +2451,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2498,19 +2548,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2635,35 +2672,36 @@ msgstr ""
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:330
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, python-format
-msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:376
+#: nova/api/openstack/compute/contrib/volumes.py:342
 #, python-format
-msgid "Instance %s is not attached."
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:482
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2849,111 +2887,119 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:199
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2968,452 +3014,495 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, python-format
 msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3473,17 +3562,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3502,17 +3591,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3530,13 +3619,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3559,6 +3650,14 @@ msgstr ""
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3591,22 +3690,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3616,17 +3715,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3725,42 +3824,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3768,41 +3867,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3810,73 +3909,73 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3887,31 +3986,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3991,36 +4090,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4037,12 +4136,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr "отримано %s"
@@ -4057,42 +4156,55 @@ msgstr "без порядку для повідомлень: %s"
 msgid "No method for message: %s"
 msgstr "Без порядку для повідомлень: %s"
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID %s"
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -4172,59 +4284,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4289,19 +4401,19 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -4324,6 +4436,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4348,11 +4475,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4418,12 +4545,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4438,12 +4565,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4556,21 +4683,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4579,19 +4706,19 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4603,12 +4730,12 @@ msgstr ""
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4858,7 +4985,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4873,7 +5000,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5002,182 +5129,170 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5187,38 +5302,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5236,17 +5351,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5374,46 +5489,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "отримано %s"
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5808,35 +5923,35 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 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:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -6555,88 +6670,57 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6853,37 +6937,37 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -6992,108 +7076,108 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -8005,6 +8089,9 @@ msgstr ""
 #~ msgid "no partitions found"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index 3ec9de140..52bae7f8d 100644
--- a/nova/locale/zh_CN/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_CN/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-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -93,7 +93,7 @@ msgstr "数据库异常被包裹。"
 msgid "An unknown exception occurred."
 msgstr "发生未知异常。"
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -156,7 +156,8 @@ msgstr "无效的快照"
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "卷 %(volume_id)s 没有附加任何东西"
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr "密钥对数据无效"
 
@@ -216,132 +217,128 @@ msgid "Invalid cidr %(cidr)s."
 msgstr "无效的cidr %(cidr)s。"
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr "无效的RPC连接重用。"
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, 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:306
+#: nova/exception.py:302
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "找不到有效主机，原因是 %(reason)s。"
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, 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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "实例 %(instance_id)s 没有运行。"
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr "实例 %(instance_id)s 没有挂起。"
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "实例 %(instance_id)s 不在救援模式。"
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr "挂起实例失败"
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr "服务器恢复失败"
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr "重新启动实例失败"
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "重新启动实例失败"
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr "此时的付不可用。"
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr "此时的计算服务不可用。"
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "无法把实例 (%(instance_id)s) 迁移到当前主机 (%(host)s)。"
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr "此时的目标计算主机不可用。"
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr "此时的原始计算主机不可用。"
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr "提供的虚拟机管理程序类型无效。"
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "该实例需要比当前版本更新的虚拟机管理程序。"
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr "提供的磁盘路径 (%(path)s) 已经存在，预计是不存在的。"
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "提供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "提供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr "无法接受的CPU信息"
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s 不是有效的IP v4/6地址。"
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr "VLAN标签对于端口组%(bridge)s 是不适合的。预计的VLAN标签是 %(tag)s，但与端口组关联的是 %(pgroup)s。"
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -351,777 +348,814 @@ msgstr ""
 "包含端口组 %(bridge)s 的vSwitch没有与预计的物理适配器关联。预计的vSwitch是 %(expected)s，但关联的是 "
 "%(actual)s。"
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "磁盘格式 %(disk_format)s 不能接受"
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "镜像 %(image_id)s 无法接受，原因是： %(reason)s"
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "实例 %(instance_id)s 无法接受，原因是： %(reason)s"
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s 无法接受。"
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr "资源没有找到。"
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr "要求的标记 %(flag)s 没有设置。"
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "卷 %(volume_id)s 没有找到。"
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, fuzzy, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr "无法找到帐户 %(account_name) on Solidfire 设备"
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr "没有为实例 %(instance_id)s 找到卷。"
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, 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:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr "没有找到卷类型。"
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "卷类型 %(volume_type_id)s 没有找到。"
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "名为 %(volume_type_name)s 的卷类型没有找到。"
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, 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:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "快照 %(snapshot_id)s 没有找到。"
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr "正在删除有快照的卷  %(volume_name)s"
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "没有为卷 %(volume_id)s 找到目标id。"
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "在 %(location)s 没有磁盘"
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "无法为 %(driver_type)s 卷找到句柄。"
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "无效的镜像href %(image_href)s。"
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 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:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "镜像 %(image_id)s 没有找到。"
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr "没有为镜像 %(image_id)s 找到内核。"
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr "用户 %(user_id)s 没有找到。"
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "项目 %(project_id)s 没有找到。"
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, 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:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr "角色 %(role_id)s 没有找到。"
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr "没有找到存储库来读写VDI。"
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "创建网络 %(req)s  是必要的。"
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "无法为桥 %(bridge)s 找到网络"
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "无法为uuid %(uuid)s 找到网络"
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "无法为cidr %(cidr)s 找到网络。"
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "无法为实例 %(instance_id)s 找到网络。"
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr "没有网络定义。"
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr "主机没有设置于网络 (%(network_id)s)。"
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, fuzzy, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr "网络 %s 存在活跃的端口，无法删除"
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr "无法找到虚拟机使用的数据存储引用。"
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "没有固定IP与id %(id)s 关联。"
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "没有为地址 %(address)s 找到固定IP。"
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr "实例 %(instance_id)s 没有固定ip。"
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, 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:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr "实例 %(instance_id)s 没有固定ip '%(ip)s'。"
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr "主机 %(host)s 没有固定IP。"
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, 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:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr "固定IP地址 %(address)s 已在使用。"
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "固定IP地址 %(address)s 无效。"
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr "没有固定ip可用。"
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr "找不到固定IP。"
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "找不到适合id %(id)s 的浮动IP。"
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "DNS 入口 %(name)s 已经在域中 %(domain)s 存在。"
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "找不到适合地址 %(address)s 的浮动ip。"
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "没有为主机 %(host)s 找到浮动IP。"
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr "没有浮动IP可用。"
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "浮动ip %(address)s 已被关联。"
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "浮动ip %(address)s 没有被关联。"
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr "没有浮动ip存在。"
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "接口 %(interface)s没有找到。"
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "密钥对 %(name)s 没有为用户 %(user_id)s 找到。"
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "证书 %(certificate_id)s 没有找到。"
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "服务 %(service_id)s 没有找到。"
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "主机 %(host)s 没有找到。"
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "计算主机 %(host)s 没有找到。"
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "没有找到二进制 %(binary)s 在主机 %(host)s 上。"
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr "认证令牌 %(token)s 没有找到。"
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr "访问密钥 %(access_key)s 没有找到。"
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr "配额没有找到。"
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "没有为项目 %(project_id)s 找到配额。"
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, fuzzy, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr "没有为项目 %(project_id)s 找到配额。"
+
+#: nova/exception.py:722
+#, fuzzy, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr "用户 %(user_id)s 没有找到。"
+
+#: nova/exception.py:726
+#, fuzzy, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr "扩展资源：%s"
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "安全组 %(security_group_id)s 没有找到。"
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, 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:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, 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:727
+#: nova/exception.py:748
 #, 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:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "迁移 %(migration_id)s 没有找到。"
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "没有为实例 %(instance_id)s 找到迁移其状态为 %(status)s 。"
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "控制台池 %(pool_id)s 没有找到。"
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "控制台%(console_id)s 没有找到。"
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr "没有为实例 %(instance_id)s 找到控制台。"
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, 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:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr "无效的控制台类型 %(console_type)s "
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr "没有找到实例类型。"
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "实例类型 %(instance_type_id)s 没有找到。"
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "名为 %(instance_type_name)s 的实例类型没有找到。"
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "类型 %(flavor_id)s 没有找到。"
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, fuzzy, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr "区域 %(zone_id)s 没有找到。"
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "调度器主机过滤器 %(filter_name)s 没有找到。"
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr "调度器的成本函数 %(cost_fn_str)s 没有找到。"
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr "未找到调度器的权重标记：%(flag_name)s"
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, 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:807
+#: nova/exception.py:828
 #, 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
+#: nova/exception.py:833
 #, 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:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr "未定义LDAP对象"
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr "没有找到LDAP用户 %(user_id)s。"
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr "没有找到LDAP用户组 %(group_id)s。"
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, 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:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "找不到文件 %(file_path)s。"
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr "没找到文件"
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr "未找到与网络适配器 %(adapter)s 关联的虚拟交换机。"
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "未找到网络适配器 %(adapter)s。"
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr "操作不允许。"
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr "无法使用全局角色 %(role_id)s"
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr "快照不允许循环。"
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr "备份 image_type 要求循环参数。"
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr "密钥对 %(key_name)s 已经存在。"
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr "用户 %(user)s 已存在。"
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr "LDAP用户 %(user)s 已经存在。"
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr "LDAP用户组 %(group)s 已经存在。"
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, 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:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr "项目 %(project)s 已经存在。"
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "实例 %(name)s 已经存在。"
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr "实例类型 %(name)s 已经存在。"
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr "卷类型 %(name)s 已经存在。"
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr "%(path)s 在共享存储上：%(reason)s"
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr "迁移错误"
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "错误格式的消息体： %(reason)s"
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "在 %(path)s 找不到配置文件。"
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "无法从路径 %(path)s 中加载应用 '%(name)s'"
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr "调整时实例的大小必须要发生变化。"
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr "镜像比实例类型所允许的大。"
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr "1个或多个区域无法完成请求。"
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr "实例类型的内存对于所请求的镜像太小。"
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr "实例类型的磁盘对于所请求的镜像太小。"
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "没有足够的可用内存来启动计算节点  %(uuid)s。"
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "无法获取此主机的带宽、CPU和磁盘指标。"
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "找不到有效主机，原因是 %(reason)s。"
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr "主机 %(host)s 没有启动或者不存在。"
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr "超出配额"
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, fuzzy, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr "%(pid)s 已经超过配额，试图运行 %(min_count)s 个实例"
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr "超过个性化文件限制"
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr "个性化文件路径太长"
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr "个性化文件内容太长"
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+#, fuzzy, python-format
+msgid "Maximum number of key pairs exceeded"
+msgstr "所选择主机的最大数目(%d)"
+
+#: nova/exception.py:1022
 #, 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:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "找不到聚合 %(aggregate_id)s。"
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "聚合 %(aggregate_name)s 已经存在。"
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "聚合 %(aggregate_id)s没有主机 %(host)s。"
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, 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:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr "主机 %(host)s 已经是另外一个聚合的成员。"
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "聚合 %(aggregate_id)s已经有主机 %(host)s。"
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, fuzzy, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr "检测到不止一个名称为 %(vol_name) 的卷。"
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, 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:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr "无法创建实例类型。"
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr "来自SolidFire API的错误响应"
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr "SolidFire API响应里发生错误：status=%(status)s"
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr "SolidFire API响应里发生错误：data=%(data)s"
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, fuzzy, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "检测到已存在的id为%(vlan) vlan"
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "实例 %(instance_id)s 没有找到。"
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
 msgstr "获取镜像 %(image)s"
@@ -1131,22 +1165,22 @@ msgstr "获取镜像 %(image)s"
 msgid "syslog facility must be one of: %s"
 msgstr "syslog设备必须作为一个 %s 。"
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr "跳过 %(full_task_name)s，到下次运行还剩下%(ticks_to_skip)s 跳。"
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr "正在运行周期性任务 %(full_task_name)s"
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr "在 %(full_task_name)s 期间发生的错误：%(e)s"
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "向调度器通报能力。"
 
@@ -1158,193 +1192,208 @@ msgstr "JSON文件表示策略。"
 msgid "Rule checked when requested rule is not found"
 msgstr "请求的规则找不到时的检查缺省规则。"
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr "启动 %(topic)s 节点 (版本 %(vcs_string)s)"
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr "为服务 %s 创建消费者"
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr "因无数据库记录，服务已被中止"
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr "服务数据库对象消失，正在重新创建。"
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr "与模型服务器(model server)的连接已恢复！"
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr "失去与模型服务器的连接"
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr "标记全集："
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr "%(flag)s：标记集合 "
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr "正在抓取 %s"
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "发现未知的 utils.execute 关键字参数：%r"
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "正在运行cmd (subprocess)：%s"
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr "运行结果为 %s"
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r 失败，重试。"
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "运行cmd (SSH)：%s"
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr "SSH上不支持环境变量"
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr "SSH上不支持的进程输入参数。"
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr "回调中debug：%s"
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "本地IP地址没有找到：%s"
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "无法连接到 %(interface)s 的本地IP：%(ex)s"
 
-#: nova/utils.py:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "无效的后台：%s"
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr "后台 %s"
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr "循环调用中。"
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, fuzzy, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "正在试图获取信号量 \"%(lock)s\" 为方法 \"%(method)s\"...锁"
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, fuzzy, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "获得信号量 \"%(lock)s\" 为方法 \"%(method)s\" ...锁"
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, fuzzy, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "正在 试图获取锁 \"%(lock)s\" 为方法 \"%(method)s\"...锁"
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, fuzzy, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "获得文件锁 \"%(lock)s\" 为方法 \"%(method)s\"...锁"
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "期望的对象类型：%s"
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "不正确的server_string：%s"
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc：'%(name)s' 用了%(total_time).2f 秒"
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, fuzzy, python-format
 msgid "Reloading cached file %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr "类 %(fullname)s 是不推荐的：%(msg)s"
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr "类 %(fullname)s 是不推荐的"
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr "函数 %(name)s 在%(location)s 里的是不推荐的：%(msg)s"
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr "函数 %(name)s 在%(location)s 里的是不推荐的"
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "移除容器失败：%s"
@@ -1380,135 +1429,135 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr "%(code)s: %(message)s"
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr "FaultWrapper: %s"
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr "认证失败过多"
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr "签名没有提供"
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr "访问密钥没有提供"
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr "与keystone交流失败"
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "认证失败：%s"
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr "为%(uname)s:%(pname)s 验证通过的请求"
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr "执行: %s"
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "为controller=%(controller)s 以及 action=%(action)s未验证的请求"
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "引起异常 InstanceNotFound: %s"
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "引起异常 VolumeNotFound: %s"
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr "引起异常 SnapshotNotFound: %s"
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "引起异常 NotFound: %s"
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr "引起异常 EC2APIError: %s"
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr "引起异常 KeyPairExists: %s"
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr "引起异常 InvalidParameterValue: %s"
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr "引起异常 InvalidPortRange: %s"
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr "引起异常 NotAuthorized: %s"
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr "引起异常 InvalidRequest: %s"
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "引起意外的错误：%s"
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "引起意外的错误：%s"
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr "Environment: %s"
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "发生了一个未知的错误. 请重试你的请求."
 
@@ -1517,250 +1566,254 @@ msgstr "发生了一个未知的错误. 请重试你的请求."
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "不支持的API请求：controller = %(controller)s，action = %(action)s"
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "创建卷 %s 的快照"
 
-#: 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: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:388
+#: nova/api/ec2/cloud.py:350
 #, python-format
 msgid "Create key pair %s"
 msgstr "创建密钥对 %s"
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
+#, python-format
+msgid "Key pair '%s' already exists."
+msgstr "密钥对 '%s' 已经存在。"
+
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr "导入密钥 %s"
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr "删除密钥对 %s"
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "无效的"
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "撤销 %s 安全组入口权限"
 
-#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "参数不够创建有效规则。"
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr "对给定的参数无特定规则。"
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "授权 %s 安全组入口权限"
 
-#: nova/api/ec2/cloud.py:736
+#: nova/api/ec2/cloud.py:712
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "这条规则已经存在于组%s 中"
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: 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:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr "参数GroupName的值 (%s) 无效。长度超过了上限255。"
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr "创建安全组 %s"
 
-#: nova/api/ec2/cloud.py:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr "安全组 %s 已经存在"
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/api/ec2/cloud.py:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "获取实例 %s 控制台输出"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "从快照 %s 创建卷"
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "创建 %s GB的卷"
 
-#: nova/api/ec2/cloud.py:943
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Delete Failed"
 msgstr "创建失败"
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, 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:961
+#: nova/api/ec2/cloud.py:942
 #, fuzzy
 msgid "Attach Failed."
 msgstr "创建失败"
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr "分离卷 %s"
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "分离卷 %s"
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "属性不支持: %s"
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr "vol = %s\n"
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr "分配地址"
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr "释放地址 %s"
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+#, fuzzy, python-format
+msgid "Unable to release IP Address."
+msgstr "无法找到地址 %r"
+
+#: nova/api/ec2/cloud.py:1273
 #, 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:1299
+#: nova/api/ec2/cloud.py:1283
+#, fuzzy, python-format
+msgid "Unable to associate IP Address."
+msgstr "无法找到地址 %r"
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr "取消地址 %s 的关联"
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr "镜像必须可用。"
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr "准备开始终止实例"
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr "重启实例 %r"
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr "准备停止实例"
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr "准备启动实例"
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr "解除镜像 %s 的注册"
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, 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:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr "用户或者组没有确定"
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr "仅仅支持组\"all\""
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr "operation_type必须添加或者移除"
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "正在更新镜像 %s 的 publicity 属性"
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "无法在 %d 秒内停止实例"
@@ -2416,7 +2469,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr "只有根证书能被获取。"
 
@@ -2514,19 +2567,6 @@ msgstr "Describe-resource是只有管理员才能执行的功能。"
 msgid "Host not found"
 msgstr "没有找到主机"
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr "密钥对 '%s' 已经存在。"
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr "addFixedIp缺少参数'networkId'"
@@ -2654,35 +2694,36 @@ msgstr "启动实例 %r"
 msgid "stop instance"
 msgstr "停止实例 %r"
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: 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/compute/contrib/volumes.py:148
 #: 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: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:376
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "实例 %s：没有启动"
 
-#: nova/api/openstack/compute/contrib/volumes.py:482
+#: nova/api/openstack/compute/contrib/volumes.py:342
+#, 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:510
 #: 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:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2869,119 +2910,127 @@ msgstr "未指定计算宿主机"
 msgid "Unable to find host for Instance %s"
 msgstr "无法找到实例 %s 的宿主机"
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "超过实例的配额。您无法运行更多此类型的实例。"
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:199
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "超过实例的配额。您只能再运行 %s 个此类型的实例。"
 
-#: nova/compute/api.py:201
+#: nova/compute/api.py:202
 #, 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:215
+#: nova/compute/api.py:216
 #, 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:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 #, fuzzy, python-format
 msgid "Metadata property key greater than 255 characters"
 msgstr "安全组 %s 不能比255个字符更长。"
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 #, fuzzy, python-format
 msgid "Metadata property value greater than 255 characters"
 msgstr "安全组 %s 不能比255个字符更长。"
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "准备运行 %s 个实例"
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr "为 %(pid)s/%(uid)s 向调度器发送创建命令"
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "准备尝试软删除实例 %s"
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 #, fuzzy, python-format
 msgid "No host for instance, deleting immediately"
 msgstr "没有托管实例 %s，立刻删除"
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "准备尝试终止实例 %s"
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "准备尝试停止实例 %s"
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "准备尝试启动实例 %s"
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr "实例 %(instance_uuid)s 没有停止。(%(vm_state)s"
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr "搜索条件： %s"
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr "无法识别镜像类型 %s"
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id为空。假定在迁移。"
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, 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:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr "存在多个固定IP，使用第一个：%s"
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr "密钥对名称长度必须在1到255个字符之间"
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr "创建参数必须是正整数"
@@ -2996,79 +3045,83 @@ msgstr "数据库错误：%s"
 msgid "Instance type %s not found for deletion"
 msgstr "未找到要删除的实例类型 %s"
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorating: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, 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:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: 锁定: |%s|"
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: 执行中: |%s|"
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock:  未执行 |%s|"
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr "无法加载虚拟驱动：%s"
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, 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:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr "nova-compute重启后，实例正在重启。"
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "虚拟机管理程序驱动不支持防火墙规则"
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr "正在检查状态"
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "正在设置 bdm %s"
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 #, fuzzy
 msgid "Instance not found."
 msgstr "没有找到实例"
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr "实例已经创建"
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -3077,7 +3130,7 @@ msgstr ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -3086,129 +3139,130 @@ msgstr ""
 "镜像 '%(image_id)s'  的大小为 %(size_bytes)d ，超过实例类型 instance_type 所允许的大小 "
 "%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr "正在启动虚拟机"
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr "实例跳过网络分配"
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr "实例网络设置失败"
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "实例的network_info：|%s|"
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr "实例块设备设置失败"
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr "实例生产失败"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s 实例"
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr "终止bdm %s"
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s。把实例的 vm_state设置为ERROR"
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 #, fuzzy, python-format
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr "无法重建实例 [%(instance_uuid)s]，因为给定的镜像不存在。"
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "无法重新创建实例 [%(instance_uuid)s]: %(exc)s"
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "正在重新创建实例 %s"
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "正在重启虚拟机 %s"
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, 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:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "实例 %s: 快照中"
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, 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:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "找到 %(num_images)d 个镜像 (rotation: %(rotation)d)"
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "轮换出%d个备份"
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr "正在删除镜像 %s"
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "设置管理员密码失败。实例 %s 没有运行"
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 #, fuzzy, python-format
 msgid "Root password set"
 msgstr "实例 %s：Root密码已设置"
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr "该驱动不能执行set_admin_password。"
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr "设置管理员密码出错"
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, fuzzy, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
@@ -3217,12 +3271,12 @@ msgstr ""
 "试图把一个文件注入到没有运行的实例：%(instance_uuid)s (状态: %(current_power_state)s 预计: "
 "%(expected_state)s)"
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, fuzzy, python-format
 msgid "injecting file to %(path)s"
 msgstr "注入文件路径：'%s'"
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, fuzzy, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
@@ -3231,155 +3285,155 @@ msgstr ""
 "试图更新没有运行的实例上的代理：%(instance_uuid)s (状态: %(current_power_state)s 预计: "
 "%(expected_state)s)"
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, fuzzy, python-format
 msgid "updating agent to %(url)s"
 msgstr "把代理更新为 %s"
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 #, fuzzy, python-format
 msgid "Unrescuing"
 msgstr "实例 %s：取消救援"
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr "目标与来源一样。"
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 #, fuzzy
 msgid "Pausing"
 msgstr "正在更新。"
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 #, fuzzy, python-format
 msgid "Retrieving diagnostics"
 msgstr "实例 %s ：获取诊断"
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 #, fuzzy, python-format
 msgid "Suspending"
 msgstr "实例 %s：挂起"
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 #, fuzzy, python-format
 msgid "Getting locked state"
 msgstr "实例%s：获取锁定的状态"
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 #, fuzzy
 msgid "Reset network"
 msgstr "重置网络"
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 #, fuzzy, python-format
 msgid "Inject network info"
 msgstr "实例 %s：注入网络信息"
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "将注入的network_info：|%s|"
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 #, fuzzy, python-format
 msgid "Get console output"
 msgstr "获取实例 %s 控制台输出"
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 #, fuzzy, python-format
 msgid "Getting vnc console"
 msgstr "实例 %s：正在获得VNC控制台"
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "卷 %(volume_id)s 正在 %(mountpoint)s 上启动"
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, fuzzy, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr "卷 %(volume_id)s 正在 %(mountpoint)s 上启动"
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "卷 %(volume_id)s 从挂载点 %(mp)s 分离"
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 #, fuzzy, python-format
 msgid "Detaching volume from unknown instance"
 msgstr "从未知实例%s中分离卷"
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, 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:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr "实例没有卷。"
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, 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:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr "预在线迁移在%(dest)s失败"
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr "post_live_migration()已经启动。"
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr "没有找到floating_ip"
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr "没有找到floating_ip"
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
@@ -3388,12 +3442,12 @@ msgstr ""
 "在线迁移：意外的错误：无法继承浮动ip。\n"
 "%(e)s"
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr "把实例迁移到 %(dest)s 成功完成。"
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -3401,77 +3455,116 @@ msgstr ""
 "你会看到错误“libvirt: QEMU error: Domain not found: no domain with matching "
 "name。”这个错误可以放心的忽略。"
 
-#: nova/compute/manager.py:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr "迁移后操作启动"
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr "发现 %(migration_count)d 个超过 %(confirm_window)d 秒未经确认的迁移"
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, fuzzy, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr "为实例 %(instance_uuid)s 关闭虚拟机"
+
+#: nova/compute/manager.py:2343
+#, fuzzy, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr "没有找到实例 %(instance_id)s"
+
+#: nova/compute/manager.py:2347
+#, fuzzy
+msgid "In ERROR state"
+msgstr "节点处于未知的错误状态。"
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr "更新带宽使用缓存"
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr "更新主机状态"
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, 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:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 #, 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:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0，跳过..."
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr "回收删除的实例"
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, 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:2578
+#: nova/compute/manager.py:2659
 #, fuzzy, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3531,17 +3624,17 @@ msgstr "重启xvp"
 msgid "xvp not running..."
 msgstr "xvp不在运行中"
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr "删除过期令牌：(%s)"
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr "接收到令牌：%(token)s, %(token_dict)s)"
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr "检查令牌：%(token)s, %(token_valid)s)"
@@ -3560,17 +3653,17 @@ msgstr "无法识别的 read_deleted 取值”%s“"
 msgid "No ComputeNode for %(host)s"
 msgstr "主机 %(host)s 没有计算节点"
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr "没有id为%(sm_backend_id)s的后台配置"
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr "没有 sm_flavor 调用 %(sm_flavor)s"
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr "没有id为 %(volume_id)s 的 sm_volume"
@@ -3588,13 +3681,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr "SQL连接失败 (%(connstring)s)。还剩 %(attempts)d 次。"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr "表 |%s| 没有创建"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 #, fuzzy
 msgid "quota_classes table not dropped"
 msgstr "instance_info_caches 没有删除掉"
@@ -3621,6 +3716,16 @@ msgstr "外键约束无法删除"
 msgid "foreign key could not be created"
 msgstr "外键约束无法去除"
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+#, fuzzy
+msgid "quota_usages table not dropped"
+msgstr "dns_domains 表没有删除"
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+#, fuzzy
+msgid "reservations table not dropped"
+msgstr "dns_domains 表没有删除"
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr "glance服务器连接错误，重试中"
@@ -3653,22 +3758,22 @@ msgstr "不是镜像所有者"
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr "%(timestamp)s 没有遵循任何签名格式：%(iso_formats)s"
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr "把 %(image_location)s 下载到 %(image_path)s失败"
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr "解密 %(image_location)s 到 %(image_path)s失败"
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr "解包 %(image_location)s 到 %(image_path)s 失败"
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr "上传 %(image_location)s 到 %(image_path)s 失败"
@@ -3678,17 +3783,17 @@ msgstr "上传 %(image_location)s 到 %(image_path)s 失败"
 msgid "Failed to decrypt private key: %s"
 msgstr "解密私钥失败：%s"
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "解密初始化vector失败：%s"
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "解密镜像文件 %(image_file)s 失败：%(err)s"
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr "镜像中不安全的文件名"
 
@@ -3787,42 +3892,42 @@ msgstr "移除实例”%s“的虚拟网络设备时失败"
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, fuzzy, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr "证书 %(certificate_id)s 没有找到。"
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr "没有找到接口 %(interface)s"
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr "为实例 |%s| 分配浮动IP"
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr "为实例 |%s| 释放浮动IP"
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr "地址 |%(address)s| 没有分配"
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr "地址 |%(address)s| 没有分配给你的项目 |%(project)s|"
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr "%s 的配额超出，尝试分配地址"
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3830,41 +3935,41 @@ msgid ""
 "ignored."
 msgstr "数据库不一致：DNS域|%s| 在Nova数据库中注册，但是对浮动或者实例DNS驱动均不可见。将被忽略。"
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr "域 |%(domain)s| 已经存在，把区域改变为 |%(av_zone)s|。"
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "域 |%(domain)s| 已经存在，把项目改变为 |%(project)s|。"
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr "解除 %s 过期固定ip的关联"
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr "设置网络主机"
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr "为实例 |%s| 的网路分配"
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr "为实例 |%(instance_id)s| 获取的网络：|%(networks)s|"
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr "为实例 |%s| 解除网络分配"
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, fuzzy, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3874,73 +3979,73 @@ msgstr ""
 "instance-dns-zone是 |%(domain)s|，该域位于区域 |%(zone)s| 中。实例|%(instance)s| 在区域 "
 "|%(zone2)s| 里。没有DNS记录将创建。"
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "租用的IP |%(address)s|"
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "没有关联的IP %s 被租用了"
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr "没有分配的IP |%s| 被租用了"
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "释放的IP |%(address)s|"
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "没有关联的IP %s 被释放了"
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "没有租用的IP %s 被释放了"
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr "cidr 已经在使用"
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr "请求的cidr (%(cidr)s) 与已存在的超网络 (%(super)s) 冲突"
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, 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:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr "网络已经存在。"
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "网路在删除前必须与项目 %s 解除关联"
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "网络数量与VLAN起始数之和不能大于4049"
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3951,31 +4056,31 @@ msgstr "网络范围不够多而不适合 %(num_networks)s。网络大小是 %(n
 msgid "This driver only supports type 'a'"
 msgstr "驱动仅支持类型 'a'"
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr "租户ID没有设"
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr "Quantum客户请求：%(method)s %(action)s"
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr "Quantum实体没有找到：%s"
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr "服务器 %(status_code)s 错误：%(data)s"
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr "无法连接到服务器。出现错误：%s"
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr "无法反序列化type = '%s' 的对象"
@@ -4057,36 +4162,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr "调用get_project_and_global_net_ids时 project_id必须是非空。"
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr "创建网络入口的错误"
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr "没有net_id = %s的网络"
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, fuzzy, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr "没有为vif %sid取消分配固定IP"
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr "将连接接口 %(interface_id)s 连接到net %(net_id)s 针对租户 %(tenant_id)s"
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 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:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr "%s 不在有效的优先级"
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4103,12 +4208,12 @@ msgstr "Problem '%(e)s' 试图发送到通知驱动 %(driver)s。"
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr "未打包的上下文：%s"
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr "已接收 %s"
@@ -4123,31 +4228,36 @@ msgstr "没有适用于消息的方法：%s"
 msgid "No method for message: %s"
 msgstr "没有适用于消息的方法：%s"
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr "在 %s 做异步call"
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "消息ID(MSG_ID)是 %s"
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr "在 %s 做异步cast"
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr "做异步fanout cast"
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+#, fuzzy
+msgid "An unknown RPC related exception occurred."
+msgstr "发生未知异常。"
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
@@ -4156,11 +4266,20 @@ msgstr ""
 "远程错误：%(exc_type)s %(value)s\n"
 "%(traceback)s。"
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr "等待RPC响应返回超时"
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr "无效的RPC连接重用。"
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "返回 %s 异常给调用者"
@@ -4242,60 +4361,60 @@ msgstr "正确的服务在运行吗？"
 msgid "Could not find another compute"
 msgstr "无法找到另一个计算节点"
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr "把“%(method)s”投放在卷%(host)s\""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr "把“%(method)s”投放在主机 \"%(host)s\""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr "把“%(method)s”投放在网络 \"%(host)s\""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr "把“%(method)s”投放在 %(topic)s \"%(host)s\""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr "必须实现一个回滚 schedule"
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr "块存储迁移无法在共享存储使用"
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 #, fuzzy
 msgid "Live migration can not be used without shared storage."
 msgstr "块存储迁移无法在共享存储使用"
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr "主机 %(dest)s 和原先的主机 %(src)s 不兼容。"
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4362,19 +4481,19 @@ msgstr "host_manager 只实现了“compute”"
 msgid "No service for compute ID %s"
 msgstr "计算节点 %s 没有服务"
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, 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:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "schedule_%(method)s 失败：%(ex)s"
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, fuzzy, python-format
 msgid "Setting instance to %(state)s state."
 msgstr "设置实例 %(instance_uuid)s 至 ERROR 状态"
@@ -4397,6 +4516,21 @@ msgstr "没有足够可分配的剩余CPU核心"
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr "卷没有足够可分配的空间"
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr "未设置 VCPUs；假设 CPU 集合损坏了"
@@ -4421,11 +4555,11 @@ 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:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr "请扩展模拟的 libvirt 模块来支持标记"
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr "请扩展伪libvirt模块来支持这种认知方法"
 
@@ -4493,12 +4627,12 @@ msgstr "项目"
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr "目标 %s 已经分配"
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr "无法确认导出的卷 id：%s。"
@@ -4513,12 +4647,12 @@ msgstr "给定数据：%s"
 msgid "Result data: %s"
 msgstr "结果数据：%s"
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "在%s 创建文件模拟客户代理"
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "移除在 %s 的模拟的客户代理文件"
@@ -4634,21 +4768,21 @@ msgstr "意外的状态码"
 msgid "Decoding JSON: %s"
 msgstr "解码JSON：%s"
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "嵌套(调用)接收到 %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr "嵌套(调用)返回 %s"
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr "RPC后台不支持超时"
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
@@ -4657,19 +4791,19 @@ msgstr "已接收 %s"
 msgid "Failed to open connection to the hypervisor"
 msgstr "打开虚拟机管理程序的连接失败"
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr "Compute_service记录为 %s 创建 "
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr "Compute_service记录为 %s 更新 "
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr "试图不过滤没有过滤的实例"
 
@@ -4682,12 +4816,12 @@ msgstr "过滤器添加给实例 %s"
 msgid "Provider Firewall Rules refreshed"
 msgstr "提供者防火墙规则刷新"
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr "添加安全组规则：%r"
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr "添加提供者规则：%s"
@@ -4937,7 +5071,7 @@ msgstr "实例 %s：开始方法 toXML"
 msgid "instance %s: finished toXML method"
 msgstr "实例 %s：方法toXML 完成"
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4952,7 +5086,7 @@ msgstr "#### RLK: cpu_arch = %s "
 msgid "Updating!"
 msgstr "正在更新。"
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr "正在更新主机状态"
@@ -5081,180 +5215,168 @@ msgstr "qemu-nbd 错误：%s"
 msgid "nbd device %s did not show up"
 msgstr "nbd 设备 %s 没有出现"
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "正在连接 libvirt：%s"
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr "连接 libvirt 失败"
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, 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:415
+#: nova/virt/libvirt/connection.py:416
 #, 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:426
+#: nova/virt/libvirt/connection.py:427
 #, 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:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr "实例销毁成功。"
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, 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:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr "删除实例文件 %(target)s"
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr "无法确定iscsi initiator名字"
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr "附加 LXC 块设备"
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr "分离LXC 块设备"
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "实例成功重启。"
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "重新启动实例失败"
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "实例成功生产。"
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr "重启过程中，实例消失。"
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr "实例成功重启。"
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr "正在自动确认迁移 %d"
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr "实例在运行"
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 #, fuzzy
 msgid "During spawn, instance disappeared."
 msgstr "重启过程中，实例消失。"
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr "实例成功生产。"
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data：%(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "用户没有管理员权限"
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr "正在创建镜像"
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr "将 %(injection)s 注入到镜像 %(img_id)s"
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, 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:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr "块设备列表 block_device_list %s"
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr "正在启动 toXML 方法"
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr "toXML方法完成"
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "libvirt版本过旧(不支持getVersion)"
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr "'<cpu>' 必须为 1, 但是为 %d\n"
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr "拓扑 (%(topology)s) 必须含有 %(ks)s"
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -5263,7 +5385,7 @@ msgstr ""
 "已启动实例的CPU信息：\n"
 "%s"
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5278,42 +5400,42 @@ msgstr ""
 "\n"
 "参考 %(u)s"
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr "迁移 %s 超时"
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "因它像卷，所以跳过 %(path)s"
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 #, fuzzy, python-format
 msgid "Starting migrate_disk_and_power_off"
 msgstr "实例 %s：开始执行 migrate_disk_and_power_off"
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 #, fuzzy, python-format
 msgid "During wait running, instance disappeared."
 msgstr "%s 在运行中消失了。"
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 #, fuzzy, python-format
 msgid "Instance running successfully."
 msgstr "实例 %s 成功运行。"
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 #, fuzzy, python-format
 msgid "Starting finish_migration"
 msgstr "实例 %s：开始执行 finish_migration"
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 #, fuzzy, python-format
 msgid "Starting finish_revert_migration"
 msgstr "实例 %s：开始执行 finish_revert_migration"
@@ -5332,17 +5454,17 @@ msgstr "在 nwfilter 里调用 setup_basic_filtering"
 msgid "Ensuring static filters"
 msgstr "正在确保静态过滤器"
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr "nwfilter(%(instance_filter_name)s)未找到"
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr "名称为 %(name)s 的nwfilter(%(instance_filter_name)s) 未找到。"
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables 防火墙：设置基本的过滤规则"
 
@@ -5474,46 +5596,46 @@ msgstr "可删除的基文件：%s"
 msgid "Verification complete"
 msgstr "确认完成"
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr "无法找到一个开放端口"
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, fuzzy, python-format
 msgid "Reading image info file: %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "_create: %s"
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, fuzzy, python-format
 msgid "Wrote: %s"
 msgstr "重写%s"
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr "保证vlan %(vlan)s 和桥 %(bridge)s"
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "保证桥 %s"
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 #, fuzzy, python-format
 msgid "Failed while unplugging vif"
 msgstr "移除实例”%s“的虚拟网络设备时失败"
@@ -5935,7 +6057,7 @@ msgstr "正在获取镜像 %s 的大小"
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr "获得大小为 %(size)s 的镜像目的为了 %(image)s"
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -5944,28 +6066,28 @@ msgstr ""
 "针对use connection_type=xenapi必须指定xenapi_connection_url, "
 "xenapi_connection_username (可选) 和 xenapi_connection_password"
 
-#: nova/virt/xenapi/connection.py:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "解密私钥失败：%s"
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr "不支持在XenServer启动主机"
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "无法登录到XenAPI(Dom0磁盘是空么？)"
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr "得到异常：%s"
@@ -6702,68 +6824,36 @@ msgstr "找到%(instance_count)d个超过%(timeout)d秒悬挂的重启"
 msgid "Automatically hard rebooting"
 msgstr "自动冷重启 %d"
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr "没有找到实例 %(instance_id)s"
-
-#: nova/virt/xenapi/vmops.py:1347
-#, fuzzy
-msgid "In ERROR state"
-msgstr "节点处于未知的错误状态。"
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr "无法得到带宽信息"
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 #, fuzzy, python-format
 msgid "Injecting network info to xenstore"
 msgstr "为虚拟机注入网络信息到xs：|%s|"
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 #, fuzzy
 msgid "Creating vifs"
 msgstr "正在创建镜像"
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "正在为虚拟机 %(vm_ref)s，网络 %(network_ref)s 创建VIF。"
 
-#: nova/virt/xenapi/vmops.py:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, 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:1479
+#: nova/virt/xenapi/vmops.py:1423
 #, fuzzy, python-format
 msgid "Injecting hostname to xenstore"
 msgstr "为虚拟机注入hostname到xs：|%s|"
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, fuzzy, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
@@ -6772,24 +6862,24 @@ msgstr ""
 "%(method)s 的代理调用返回无效的响应：%(ret)r。虚拟机id=%(instance_uuid)s; path=%(path)s; "
 "args=%(addl_args)r"
 
-#: nova/virt/xenapi/vmops.py:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, 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:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, 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:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL错误：%s"
@@ -7006,37 +7096,37 @@ msgstr "净化存储库 %s 出错"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "挂载点 %(mountpoint)s 从实例 %(instance_name)s 分离"
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr "握手出错：%s"
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr "无效的请求：%s"
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr "请求：%s"
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr "请求缺少令牌：%s"
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr "请求中有无效令牌：%s"
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr "意外错误：%s"
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr "启动nova-xvpvncproxy节点(版本 %s)"
@@ -7147,108 +7237,108 @@ msgstr "Sheepdog 没有工作"
 msgid "LoggingVolumeDriver: %s"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "重新导出卷%s"
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "卷 %s：跳过导出"
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr "卷 %s: 创建中"
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, 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:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr "卷%s：正在创建导出"
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "卷%s：创建成功"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr "卷仍在附加中"
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr "卷不属于这个节点"
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr "卷%s：正在移除导出"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr "卷%s：删除中"
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr "卷 %s：卷繁忙"
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "卷%s：删除成功"
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr "快照 %s：正在创建"
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr "快照 %(snap_name)s：正在创建"
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr "快照 %s：创建成功"
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr "快照 %s：正在删除"
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "快照 %s：创建成功"
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr "快照 %s：删除成功"
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr "检查卷能力"
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr "找到新能力：%s"
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr "清理能力"
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr "收到通知 {%s}"
@@ -7783,9 +7873,6 @@ msgstr ""
 #~ 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 上发送通知"
 
@@ -7957,6 +8044,9 @@ msgstr ""
 #~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
 #~ msgstr "任务 [%(name)s] %(task)s 状态：%(status)s %(error_info)s"
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr "正在自动确认迁移 %d"
+
 #~ msgid "virsh said: %r"
 #~ msgstr "virsh 输出： %r"
 
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index 8f75310b6..da478840c 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-05-13 23:02+0000\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -93,7 +93,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr "發生一個未知例外"
 
-#: nova/exception.py:149
+#: nova/exception.py:149 nova/rpc/common.py:46
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -156,7 +156,8 @@ msgstr "無效的快照(snapshot)"
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
+#: nova/exception.py:234 nova/api/ec2/cloud.py:360 nova/api/ec2/cloud.py:385
+#: nova/api/openstack/compute/contrib/keypairs.py:91 nova/compute/api.py:1979
 msgid "Keypair data is invalid"
 msgstr "無效的Keypair"
 
@@ -216,131 +217,127 @@ msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
 #: nova/exception.py:286
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:293
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:302
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:306
 #, 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:315
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:323
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:327
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:335
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:343
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:347
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:352
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:360
+#: nova/exception.py:356
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:360
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:364
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:369
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:378
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:382
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:390
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -348,777 +345,813 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:415
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:419
 msgid "Expected a uuid but received %(uuid)."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:423
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:428
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:432
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:436
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:441
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:445
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:450
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:454
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:463
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:472
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:476
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:481
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:485
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:489
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:493
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:497
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:502
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:510
+#: nova/exception.py:506
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:510
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:514
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:518
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:522
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:562
 #, 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:571
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:571
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:575
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:579
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:583
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:587
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:591
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:596
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:600
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:609
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:617
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:621
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:645
+#: nova/exception.py:641
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:649
+#: nova/exception.py:645
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:653
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:657
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:661
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:665
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:669
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:673
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:677
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:681
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:685
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:689
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
+#: nova/exception.py:693
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
 #: nova/exception.py:697
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:702
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:706
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:710
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:714
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:709
+#: nova/exception.py:718
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:722
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:726
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:730
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:734
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:739
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:743
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:748
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:732
+#: nova/exception.py:753
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:757
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:762
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:766
 #, 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:751
+#: nova/exception.py:772
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:776
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:780
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:785
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:789
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:793
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:797
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:802
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:806
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:789
+#: nova/exception.py:810
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:814
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:819
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:823
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:828
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:833
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:817
+#: nova/exception.py:838
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:842
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:846
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:850
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:854
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:858
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:862
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:846
+#: nova/exception.py:867
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:850
+#: nova/exception.py:871
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:875
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:879
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:862
+#: nova/exception.py:883
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:887
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:875
+#: nova/exception.py:896
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:900
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:883
+#: nova/exception.py:904
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:887
+#: nova/exception.py:908
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:891
+#: nova/exception.py:912
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:896
+#: nova/exception.py:917
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:900
+#: nova/exception.py:921
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:904
+#: nova/exception.py:925
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:929
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:912
+#: nova/exception.py:933
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:937
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:920
+#: nova/exception.py:941
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:924
+#: nova/exception.py:945
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:949
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:953
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:957
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:961
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:965
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:969
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:973
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:977
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:981
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:985
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:989
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:993
 #, python-format
 msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:998
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:1002
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:1006
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:1010
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:1014
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1018
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1002
+#: nova/exception.py:1027
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1006
+#: nova/exception.py:1031
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1010
+#: nova/exception.py:1035
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1039
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1044
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:1023
+#: nova/exception.py:1048
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1031
+#: nova/exception.py:1056
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1061
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1065
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1044
+#: nova/exception.py:1069
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1048
+#: nova/exception.py:1073
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1077
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1089
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
@@ -1128,22 +1161,22 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/manager.py:146
+#: nova/manager.py:158
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: nova/manager.py:152
+#: nova/manager.py:164
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/manager.py:159
+#: nova/manager.py:171
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: nova/manager.py:203
+#: nova/manager.py:215
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1155,193 +1188,208 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:138
+#: nova/quota.py:880
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:899
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:917
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:139
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:178
+#: nova/service.py:179
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:197
+#: nova/service.py:198
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:284
+#: nova/service.py:287
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:321
+#: nova/service.py:324
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:336
+#: nova/service.py:339
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:342
+#: nova/service.py:345
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:436
+#: nova/service.py:441
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:444
+#: nova/service.py:449
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:123
+#: nova/utils.py:121
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:168
+#: nova/utils.py:166
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:178
+#: nova/utils.py:176
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:194 nova/utils.py:274
+#: nova/utils.py:192 nova/utils.py:272
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:207
+#: nova/utils.py:205
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:247
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:251
+#: nova/utils.py:249
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:255
+#: nova/utils.py:253
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:311
+#: nova/utils.py:309
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:465
+#: nova/utils.py:463
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:468
+#: nova/utils.py:466
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:580
+#: nova/utils.py:578
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:592
+#: nova/utils.py:590
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:642
+#: nova/utils.py:640
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:860
+#: nova/utils.py:760
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:864
+#: nova/utils.py:764
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:868
+#: nova/utils.py:768
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:875
+#: nova/utils.py:775
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:834
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:841
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:956
+#: nova/utils.py:856
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:960
+#: nova/utils.py:860
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:969
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1098
+#: nova/utils.py:998
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1227
+#: nova/utils.py:1127
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1318
+#: nova/utils.py:1218
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1370
+#: nova/utils.py:1270
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1372
+#: nova/utils.py:1272
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1404
+#: nova/utils.py:1304
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1406
+#: nova/utils.py:1306
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1590
+#: nova/utils.py:1490
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1377,135 +1425,135 @@ msgstr ""
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:74
+#: nova/api/ec2/__init__.py:75
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:96
+#: nova/api/ec2/__init__.py:97
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:171
+#: nova/api/ec2/__init__.py:172
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:181
+#: nova/api/ec2/__init__.py:182
 #, 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:268
+#: nova/api/ec2/__init__.py:269
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:272
+#: nova/api/ec2/__init__.py:273
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
+#: nova/api/ec2/__init__.py:308 nova/api/ec2/__init__.py:321
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:390
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:406
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:439
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:586
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:592
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:598
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:604
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:607
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:615
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:619
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:623
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:627
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:631
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:635
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:638
+#: nova/api/ec2/__init__.py:639
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648
+#: nova/api/ec2/__init__.py:649
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:651 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1514,245 +1562,247 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: 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
+#: nova/api/ec2/cloud.py:315
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:350
 #, python-format
-msgid ""
-"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
-"character, spaces, dashes, and underscore."
+msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:384
-#, python-format
-msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+#: nova/api/ec2/cloud.py:357 nova/api/ec2/cloud.py:382
+#: nova/api/openstack/compute/contrib/keypairs.py:86
+msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:363 nova/api/ec2/cloud.py:388
+#: nova/api/openstack/compute/contrib/keypairs.py:94 nova/compute/api.py:1964
 #, python-format
-msgid "Create key pair %s"
+msgid "Key pair '%s' already exists."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:397
+#: nova/api/ec2/cloud.py:372
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:395
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:562
+#: nova/api/ec2/cloud.py:538
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
-#: nova/api/ec2/cloud.py:822
+#: nova/api/ec2/cloud.py:626 nova/api/ec2/cloud.py:680
+#: nova/api/ec2/cloud.py:798
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:665
+#: nova/api/ec2/cloud.py:641
 #: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:706
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
+#: nova/api/ec2/cloud.py:671 nova/api/ec2/cloud.py:738
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:695
 #: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:736
+#: nova/api/ec2/cloud.py:712
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:720
 #: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
+#: nova/api/ec2/cloud.py:763
 #, 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:794
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798
+#: nova/api/ec2/cloud.py:774
 #: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:801
+#: nova/api/ec2/cloud.py:777
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:805
+#: nova/api/ec2/cloud.py:781
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:837
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845
+#: nova/api/ec2/cloud.py:821
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:897
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:901 nova/api/openstack/compute/contrib/volumes.py:188
 #: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943
+#: nova/api/ec2/cloud.py:924
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953
+#: nova/api/ec2/cloud.py:934
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:961
+#: nova/api/ec2/cloud.py:942
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
+#: nova/api/ec2/cloud.py:955 nova/api/openstack/compute/contrib/volumes.py:379
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:962
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
-#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
+#: nova/api/ec2/cloud.py:987 nova/api/ec2/cloud.py:1044
+#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1129
+#: nova/api/ec2/cloud.py:1110
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1260
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1284
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1270
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1273
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1283
+msgid "Unable to associate IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1286
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1312
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1346
+#: nova/api/ec2/cloud.py:1333
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1360
+#: nova/api/ec2/cloud.py:1347
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1371
+#: nova/api/ec2/cloud.py:1358
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1382
+#: nova/api/ec2/cloud.py:1369
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1459
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1475
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1507
+#: nova/api/ec2/cloud.py:1494
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1553
+#: nova/api/ec2/cloud.py:1540
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1555
+#: nova/api/ec2/cloud.py:1542
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1557
+#: nova/api/ec2/cloud.py:1544
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1546
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1620
+#: nova/api/ec2/cloud.py:1607
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -2404,7 +2454,7 @@ msgstr ""
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:75
+#: nova/api/openstack/compute/contrib/certificates.py:77
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2501,19 +2551,6 @@ msgstr ""
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:71
-msgid "Keypair name contains unsafe characters"
-msgstr ""
-
-#: 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:101
-#, python-format
-msgid "Key pair '%s' already exists."
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
 msgstr ""
@@ -2638,35 +2675,36 @@ msgstr ""
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/compute/contrib/volumes.py:75
 #: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/compute/contrib/volumes.py:148
 #: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:330
+#: nova/api/openstack/compute/contrib/volumes.py:311
+#: nova/api/openstack/compute/contrib/volumes.py:389
 #, python-format
-msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:376
+#: nova/api/openstack/compute/contrib/volumes.py:342
 #, python-format
-msgid "Instance %s is not attached."
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:482
+#: nova/api/openstack/compute/contrib/volumes.py:510
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:525
+#: nova/api/openstack/compute/contrib/volumes.py:553
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2852,111 +2890,119 @@ msgstr ""
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:195
+#: nova/compute/api.py:196
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:199
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:201
+#: nova/compute/api.py:202
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:215
+#: nova/compute/api.py:216
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:225
+#: nova/compute/api.py:226
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:229
+#: nova/compute/api.py:230
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:233
+#: nova/compute/api.py:234
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:429
+#: nova/compute/api.py:430
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:497
+#: nova/compute/api.py:498
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:524
+#: nova/compute/api.py:525
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:648
+#: nova/compute/api.py:649
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:928
+#: nova/compute/api.py:929
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:948
+#: nova/compute/api.py:949
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:996
+#: nova/compute/api.py:997
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1035
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1053
+#: nova/compute/api.py:1054
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1057
+#: nova/compute/api.py:1058
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1128 nova/volume/api.py:173
+#: nova/compute/api.py:1129 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1259
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1437
+#: nova/compute/api.py:1469
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1445
+#: nova/compute/api.py:1477
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1737
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
+#: nova/compute/api.py:1954
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:1958
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2971,453 +3017,496 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:153
+#: nova/compute/manager.py:160
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:162
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:159
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:161
+#: nova/compute/manager.py:168
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:166
+#: nova/compute/manager.py:173
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:170
+#: nova/compute/manager.py:177
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:231
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:253
+#: nova/compute/manager.py:261
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:277
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:274
+#: nova/compute/manager.py:282
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:284
+#: nova/compute/manager.py:292
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:289
+#: nova/compute/manager.py:297
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:366
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:453
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:477
+#: nova/compute/manager.py:471
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:501
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:520
+#: nova/compute/manager.py:544
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:550
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:560
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:570
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:583
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:587
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:600
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:616
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:640
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:671
+#: nova/compute/manager.py:695
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:722
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:731
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:746 nova/compute/manager.py:1363
-#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
+#: nova/compute/manager.py:770 nova/compute/manager.py:1374
+#: nova/compute/manager.py:1394 nova/compute/manager.py:1490
+#: nova/compute/manager.py:2620
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:819
+#: nova/compute/manager.py:843
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:824
+#: nova/compute/manager.py:848
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:832
+#: nova/compute/manager.py:856
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:898
+#: nova/compute/manager.py:922
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:914
+#: nova/compute/manager.py:938
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:956
+#: nova/compute/manager.py:980
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:962
+#: nova/compute/manager.py:986
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1045
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1027
+#: nova/compute/manager.py:1051
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1056
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1063
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1093
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1077
+#: nova/compute/manager.py:1101
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1115
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1106
+#: nova/compute/manager.py:1130
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1110
+#: nova/compute/manager.py:1134
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1148
 #, python-format
 msgid ""
 "trying to update agent on a non-running (state: %(current_power_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1128
+#: nova/compute/manager.py:1152
 #, python-format
 msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1141
+#: nova/compute/manager.py:1165
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1190
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1302
+#: nova/compute/manager.py:1326
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1319
+#: nova/compute/manager.py:1343
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1549
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1536
+#: nova/compute/manager.py:1567
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1600
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1581
+#: nova/compute/manager.py:1612
 msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1632
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1619
+#: nova/compute/manager.py:1650
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1659
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1638
+#: nova/compute/manager.py:1669
 msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1678
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1655
+#: nova/compute/manager.py:1686
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1658
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1672
+#: nova/compute/manager.py:1703
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1699
+#: nova/compute/manager.py:1730
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1727
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1744
+#: nova/compute/manager.py:1775
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1753
+#: nova/compute/manager.py:1784
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1795
 #, 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:1796
+#: nova/compute/manager.py:1827
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1800
+#: nova/compute/manager.py:1831
 #, fuzzy, python-format
 msgid "Detaching volume from unknown instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:1865
+#: nova/compute/manager.py:1896
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1955
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:2013
+#: nova/compute/manager.py:2044
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2040
+#: nova/compute/manager.py:2071
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2069
+#: nova/compute/manager.py:2100
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2108
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2110
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2139
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2110
+#: nova/compute/manager.py:2141
 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:2125
+#: nova/compute/manager.py:2156
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2293
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2319
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:2324
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:2336
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:2347
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:2353
+#, python-format
+msgid "In %(state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:2372
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2315
+#: nova/compute/manager.py:2396
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2344
+#: nova/compute/manager.py:2425
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2451
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2464
 msgid ""
 "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:2389
+#: nova/compute/manager.py:2470
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2500
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2511
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2496
+#: nova/compute/manager.py:2577
 #, 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:2503
+#: nova/compute/manager.py:2584
 #, 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:2510
+#: nova/compute/manager.py:2591
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2578
+#: nova/compute/manager.py:2659
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3477,17 +3566,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:61
+#: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:73
+#: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:77
+#: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3506,17 +3595,17 @@ msgstr ""
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
+#: nova/db/sqlalchemy/api.py:4609 nova/db/sqlalchemy/api.py:4635
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4321
+#: nova/db/sqlalchemy/api.py:4693
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4365
+#: nova/db/sqlalchemy/api.py:4737
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3534,13 +3623,15 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:50
 #: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:86
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:62
 msgid "quota_classes table not dropped"
 msgstr ""
 
@@ -3563,6 +3654,14 @@ msgstr ""
 msgid "foreign key could not be created"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:98
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/097_quota_usages_reservations.py:105
+msgid "reservations table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
@@ -3595,22 +3694,22 @@ msgstr ""
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:309
+#: nova/image/s3.py:311
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:328
+#: nova/image/s3.py:330
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:342
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:353
+#: nova/image/s3.py:355
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
@@ -3620,17 +3719,17 @@ msgstr ""
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:387
+#: nova/image/s3.py:386
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:398
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:410
+#: nova/image/s3.py:409
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3729,42 +3828,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:292
+#: nova/network/manager.py:293
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:301 nova/network/manager.py:509
+#: nova/network/manager.py:302 nova/network/manager.py:510
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:315
+#: nova/network/manager.py:316
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:353
+#: nova/network/manager.py:354
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:387
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:390
+#: nova/network/manager.py:391
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:403
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:637
+#: nova/network/manager.py:638
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3772,41 +3871,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:683
+#: nova/network/manager.py:684
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:693
+#: nova/network/manager.py:694
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:802
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:805
+#: nova/network/manager.py:806
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:919
+#: nova/network/manager.py:920
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:925
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:953
+#: nova/network/manager.py:954
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3814,73 +3913,73 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1252
+#: nova/network/manager.py:1253
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1269
+#: nova/network/manager.py:1270
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1273
+#: nova/network/manager.py:1274
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1281
+#: nova/network/manager.py:1282
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1286
+#: nova/network/manager.py:1287
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1290
+#: nova/network/manager.py:1291
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1293
+#: nova/network/manager.py:1294
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1356
+#: nova/network/manager.py:1357
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1360
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1370
+#: nova/network/manager.py:1371
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1429
+#: nova/network/manager.py:1430
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1449
+#: nova/network/manager.py:1450
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1853
+#: nova/network/manager.py:1854
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1860
+#: nova/network/manager.py:1861
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3891,31 +3990,31 @@ msgstr ""
 msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: nova/network/quantum/client.py:154
+#: nova/network/quantum/client.py:152
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:180
+#: nova/network/quantum/client.py:182
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:196
+#: nova/network/quantum/client.py:198
 #, python-format
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:206
+#: nova/network/quantum/client.py:208
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: nova/network/quantum/client.py:210
+#: nova/network/quantum/client.py:212
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:228
+#: nova/network/quantum/client.py:230
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3995,36 +4094,36 @@ msgstr ""
 msgid "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:75
+#: nova/network/quantum/nova_ipam_lib.py:79
 msgid "Error creating network entry"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:90
+#: nova/network/quantum/nova_ipam_lib.py:94
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:221
+#: nova/network/quantum/nova_ipam_lib.py:236
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:99
+#: nova/network/quantum/quantum_connection.py:103
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:113
+#: nova/network/quantum/quantum_connection.py:117
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:121
+#: nova/notifier/api.py:122
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:136
+#: nova/notifier/api.py:137
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4041,12 +4140,12 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:198
+#: nova/rpc/amqp.py:197
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:242
+#: nova/rpc/amqp.py:241
 #, python-format
 msgid "received %s"
 msgstr ""
@@ -4061,42 +4160,56 @@ msgstr ""
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:339
+#: nova/rpc/amqp.py:340
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:342
+#: nova/rpc/amqp.py:343
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:364
+#: nova/rpc/amqp.py:365
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:372
+#: nova/rpc/amqp.py:373
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:398
+#: nova/rpc/amqp.py:399
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:43
+#: nova/rpc/common.py:34
+#, fuzzy
+msgid "An unknown RPC related exception occurred."
+msgstr "發生一個未知例外"
+
+#: nova/rpc/common.py:64
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:60
+#: nova/rpc/common.py:81
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:161
+#: nova/rpc/common.py:85
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/rpc/common.py:89
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/rpc/common.py:191
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -4176,59 +4289,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:65
+#: nova/scheduler/driver.py:66
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:82
+#: nova/scheduler/driver.py:83
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:91
+#: nova/scheduler/driver.py:92
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:109
+#: nova/scheduler/driver.py:110
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:183
+#: nova/scheduler/driver.py:184
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:187
+#: nova/scheduler/driver.py:188
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:192
+#: nova/scheduler/driver.py:193
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:316
+#: nova/scheduler/driver.py:317
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:321
+#: nova/scheduler/driver.py:322
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:358
+#: nova/scheduler/driver.py:359
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:407
+#: nova/scheduler/driver.py:408
 #, 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:458
+#: nova/scheduler/driver.py:459
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4293,19 +4406,19 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/manager.py:89
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:151
+#: nova/scheduler/manager.py:154
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:160
+#: nova/scheduler/manager.py:163
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -4328,6 +4441,21 @@ msgstr ""
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
+#: nova/scheduler/filters/compute_filter.py:50
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:54
+#, python-format
+msgid "%(host_state)s is disabled via capabs"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
@@ -4352,11 +4480,11 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:779
+#: nova/tests/fakelibvirt.py:782
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:785
+#: nova/tests/fakelibvirt.py:788
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
@@ -4422,12 +4550,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:234
+#: nova/tests/test_volume.py:241
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:488
+#: nova/tests/test_volume.py:519
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4442,12 +4570,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:639
+#: nova/tests/test_xenapi.py:638
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:650
+#: nova/tests/test_xenapi.py:649
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4560,21 +4688,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:135
+#: nova/tests/rpc/common.py:137
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:144
+#: nova/tests/rpc/common.py:146
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:165
+#: nova/tests/rpc/common.py:168
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
+#: nova/tests/rpc/common.py:237 nova/tests/rpc/common.py:243
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4583,19 +4711,19 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
-#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
+#: nova/virt/fake.py:267 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2069 nova/virt/xenapi/connection.py:410
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
-#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2072 nova/virt/xenapi/connection.py:413
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:263
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -4607,12 +4735,12 @@ msgstr ""
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:291
+#: nova/virt/firewall.py:292
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:405 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4862,7 +4990,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1811
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -4877,7 +5005,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2630
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5006,183 +5134,171 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:280
+#: nova/virt/libvirt/connection.py:281
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:301
+#: nova/virt/libvirt/connection.py:302
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:415
+#: nova/virt/libvirt/connection.py:416
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:427
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:439
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:450
+#: nova/virt/libvirt/connection.py:451
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:476
+#: nova/virt/libvirt/connection.py:477
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:487
+#: nova/virt/libvirt/connection.py:488
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:571
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:583
+#: nova/virt/libvirt/connection.py:584
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:709
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:712
+#: nova/virt/libvirt/connection.py:713
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:741
+#: nova/virt/libvirt/connection.py:742
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:777
+#: nova/virt/libvirt/connection.py:778
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:782
+#: nova/virt/libvirt/connection.py:783
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: 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:886
-#, python-format
-msgid "Automatically confirming migration %d"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:911
+#: nova/virt/libvirt/connection.py:891
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:920
+#: nova/virt/libvirt/connection.py:900
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:925
+#: nova/virt/libvirt/connection.py:905
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:941
+#: nova/virt/libvirt/connection.py:921
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:993
+#: nova/virt/libvirt/connection.py:973
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "使用者並沒有管理者權力"
 
-#: nova/virt/libvirt/connection.py:1037
+#: nova/virt/libvirt/connection.py:1017
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1041
+#: nova/virt/libvirt/connection.py:1021
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1025 nova/virt/libvirt/connection.py:1029
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1174
+#: nova/virt/libvirt/connection.py:1154
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1358
+#: nova/virt/libvirt/connection.py:1338
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1368
+#: nova/virt/libvirt/connection.py:1348
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1400
+#: nova/virt/libvirt/connection.py:1380
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1689
+#: nova/virt/libvirt/connection.py:1669
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1693
+#: nova/virt/libvirt/connection.py:1673
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1710
+#: nova/virt/libvirt/connection.py:1690
 #, 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:1936
+#: nova/virt/libvirt/connection.py:1939
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1958
+#: nova/virt/libvirt/connection.py:1965
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1985
+#: nova/virt/libvirt/connection.py:1992
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2083
+#: nova/virt/libvirt/connection.py:2091
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2095
+#: nova/virt/libvirt/connection.py:2103
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5192,38 +5308,38 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2150
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2366
+#: nova/virt/libvirt/connection.py:2374
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2421
+#: nova/virt/libvirt/connection.py:2430
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2472
+#: nova/virt/libvirt/connection.py:2481
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2527
+#: nova/virt/libvirt/connection.py:2536
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2532
+#: nova/virt/libvirt/connection.py:2541
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2538
+#: nova/virt/libvirt/connection.py:2547
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2577
+#: nova/virt/libvirt/connection.py:2586
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -5241,17 +5357,17 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:171
+#: nova/virt/libvirt/firewall.py:182
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:217
+#: nova/virt/libvirt/firewall.py:228
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:233
+#: nova/virt/libvirt/firewall.py:244
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -5379,46 +5495,46 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:282
+#: nova/virt/libvirt/utils.py:290
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:360
+#: nova/virt/libvirt/utils.py:368
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:364
+#: nova/virt/libvirt/utils.py:372
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:370
+#: nova/virt/libvirt/utils.py:378
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:394
+#: nova/virt/libvirt/utils.py:402
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:395
+#: nova/virt/libvirt/utils.py:403
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:91
+#: nova/virt/libvirt/vif.py:92
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:101
+#: nova/virt/libvirt/vif.py:102
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#: nova/virt/libvirt/vif.py:169 nova/virt/libvirt/vif.py:225
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -5813,35 +5929,35 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:145
+#: nova/virt/xenapi/connection.py:137
 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:179
+#: nova/virt/xenapi/connection.py:171
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:353
+#: nova/virt/xenapi/connection.py:341
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:486
+#: nova/virt/xenapi/connection.py:474
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:515
+#: nova/virt/xenapi/connection.py:503
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:553
+#: nova/virt/xenapi/connection.py:541
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
+#: nova/virt/xenapi/connection.py:612 nova/virt/xenapi/connection.py:626
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -6560,88 +6676,57 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
-#, python-format
-msgid "Setting migration %(migration_id)s to error: %(reason)s"
-msgstr ""
-
-#: 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:1343
-#, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1347
-msgid "In ERROR state"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1353
-#, python-format
-msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1360
-#, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1382
+#: nova/virt/xenapi/vmops.py:1326
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1373
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1444
+#: nova/virt/xenapi/vmops.py:1388
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1453
+#: nova/virt/xenapi/vmops.py:1397
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1456
+#: nova/virt/xenapi/vmops.py:1400
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1423
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1504
+#: nova/virt/xenapi/vmops.py:1448
 #, 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:1525
+#: nova/virt/xenapi/vmops.py:1469
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1529
+#: nova/virt/xenapi/vmops.py:1473
 #, 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:1534
+#: nova/virt/xenapi/vmops.py:1478
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1620
+#: nova/virt/xenapi/vmops.py:1564
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6858,37 +6943,37 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "掛載點 %(mountpoint)s 從虛擬機器 %(instance_name)s 卸載"
 
-#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
+#: nova/vnc/xvp_proxy.py:97 nova/vnc/xvp_proxy.py:102
 #, python-format
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:119
+#: nova/vnc/xvp_proxy.py:118
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:142
+#: nova/vnc/xvp_proxy.py:141
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:153
+#: nova/vnc/xvp_proxy.py:151
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:160
+#: nova/vnc/xvp_proxy.py:158
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:180
+#: nova/vnc/xvp_proxy.py:178
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -6999,108 +7084,108 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:98
+#: nova/volume/manager.py:99
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:103
+#: nova/volume/manager.py:104
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:109
+#: nova/volume/manager.py:111
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:121
+#: nova/volume/manager.py:123
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:133
+#: nova/volume/manager.py:135
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:146
+#: nova/volume/manager.py:148
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:158
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:157
+#: nova/volume/manager.py:160
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:162
+#: nova/volume/manager.py:166
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:168
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:167
+#: nova/volume/manager.py:171
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:179
+#: nova/volume/manager.py:183
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:186
+#: nova/volume/manager.py:191
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:190
+#: nova/volume/manager.py:195
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:205
+#: nova/volume/manager.py:210
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:219
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:217
+#: nova/volume/manager.py:222
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:229
+#: nova/volume/manager.py:234
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:319
+#: nova/volume/manager.py:324
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:323
+#: nova/volume/manager.py:328
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:334
+#: nova/volume/manager.py:339
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:338
+#: nova/volume/manager.py:343
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -8020,6 +8105,9 @@ msgstr ""
 #~ msgid "no partitions found"
 #~ msgstr ""
 
+#~ msgid "Automatically confirming migration %d"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
author	OpenStack Jenkins <jenkins@openstack.org>	2012-05-24 02:39:15 +0000
committer	Gerrit Code Review <review@openstack.org>	2012-05-24 02:39:15 +0000
commit	bae7d8a1e8af0c0303862420ad552c05b955ccff (patch)
tree	459e9832579e7d8db38fbf5ee82da2c120460f7e
parent	10c5d74dcd7cddc4dcefe27180eae5eb8587b1b6 (diff)
parent	66073a454eb6d44bf1afd33d972b0b582e46b971 (diff)
download	nova-bae7d8a1e8af0c0303862420ad552c05b955ccff.tar.gz nova-bae7d8a1e8af0c0303862420ad552c05b955ccff.tar.xz nova-bae7d8a1e8af0c0303862420ad552c05b955ccff.zip