Merge "Imported Translations from Launchpad"

19 files changed, 10407 insertions, 9039 deletions

diff --git a/nova/locale/bs/LC_MESSAGES/nova.po b/nova/locale/bs/LC_MESSAGES/nova.po
index 1b631a9f2..4822b56b8 100644
--- a/nova/locale/bs/LC_MESSAGES/nova.po
+++ b/nova/locale/bs/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+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"
@@ -1138,158 +1138,158 @@ msgstr ""
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2377,7 +2377,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3763,37 +3763,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3801,41 +3806,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3843,68 +3848,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4065,51 +4075,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4125,61 +4135,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr ""
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4411,36 +4366,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr ""
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4551,12 +4476,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4693,14 +4618,14 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4729,16 +4654,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4781,23 +4706,23 @@ msgid ""
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5002,7 +4927,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5017,7 +4942,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5140,174 +5065,174 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5317,40 +5242,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5473,41 +5398,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5530,19 +5455,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6059,714 +5984,698 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
+#: nova/virt/xenapi/vm_utils.py:379
 #, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:394
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Fetching image %(image)s"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
-#, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
+#: nova/virt/xenapi/vm_utils.py:895
+msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
+#: nova/virt/xenapi/vmops.py:233
+msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
+#: nova/virt/xenapi/vmops.py:358
+msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
+#: nova/virt/xenapi/vmops.py:544
+msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:692
+#: nova/virt/xenapi/vmops.py:686
 #, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+msgid "Unable to Snapshot instance: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1147
+msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Automatically hard rebooting %d"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1374
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1379
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1492
 #, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1495
 #, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
 #: nova/virt/xenapi/vmops.py:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -7054,72 +6963,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "Status volumena mora biti omogućen"
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr ""
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7724,6 +7633,42 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Reconnected to queue"
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr ""
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "response %s"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr ""
+
+#~ msgid "message %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7814,6 +7759,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr ""
+
+#~ msgid "Publishing to route %s"
+#~ msgstr ""
+
+#~ msgid "Declaring queue %s"
+#~ msgstr ""
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr ""
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr ""
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr ""
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7922,6 +7885,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr ""
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr ""
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7933,9 +7902,27 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#~ msgstr ""
+
+#~ msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
 #~ msgid "Size for image %(image)s:%(virtual_size)d"
 #~ msgstr ""
 
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -7960,6 +7947,9 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr ""
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7969,6 +7959,27 @@ msgstr ""
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr ""
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -7978,9 +7989,89 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Finished snapshot and upload for VM %s"
+#~ msgstr ""
+
+#~ msgid "Starting snapshot for VM %s"
+#~ msgstr ""
+
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index d05f99030..40c36d4c2 100644
--- a/nova/locale/cs/LC_MESSAGES/nova.po
+++ b/nova/locale/cs/LC_MESSAGES/nova.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
-"PO-Revision-Date: 2012-03-31 19:45+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+0000\n"
+"PO-Revision-Date: 2012-04-04 20:28+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 && "
@@ -1180,158 +1180,158 @@ msgstr "Úplná sada PŘÍZNAKŮ:"
 msgid "%(flag)s : FLAG SET "
 msgstr "%(flag)s : SADA PŽÍZNAKŮ "
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Vnitřní výjimka: %s"
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr "Získávání %s"
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, 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:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Spouštění příkazu (podproces): %s"
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr "Výsledek byl %s"
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r selhalo. Opakování."
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Spouštění příkazu (SSH): %s"
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr "Prostředí není podporováno přes SSH"
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr "process_input není podporován přes SSH"
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr "ladění ve zpětném volání: %s"
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Adresa místního spojení nenalezena.: %s"
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, 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:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Neplatná podpůrná vrstva: %s"
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr "podpůrná vrstva: %s"
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr "v opakujícím volání"
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, 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:930
+#: nova/utils.py:931
 #, 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:934
+#: nova/utils.py:935
 #, 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:941
+#: nova/utils.py:942
 #, 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:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Očekáván objekt typu: %s"
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Neplatný  server_string: %s"
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' trvalo %(total_time).2f sek"
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr "Původní výjimka je zahozena"
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr "Třída %(fullname)s je zastaralá: %(msg)s"
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr "Třída %(fullname)s je zastaralá"
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, 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:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr "Funkce %(name)s v %(location)s je zastaralá"
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2042,37 +2042,37 @@ msgstr "Zavádění správce rozšíření."
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
-msgstr ""
+msgstr "Obraz nenalezen"
 
 #: nova/api/openstack/compute/image_metadata.py:79
 msgid "Incorrect request body format"
-msgstr ""
+msgstr "Nsprávný formát těla požadavku"
 
 #: nova/api/openstack/compute/image_metadata.py:83
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
 #: nova/api/openstack/compute/contrib/volumetypes.py:188
 msgid "Request body and URI mismatch"
-msgstr ""
+msgstr "Neshoda s tělem požadavku a URI"
 
 #: nova/api/openstack/compute/image_metadata.py:86
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
 #: nova/api/openstack/compute/contrib/volumetypes.py:191
 msgid "Request body contains too many items"
-msgstr ""
+msgstr "Tělo požadavku obsahuje příliš mnoho položek"
 
 #: nova/api/openstack/compute/image_metadata.py:111
 msgid "Invalid metadata key"
-msgstr ""
+msgstr "Neplatný klíč metadata"
 
 #: nova/api/openstack/compute/ips.py:74
 msgid "Instance does not exist"
-msgstr ""
+msgstr "Instance neexistuje"
 
 #: nova/api/openstack/compute/ips.py:97
 msgid "Instance is not a member of specified network"
-msgstr ""
+msgstr "Instance není členem zadané sítě"
 
 #: nova/api/openstack/compute/limits.py:140
 #, python-format
@@ -2080,50 +2080,52 @@ msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
+"Pouze %(value)s požadavky %(verb)s mohou být provedeny pro %(uri)s "
+"každých %(unit_string)s."
 
 #: nova/api/openstack/compute/limits.py:266
 msgid "This request was rate-limited."
-msgstr ""
+msgstr "Tento požadavek má omezen množství."
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
 #: nova/api/openstack/compute/server_metadata.py:159
 msgid "Server does not exist"
-msgstr ""
+msgstr "Server neexistuje"
 
 #: nova/api/openstack/compute/server_metadata.py:141
 #: nova/api/openstack/compute/server_metadata.py:152
 msgid "Metadata item was not found"
-msgstr ""
+msgstr "Položka metadat nenalezena"
 
 #: nova/api/openstack/compute/servers.py:425
 #, python-format
 msgid "Invalid server status: %(status)s"
-msgstr ""
+msgstr "Neplatný stav serveru: %(status)s"
 
 #: nova/api/openstack/compute/servers.py:433
 msgid "Invalid changes-since value"
-msgstr ""
+msgstr "Neplatná hodnota changes-since"
 
 #: nova/api/openstack/compute/servers.py:483
 msgid "Personality file limit exceeded"
-msgstr ""
+msgstr "Překročen limit osobnostního souboru"
 
 #: nova/api/openstack/compute/servers.py:485
 msgid "Personality file path too long"
-msgstr ""
+msgstr "Cesta osobnostního souboru je příliš dlouhá"
 
 #: nova/api/openstack/compute/servers.py:487
 msgid "Personality file content too long"
-msgstr ""
+msgstr "Obsah osobnostního souboru je příliš dlouhý"
 
 #: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
-msgstr ""
+msgstr "Název serveru není řetězec nebo unicode"
 
 #: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
-msgstr ""
+msgstr "Název serveru je prázdný řetězec"
 
 #: nova/api/openstack/compute/servers.py:509
 msgid "Server name must be less than 256 characters."
@@ -2132,204 +2134,205 @@ msgstr ""
 #: nova/api/openstack/compute/servers.py:527
 #, python-format
 msgid "Bad personality format: missing %s"
-msgstr ""
+msgstr "Špatný formát osobnosti: chybí %s"
 
 #: nova/api/openstack/compute/servers.py:530
 msgid "Bad personality format"
-msgstr ""
+msgstr "Špatný formát osobnosti"
 
 #: nova/api/openstack/compute/servers.py:535
 #, python-format
 msgid "Personality content for %s cannot be decoded"
-msgstr ""
+msgstr "Obsah osobnosti pro %s nemůže být dekódován"
 
 #: nova/api/openstack/compute/servers.py:550
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
-msgstr ""
+msgstr "Špatný formát sítí: uuid sítě není ve správném formátu (%s)"
 
 #: nova/api/openstack/compute/servers.py:559
 #, python-format
 msgid "Invalid fixed IP address (%s)"
-msgstr ""
+msgstr "Neplatná pevná IP adresa (%s)"
 
 #: nova/api/openstack/compute/servers.py:566
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
-msgstr ""
+msgstr "Duplicitní sítě (%s) nejosu povoleny"
 
 #: nova/api/openstack/compute/servers.py:572
 #, python-format
 msgid "Bad network format: missing %s"
-msgstr ""
+msgstr "Špatný formát sítě: chybí %s"
 
 #: nova/api/openstack/compute/servers.py:575
 msgid "Bad networks format"
-msgstr ""
+msgstr "Špatný formát sítě"
 
 #: nova/api/openstack/compute/servers.py:587
 msgid "Userdata content cannot be decoded"
-msgstr ""
+msgstr "Obsah uživatelských dat nemůže být dekódován"
 
 #: nova/api/openstack/compute/servers.py:594
 msgid "accessIPv4 is not proper IPv4 format"
-msgstr ""
+msgstr "accessIPv4 není ve správném formátu IPv4"
 
 #: nova/api/openstack/compute/servers.py:601
+#, fuzzy
 msgid "accessIPv6 is not proper IPv6 format"
-msgstr ""
+msgstr "accessIPv4 není ve správném formátu IPv4"
 
 #: nova/api/openstack/compute/servers.py:633
 msgid "Server name is not defined"
-msgstr ""
+msgstr "Název serveru není určen"
 
 #: nova/api/openstack/compute/servers.py:675
 #: nova/api/openstack/compute/servers.py:740
 msgid "Invalid flavorRef provided."
-msgstr ""
+msgstr "Zadáno neplatné flavorRef."
 
 #: nova/api/openstack/compute/servers.py:737
 msgid "Can not find requested image"
-msgstr ""
+msgstr "Nelze najít požadovaný obraz"
 
 #: nova/api/openstack/compute/servers.py:743
 msgid "Invalid key_name provided."
-msgstr ""
+msgstr "Zadán neplatný název_klíče."
 
 #: nova/api/openstack/compute/servers.py:829
 #: nova/api/openstack/compute/servers.py:849
 msgid "Instance has not been resized."
-msgstr ""
+msgstr "Instanci nebyla změněna velikost."
 
 #: nova/api/openstack/compute/servers.py:835
 #, python-format
 msgid "Error in confirm-resize %s"
-msgstr ""
+msgstr "Chyba v confirm-resize %s"
 
 #: nova/api/openstack/compute/servers.py:855
 #, python-format
 msgid "Error in revert-resize %s"
-msgstr ""
+msgstr "Chyba v revert-resize %s"
 
 #: nova/api/openstack/compute/servers.py:868
 msgid "Argument 'type' for reboot is not HARD or SOFT"
-msgstr ""
+msgstr "Argument 'type' pro restart není HARD či SOFT"
 
 #: nova/api/openstack/compute/servers.py:872
 msgid "Missing argument 'type' for reboot"
-msgstr ""
+msgstr "Chybí argument 'type' pro restart"
 
 #: nova/api/openstack/compute/servers.py:885
 #, python-format
 msgid "Error in reboot %s"
-msgstr ""
+msgstr "Chyba v restartu %s"
 
 #: nova/api/openstack/compute/servers.py:897
 msgid "Unable to locate requested flavor."
-msgstr ""
+msgstr "Nelze najít požadovanou konfiguraci."
 
 #: nova/api/openstack/compute/servers.py:900
 msgid "Resize requires a change in size."
-msgstr ""
+msgstr "Resize vyžaduje změnu velikosti."
 
 #: nova/api/openstack/compute/servers.py:924
 msgid "Malformed server entity"
-msgstr ""
+msgstr "Poškozený objekt serveru"
 
 #: nova/api/openstack/compute/servers.py:931
 msgid "Missing imageRef attribute"
-msgstr ""
+msgstr "Chybí vlastnost imageRef"
 
 #: nova/api/openstack/compute/servers.py:940
 msgid "Invalid imageRef provided."
-msgstr ""
+msgstr "Zadáno neplatné imageRef."
 
 #: nova/api/openstack/compute/servers.py:949
 msgid "Missing flavorRef attribute"
-msgstr ""
+msgstr "Chybí vlastnost flavorRef"
 
 #: nova/api/openstack/compute/servers.py:962
 msgid "No adminPass was specified"
-msgstr ""
+msgstr "Nebylo zadáno adminPass"
 
 #: nova/api/openstack/compute/servers.py:966
 #: nova/api/openstack/compute/servers.py:1144
 msgid "Invalid adminPass"
-msgstr ""
+msgstr "Neplatné adminPass"
 
 #: nova/api/openstack/compute/servers.py:980
 msgid "Unable to parse metadata key/value pairs."
-msgstr ""
+msgstr "Nelze zpracovat metadata dvojic hodnot/klíčů."
 
 #: nova/api/openstack/compute/servers.py:993
 msgid "Resize request has invalid 'flavorRef' attribute."
-msgstr ""
+msgstr "Požadavek na změnu velikosti má neplatnou vlastnost 'flavorRef'."
 
 #: nova/api/openstack/compute/servers.py:996
 msgid "Resize requests require 'flavorRef' attribute."
-msgstr ""
+msgstr "Požadavek na změnu velikosti vyžaduje vlastnost 'flavorRef'."
 
 #: nova/api/openstack/compute/servers.py:1014
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
-msgstr ""
+msgstr "Neplatné tělo požadavku"
 
 #: nova/api/openstack/compute/servers.py:1019
 msgid "Could not parse imageRef from request."
-msgstr ""
+msgstr "Nelze zpracovat imageRef z požadavku."
 
 #: nova/api/openstack/compute/servers.py:1071
 msgid "Instance could not be found"
-msgstr ""
+msgstr "Instance nemohla být nalezena"
 
 #: nova/api/openstack/compute/servers.py:1074
 msgid "Cannot find image for rebuild"
-msgstr ""
+msgstr "Nelze najít obraz ke znovu sestavení"
 
 #: nova/api/openstack/compute/servers.py:1103
 msgid "createImage entity requires name attribute"
-msgstr ""
+msgstr "Objekt createImage cyžaduje vlastnost name"
 
 #: nova/api/openstack/compute/servers.py:1112
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
-msgstr ""
+msgstr "Neplatná metadata"
 
 #: nova/api/openstack/compute/servers.py:1167
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
-msgstr ""
+msgstr "Odstraňování voleb '%(unk_opt_str)s' z fronty"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
 #, python-format
 msgid "Compute.api::pause %s"
-msgstr ""
+msgstr "Compute.api::pauza %s"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:77
 #, python-format
 msgid "Compute.api::unpause %s"
-msgstr ""
+msgstr "Compute.api::zruš pauzu %s"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:94
 #, python-format
 msgid "compute.api::suspend %s"
-msgstr ""
+msgstr "compute.api::přerušení %s"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:111
 #, python-format
 msgid "compute.api::resume %s"
-msgstr ""
+msgstr "compute.api::pokračování %s"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:127
 #, python-format
 msgid "Error in migrate %s"
-msgstr ""
+msgstr "Chyba v přesunu %s"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:141
 #, python-format
 msgid "Compute.api::reset_network %s"
-msgstr ""
+msgstr "Compute.api::reset_sítě %s"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:154
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
@@ -2337,35 +2340,35 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
-msgstr ""
+msgstr "Server nenalezen"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:157
 #, python-format
 msgid "Compute.api::inject_network_info %s"
-msgstr ""
+msgstr "Compute.api::vložit_info_sítě %s"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:173
 #, python-format
 msgid "Compute.api::lock %s"
-msgstr ""
+msgstr "Compute.api::uzamčení %s"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:189
 #, python-format
 msgid "Compute.api::unlock %s"
-msgstr ""
+msgstr "Compute.api::odemčení %s"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:219
 #, python-format
 msgid "createBackup entity requires %s attribute"
-msgstr ""
+msgstr "Objekt createBackup vyžaduej vlastnost %s"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:223
 msgid "Malformed createBackup entity"
-msgstr ""
+msgstr "Poškozený objekt createBackup"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:229
 msgid "createBackup attribute 'rotation' must be an integer"
-msgstr ""
+msgstr "Vlastnost createBackup 'rotation' musí být celé číslo"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
 #: nova/api/openstack/compute/contrib/console_output.py:47
@@ -2376,16 +2379,16 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
-msgstr ""
+msgstr "Instance nenalezena"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:272
 msgid "host and block_migration must be specified."
-msgstr ""
+msgstr "host a block_migration musí být zadány."
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:284
 #, python-format
 msgid "Live migration of instance %(id)s to host %(host)s failed"
-msgstr ""
+msgstr "Migrace za chodu instance %(id)s na hostitele %(host)s selhala"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:76
 #, fuzzy, python-format
@@ -2414,7 +2417,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
-msgstr ""
+msgstr "Agregáty nemají činnost %s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:152
 #: nova/api/openstack/compute/contrib/aggregates.py:158
@@ -2435,100 +2438,102 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/certificates.py:75
 msgid "Only root certificate can be retrieved."
-msgstr ""
+msgstr "Může být získán pouze kořenový certifikát."
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
 msgstr ""
+"Nelze získat IP pro instance VPN, ujistěte se, že není spuštěna a zkuste "
+"to znovu za pár minut."
 
 #: nova/api/openstack/compute/contrib/consoles.py:44
 msgid "Missing type specification"
-msgstr ""
+msgstr "Chybí určení typu"
 
 #: nova/api/openstack/compute/contrib/consoles.py:56
 msgid "Invalid type specification"
-msgstr ""
+msgstr "Neplatné určení typu"
 
 #: nova/api/openstack/compute/contrib/disk_config.py:44
 #, python-format
 msgid "%s must be either 'MANUAL' or 'AUTO'."
-msgstr ""
+msgstr "%s musí být buď 'MANUAL' nebo 'AUTO'."
 
 #: nova/api/openstack/compute/contrib/extended_server_attributes.py:77
 #: nova/api/openstack/compute/contrib/extended_status.py:61
 msgid "Server not found."
-msgstr ""
+msgstr "Server nenalezen."
 
 #: nova/api/openstack/compute/contrib/flavorextradata.py:61
 #: nova/api/openstack/compute/contrib/flavorextradata.py:91
-#, fuzzy, python-format
+#, fuzzy
 msgid "Flavor not found."
-msgstr "značka [%s] nenalezena"
+msgstr "Server nenalezen."
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
 #: nova/api/openstack/compute/contrib/volumetypes.py:158
 msgid "No Request Body"
-msgstr ""
+msgstr "Žádné tělo požadavku"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:159
 #, python-format
 msgid "No more floating ips in pool %s."
-msgstr ""
+msgstr "Žádné další plovoucí ip v zásobníku %s."
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:161
 msgid "No more floating ips available."
-msgstr ""
+msgstr "Žádné další plovoucí ip nejsou dostupné."
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
 #: nova/api/openstack/compute/contrib/security_groups.py:571
 #: nova/api/openstack/compute/contrib/security_groups.py:604
 msgid "Missing parameter dict"
-msgstr ""
+msgstr "Chybí parametr dict"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:204
 #: nova/api/openstack/compute/contrib/floating_ips.py:233
 msgid "Address not specified"
-msgstr ""
+msgstr "Adresa není určena"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:213
 msgid "No fixed ips associated to instance"
-msgstr ""
+msgstr "K instanci nejsou přidruženy žádné pevné ip"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 msgid "Associate floating ip failed"
-msgstr ""
+msgstr "Přidružení plovoucí ip selhalo"
 
 #: nova/api/openstack/compute/contrib/hosts.py:144
 #, python-format
 msgid "Invalid status: '%s'"
-msgstr ""
+msgstr "Neplatný stav: '%s'"
 
 #: nova/api/openstack/compute/contrib/hosts.py:148
 #, fuzzy, python-format
 msgid "Invalid mode: '%s'"
-msgstr "Neplatná podpůrná vrstva: %s"
+msgstr "Neplatný stav: '%s'"
 
 #: nova/api/openstack/compute/contrib/hosts.py:152
 #, python-format
 msgid "Invalid update setting: '%s'"
-msgstr ""
+msgstr "Neplatné nastavení aktualizace: '%s'"
 
 #: nova/api/openstack/compute/contrib/hosts.py:170
-#, python-format
+#, fuzzy, python-format
 msgid "Putting host %(host)s in maintenance mode %(mode)s."
-msgstr ""
+msgstr "Nastavování hostitele %(host)s na %(state)s."
 
 #: nova/api/openstack/compute/contrib/hosts.py:181
 #, python-format
 msgid "Setting host %(host)s to %(state)s."
-msgstr ""
+msgstr "Nastavování hostitele %(host)s na %(state)s."
 
 #: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
-msgstr ""
+msgstr "Describe-resource je funkce pouze pro správce"
 
 #: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
@@ -3831,37 +3836,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, fuzzy, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr "Certifikát %(certificate_id)s nenalezen."
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3869,41 +3879,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3911,68 +3921,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4097,9 +4112,9 @@ msgid "No network with net_id = %s"
 msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
-#, python-format
+#, fuzzy, python-format
 msgid "No fixed IPs to deallocate for vif %s"
-msgstr ""
+msgstr "K instanci nejsou přidruženy žádné pevné ip"
 
 #: nova/network/quantum/quantum_connection.py:99
 #, python-format
@@ -4133,51 +4148,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Volajícímu je vrácena výjimka: %s"
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr "rozbalený kontext: %s"
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr "obdrženo: %s"
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr "pro zprávu není metoda: %s"
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr "Pro zprávu není metoda: %s"
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID je %s"
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4193,61 +4208,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr "Znovu připojeno k frontě"
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr "odpověď %s"
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr "zpráva %s"
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4455,7 +4415,7 @@ msgstr ""
 #: nova/scheduler/manager.py:159
 #, fuzzy, python-format
 msgid "Setting instance %(instance_uuid)s to %(state)s state."
-msgstr "Přesun nenalezen v instanci %(instance_id)s se stavem %(status)s."
+msgstr "Nastavování hostitele %(host)s na %(state)s."
 
 #: nova/scheduler/scheduler_options.py:66
 #, python-format
@@ -4479,36 +4439,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr ""
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4619,12 +4549,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4761,14 +4691,14 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4797,16 +4727,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4849,23 +4779,23 @@ msgid ""
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5070,7 +5000,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5085,7 +5015,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5208,176 +5138,176 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Nelze restartovat instanci"
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Uživatel nemá správcovská oprávnění"
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5387,40 +5317,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5543,41 +5473,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5600,19 +5530,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6130,714 +6060,702 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "skupina %s již existuje"
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, fuzzy, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "Nenalezeno žádné cílové id ve svazku %(volume_id)s."
 
-#: nova/virt/xenapi/vm_utils.py:381
+#: nova/virt/xenapi/vm_utils.py:379
 #, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:394
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
-#, python-format
-msgid "Fetching image %(image)s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
-msgstr ""
+#: nova/virt/xenapi/vm_utils.py:895
+#, fuzzy
+msgid "Failed to fetch glance image"
+msgstr "Nelze restartovat instanci"
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:233
+#, fuzzy
+msgid "Starting instance"
+msgstr "Instance budou spuštěny"
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
-msgstr "Instance %(instance_id)s není spuštěna."
+#: nova/virt/xenapi/vmops.py:358
+#, fuzzy
+msgid "Failed to spawn, rolling back"
+msgstr "Nelze pozastavit instanci"
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#: nova/virt/xenapi/vmops.py:544
+msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:677
+#, fuzzy, python-format
+msgid "Starting snapshot for VM"
+msgstr "Vytvořit snímek svazku %s"
 
-#: nova/virt/xenapi/vmops.py:692
-#, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:686
+#, fuzzy, python-format
+msgid "Unable to Snapshot instance: %(exc)s"
+msgstr "Nelze vytvořit typ instance"
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1147
+msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Automatically hard rebooting %d"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1374
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1379
+#, fuzzy, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr "Instance %(instance_id)s nemohla být nastavena."
+
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+msgid "Injecting network info to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
+#: nova/virt/xenapi/vmops.py:1492
 #, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1495
 #, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
 #: nova/virt/xenapi/vmops.py:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -7124,72 +7042,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr ""
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7768,6 +7686,36 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr ""
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr ""
+
+#~ msgid "message %s"
+#~ msgstr "zpráva %s"
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7858,6 +7806,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr ""
+
+#~ msgid "Publishing to route %s"
+#~ msgstr ""
+
+#~ msgid "Declaring queue %s"
+#~ msgstr ""
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr ""
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr ""
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr ""
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7966,6 +7932,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr ""
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr ""
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7977,9 +7949,27 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#~ msgstr ""
+
+#~ msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
 #~ msgid "Size for image %(image)s:%(virtual_size)d"
 #~ msgstr ""
 
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -8004,6 +7994,9 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr ""
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -8013,6 +8006,27 @@ msgstr ""
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr ""
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -8022,9 +8036,89 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Finished snapshot and upload for VM %s"
+#~ msgstr ""
+
+#~ msgid "Starting snapshot for VM %s"
+#~ msgstr ""
+
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
diff --git a/nova/locale/da/LC_MESSAGES/nova.po b/nova/locale/da/LC_MESSAGES/nova.po
index 4e645cdb4..9caa03989 100644
--- a/nova/locale/da/LC_MESSAGES/nova.po
+++ b/nova/locale/da/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+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"
@@ -1138,158 +1138,158 @@ msgstr ""
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2377,7 +2377,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3763,37 +3763,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3801,41 +3806,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3843,68 +3848,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4065,51 +4075,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4125,61 +4135,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr ""
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4411,36 +4366,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr ""
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4551,12 +4476,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4693,14 +4618,14 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4729,16 +4654,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4781,23 +4706,23 @@ msgid ""
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5002,7 +4927,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5017,7 +4942,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5140,175 +5065,175 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "bind %s: slettet"
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5318,40 +5243,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5474,41 +5399,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5531,19 +5456,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6060,714 +5985,698 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
+#: nova/virt/xenapi/vm_utils.py:379
 #, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:394
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Fetching image %(image)s"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
-#, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
+#: nova/virt/xenapi/vm_utils.py:895
+msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
+#: nova/virt/xenapi/vmops.py:233
+msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
+#: nova/virt/xenapi/vmops.py:358
+msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
+#: nova/virt/xenapi/vmops.py:544
+msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:692
+#: nova/virt/xenapi/vmops.py:686
 #, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+msgid "Unable to Snapshot instance: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1147
+msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Automatically hard rebooting %d"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1374
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1379
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1492
 #, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1495
 #, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
 #: nova/virt/xenapi/vmops.py:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -7053,72 +6962,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr ""
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7723,6 +7632,42 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Reconnected to queue"
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr ""
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "response %s"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr ""
+
+#~ msgid "message %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7813,6 +7758,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr ""
+
+#~ msgid "Publishing to route %s"
+#~ msgstr ""
+
+#~ msgid "Declaring queue %s"
+#~ msgstr ""
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr ""
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr ""
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr ""
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7921,6 +7884,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr ""
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr ""
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7932,9 +7901,27 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#~ msgstr ""
+
+#~ msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
 #~ msgid "Size for image %(image)s:%(virtual_size)d"
 #~ msgstr ""
 
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -7959,6 +7946,9 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr ""
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7968,6 +7958,27 @@ msgstr ""
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr ""
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -7977,9 +7988,89 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Finished snapshot and upload for VM %s"
+#~ msgstr ""
+
+#~ msgid "Starting snapshot for VM %s"
+#~ msgstr ""
+
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index 975c9adf4..b29b3db52 100644
--- a/nova/locale/de/LC_MESSAGES/nova.po
+++ b/nova/locale/de/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+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"
@@ -1143,158 +1143,158 @@ msgstr "Alle vorhandenen FLAGS:"
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr "Hole %s"
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Führe Kommando (subprocess) aus: %s"
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr "Ergebnis war %s"
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2382,7 +2382,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3768,37 +3768,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3806,41 +3811,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3848,68 +3853,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4070,51 +4080,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID ist %s"
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4130,61 +4140,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr "Betreff ist %s"
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr "Nachricht %s"
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4416,36 +4371,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr ""
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4556,12 +4481,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4698,14 +4623,14 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr "Konnte Verbindung zum Hypervisor nicht öffnen"
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4734,16 +4659,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4786,23 +4711,23 @@ msgid ""
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5007,7 +4932,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5022,7 +4947,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5145,175 +5070,175 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "Volume %s: erfolgreich erstellt"
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5323,40 +5248,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5479,41 +5404,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5536,19 +5461,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6065,714 +5990,698 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
+#: nova/virt/xenapi/vm_utils.py:379
 #, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:394
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Fetching image %(image)s"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
-#, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
+#: nova/virt/xenapi/vm_utils.py:895
+msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
+#: nova/virt/xenapi/vmops.py:233
+msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
+#: nova/virt/xenapi/vmops.py:358
+msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
+#: nova/virt/xenapi/vmops.py:544
+msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:692
-#, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:686
+#, fuzzy, python-format
+msgid "Unable to Snapshot instance: %(exc)s"
+msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1147
+msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Automatically hard rebooting %d"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1374
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1379
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+msgid "Injecting network info to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
+#: nova/virt/xenapi/vmops.py:1492
 #, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1495
 #, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
 #: nova/virt/xenapi/vmops.py:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -7058,72 +6967,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr ""
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7728,6 +7637,42 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Reconnected to queue"
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr ""
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "response %s"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr "Betreff ist %s"
+
+#~ msgid "message %s"
+#~ msgstr "Nachricht %s"
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7818,6 +7763,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr ""
+
+#~ msgid "Publishing to route %s"
+#~ msgstr ""
+
+#~ msgid "Declaring queue %s"
+#~ msgstr ""
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr ""
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr ""
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr ""
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7926,6 +7889,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr ""
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr ""
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7937,9 +7906,27 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#~ msgstr ""
+
+#~ msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
 #~ msgid "Size for image %(image)s:%(virtual_size)d"
 #~ msgstr ""
 
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -7964,6 +7951,9 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr ""
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7973,6 +7963,27 @@ msgstr ""
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr ""
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -7982,9 +7993,89 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Finished snapshot and upload for VM %s"
+#~ msgstr ""
+
+#~ msgid "Starting snapshot for VM %s"
+#~ msgstr ""
+
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
diff --git a/nova/locale/en_AU/LC_MESSAGES/nova.po b/nova/locale/en_AU/LC_MESSAGES/nova.po
index df48aa374..68c193792 100644
--- a/nova/locale/en_AU/LC_MESSAGES/nova.po
+++ b/nova/locale/en_AU/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+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"
@@ -1144,158 +1144,158 @@ msgstr ""
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Inner Exception: %s"
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr "Fetching %s"
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, 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:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2386,7 +2386,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3783,37 +3783,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3821,41 +3826,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr "setting network host"
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3863,62 +3868,67 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s released that was not leased"
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
@@ -3926,7 +3936,7 @@ msgstr ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4087,51 +4097,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Returning exception %s to caller"
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr "unpacked context: %s"
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr "received %s"
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr "no method for message: %s"
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr "No method for message: %s"
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID is %s"
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4147,61 +4157,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr "Reconnected to queue"
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr "Initing the Adapter Consumer for %s"
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr "response %s"
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr "topic is %s"
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr "message %s"
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4433,36 +4388,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr "Publishing to route %s"
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr "Declaring queue %s"
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr "Declaring exchange %s"
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr "Getting from %(queue)s: %(message)s"
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4573,12 +4498,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4715,14 +4640,14 @@ 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/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4751,16 +4676,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4806,23 +4731,23 @@ msgstr ""
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr "Got exception: %s"
@@ -5029,7 +4954,7 @@ msgstr "instance %s: starting toXML method"
 msgid "instance %s: finished toXML method"
 msgstr "instance %s: finished toXML method"
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5044,7 +4969,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5167,175 +5092,175 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr "nbd device %s did not show up"
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr "Connection to libvirt broke"
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: rebooted"
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5345,40 +5270,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5501,41 +5426,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5558,19 +5483,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6089,62 +6014,56 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr "Created VM %s..."
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
-msgstr "Created VM %(instance_name)s as %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD not found in instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "group %s already exists"
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Unable to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6153,243 +6072,238 @@ msgstr ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
-#, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#: nova/virt/xenapi/vm_utils.py:379
+#, fuzzy, python-format
+msgid "Snapshotting with label '%(label)s'"
 msgstr "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:394
-#, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:392
+#, fuzzy, python-format
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
-#, python-format
-msgid "Fetching image %(image)s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, fuzzy, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr "Size for image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copying VDI %s to /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
+#: nova/virt/xenapi/vm_utils.py:895
+msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr "(VM_UTILS) xenserver vm state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr "(VM_UTILS) xenapi power_state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -6398,409 +6312,410 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:233
+#, fuzzy
+msgid "Starting instance"
+msgstr "Creating a raw instance"
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
-msgstr "instance %s: Failed to spawn"
+#: nova/virt/xenapi/vmops.py:358
+msgid "Failed to spawn, rolling back"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr "Injecting file path: '%s'"
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
-msgstr "Starting VM %s..."
-
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
-msgstr ""
+#: nova/virt/xenapi/vmops.py:544
+#, fuzzy
+msgid "Starting VM"
+msgstr "Restarting xvp"
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+#, fuzzy, python-format
+msgid "Finished snapshot and upload for VM"
 msgstr "Finished snapshot and upload for VM %s"
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+#, fuzzy, python-format
+msgid "Starting snapshot for VM"
 msgstr "Starting snapshot for VM %s"
 
-#: nova/virt/xenapi/vmops.py:692
-#, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:686
+#, fuzzy, python-format
+msgid "Unable to Snapshot instance: %(exc)s"
+msgstr "Unable to attach volume to instance %s"
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr "kernel/ramdisk files removed"
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:1147
+#, fuzzy
+msgid "Destroying VM"
+msgstr "Restarting xvp"
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
-#, python-format
-msgid "Automatically hard rebooting %d"
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1374
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1379
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+#, fuzzy
+msgid "Injecting network info to xenstore"
+msgstr "setting network host"
+
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1492
+#, 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:1491
-#, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
-msgstr "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1495
+#, 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:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL error: %s"
@@ -7088,72 +7003,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "Volume status must be available"
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr "Recovering from a failed execute.  Try number %s"
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr "volume group %s doesn't exist"
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr "Could not find iSCSI export  for volume %s"
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr "FAKE ISCSI: %s"
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr "rbd has no pool %s"
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr "Sheepdog is not working: %s"
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr "Sheepdog is not working"
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7750,6 +7665,36 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr "Initing the Adapter Consumer for %s"
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr "topic is %s"
+
+#~ msgid "message %s"
+#~ msgstr "message %s"
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7840,6 +7785,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+
+#~ msgid "Publishing to route %s"
+#~ msgstr "Publishing to route %s"
+
+#~ msgid "Declaring queue %s"
+#~ msgstr "Declaring queue %s"
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr "Declaring exchange %s"
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr "Getting from %(queue)s: %(message)s"
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7948,6 +7911,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr "Created VM %s..."
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr "Created VM %(instance_name)s as %(vm_ref)s."
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7959,6 +7928,18 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "Creating VBD for VDI %s ... "
 
@@ -7983,12 +7964,39 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr "Ignoring XenAPI.Failure %s"
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
+#~ msgid "instance %s: Failed to spawn"
+#~ msgstr "instance %s: Failed to spawn"
+
 #~ msgid "Instance %s failed to spawn - performing clean-up"
 #~ msgstr ""
 
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr "Starting VM %s..."
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -7998,9 +8006,80 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 
diff --git a/nova/locale/en_GB/LC_MESSAGES/nova.po b/nova/locale/en_GB/LC_MESSAGES/nova.po
index 78a7a31fd..036c66384 100644
--- a/nova/locale/en_GB/LC_MESSAGES/nova.po
+++ b/nova/locale/en_GB/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+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"
@@ -1147,158 +1147,158 @@ msgstr "Full set of FLAGS:"
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Inner Exception: %s"
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr "Fetching %s"
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, 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:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2387,7 +2387,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3774,37 +3774,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3812,41 +3817,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3854,68 +3859,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4076,51 +4086,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4136,61 +4146,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr ""
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4422,36 +4377,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr "Publishing to route %s"
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr "Declaring queue %s"
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr "Declaring exchange %s"
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr "Getting from %(queue)s: %(message)s"
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4562,12 +4487,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4704,14 +4629,14 @@ 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/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4740,16 +4665,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4792,23 +4717,23 @@ msgid ""
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5013,7 +4938,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5028,7 +4953,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5151,176 +5076,176 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: created successfully"
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "User does not have admin privileges"
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5330,40 +5255,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5486,41 +5411,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5543,19 +5468,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6074,62 +5999,56 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr "Created VM %s..."
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
-msgstr "Created VM %(instance_name)s as %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD not found in instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Unable to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6138,243 +6057,238 @@ msgstr ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
-#, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#: nova/virt/xenapi/vm_utils.py:379
+#, fuzzy, python-format
+msgid "Snapshotting with label '%(label)s'"
 msgstr "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:394
-#, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:392
+#, fuzzy, python-format
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Fetching image %(image)s"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
-#, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, fuzzy, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr "Size for image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copying VDI %s to /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
+#: nova/virt/xenapi/vm_utils.py:895
+msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr "(VM_UTILS) xenserver vm state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr "(VM_UTILS) xenapi power_state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -6383,409 +6297,405 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:233
+#, fuzzy, python-format
+msgid "Starting instance"
+msgstr "Rebooting instance %s"
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
-msgstr "Instance %(instance_id)s is not running."
+#: nova/virt/xenapi/vmops.py:358
+msgid "Failed to spawn, rolling back"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#: nova/virt/xenapi/vmops.py:544
+msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:692
-#, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:686
+#, fuzzy, python-format
+msgid "Unable to Snapshot instance: %(exc)s"
+msgstr "Unable to attach volume to instance %s"
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1147
+msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Automatically hard rebooting %d"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1374
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1379
+#, fuzzy, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr "Instance %(instance_id)s is not running."
+
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
-#, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+msgid "Injecting network info to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1492
+#, 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:1491
-#, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
-msgstr "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1495
+#, 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:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -7073,72 +6983,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "Volume status must be available"
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr ""
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7743,6 +7653,42 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Reconnected to queue"
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr ""
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "response %s"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr ""
+
+#~ msgid "message %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7833,6 +7779,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+
+#~ msgid "Publishing to route %s"
+#~ msgstr "Publishing to route %s"
+
+#~ msgid "Declaring queue %s"
+#~ msgstr "Declaring queue %s"
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr "Declaring exchange %s"
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr "Getting from %(queue)s: %(message)s"
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7941,6 +7905,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr "Created VM %s..."
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr "Created VM %(instance_name)s as %(vm_ref)s."
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7952,6 +7922,18 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "Creating VBD for VDI %s ... "
 
@@ -7976,6 +7958,9 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr "Ignoring XenAPI.Failure %s"
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr "instance %s: Failed to spawn"
 
@@ -7985,6 +7970,27 @@ msgstr ""
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr ""
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -7994,9 +8000,86 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Finished snapshot and upload for VM %s"
+#~ msgstr ""
+
+#~ msgid "Starting snapshot for VM %s"
+#~ msgstr ""
+
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index e4a9d768c..df827f1f1 100644
--- a/nova/locale/es/LC_MESSAGES/nova.po
+++ b/nova/locale/es/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+0000\n"
 "PO-Revision-Date: 2012-03-10 06:08+0000\n"
 "Last-Translator: Oscar Rosario <oscar.inirio@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -1150,158 +1150,158 @@ msgstr "Conjunto completo de opciones (FLAGS):"
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Excepción interna: %s"
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr "Obteniendo %s"
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Ejecutando cmd (subprocesos): %s"
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr "El resultado fue %s"
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "corriendo cmd (SSH): %s"
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr "Depuración de la devolución de llamada: %s"
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "No se encuentra la dirección del enlace local.:%s"
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, 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:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "backend inválido: %s"
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2391,7 +2391,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3790,37 +3790,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3828,41 +3833,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr "configurando la red del host"
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3870,68 +3875,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4092,51 +4102,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr "contenido desempaquetado: %s"
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr "recibido %s"
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr "no hay método para el mensaje: %s"
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr "No hay método para el mensaje: %s"
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID es %s"
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4152,61 +4162,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr "Reconectado a la cola"
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr "respuesta %s"
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr "mensaje %s"
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4438,36 +4393,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr "(%(nm)s) publica (key: %(routing_key)s) %(message)s"
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr "Publicando la ruta %s"
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr "Declarando cola %s"
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr "Declarando intercambio %s"
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr "Enlazando %(queue)s a %(exchange)s con la llave %(routing_key)s"
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr "Obtendiendo desde %(queue)s: %(message)s"
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4578,12 +4503,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4720,14 +4645,14 @@ 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/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4756,16 +4681,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4810,23 +4735,23 @@ msgstr ""
 "Debes especificar xenapi_connection_url, xenapi_connection_username "
 "(opcional), y xenapi_connection_password para usar connection_type=xenapi"
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr "Obtenida excepción %s"
@@ -5031,7 +4956,7 @@ msgstr "instancia %s: comenzando método toXML"
 msgid "instance %s: finished toXML method"
 msgstr "instancia %s: finalizado método toXML"
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5046,7 +4971,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5169,177 +5094,177 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Conectando a libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr "Conexión a libvirt rota"
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "instancia %s: reiniciada"
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "El usuario no tiene privilegios de administrador"
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5349,40 +5274,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5505,41 +5430,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5562,19 +5487,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6093,62 +6018,56 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr "Creada VM %s..."
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
-msgstr "VM creada %(instance_name)s como %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD no encontrado en la instancia %s"
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "el grupo %s ya existe"
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Imposible desconectar VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Creado el VBD %(vbd_ref)s para VM %(vm_ref)s, VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Creado el VBD %(vbd_ref)s para VM %(vm_ref)s, VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6157,652 +6076,648 @@ msgstr ""
 "VDI creado %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) "
 "sobre %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
-#, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#: nova/virt/xenapi/vm_utils.py:379
+#, fuzzy, python-format
+msgid "Snapshotting with label '%(label)s'"
 msgstr "Creando snapshot de la VM %(vm_ref)s con etiqueta '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:394
-#, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:392
+#, fuzzy, python-format
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr "Instantánea creada %(template_vm_ref)s de la VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Pidiendo xapi a subir %(vdi_uuids)s como ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Fetching image %(image)s"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
-#, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, fuzzy, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr "Tamaño para imagen %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copiando VDI %s a /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destruído"
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
-msgstr ""
+#: nova/virt/xenapi/vm_utils.py:895
+#, fuzzy
+msgid "Failed to fetch glance image"
+msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Buscando vid %s para el kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s está todavía disponible"
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr "(VM_UTILS) xenserver vm state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr "(VM_UTILS) xenapi power_state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-escaneando SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s tiene origen en %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Ejecutando pygrub contra %s"
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen Encontrado %s"
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Kernel Xen no encontrado. Reiniciando HVM"
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:233
+#, fuzzy
+msgid "Starting instance"
+msgstr "Creando una instancia raw"
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
-msgstr "La instacia %(instance_id)s no se esta ejecutando"
+#: nova/virt/xenapi/vmops.py:358
+#, fuzzy
+msgid "Failed to spawn, rolling back"
+msgstr "Fallo al suspender la instancia"
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
-msgstr "Iniciando VM %s..."
-
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#: nova/virt/xenapi/vmops.py:544
+msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+#, fuzzy, python-format
+msgid "Finished snapshot and upload for VM"
 msgstr "Finalizado el snapshot y la subida de la VM %s"
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+#, fuzzy, python-format
+msgid "Starting snapshot for VM"
 msgstr "Comenzando snapshot para la VM %s"
 
-#: nova/virt/xenapi/vmops.py:692
-#, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:686
+#, fuzzy, python-format
+msgid "Unable to Snapshot instance: %(exc)s"
+msgstr "Imposible adjuntar volumen a la instancia %s"
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1147
+msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Automatically hard rebooting %d"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1374
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1379
+#, fuzzy, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr "La instacia %(instance_id)s no esta suspendida"
+
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
-#, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+#, fuzzy
+msgid "Injecting network info to xenstore"
+msgstr "configurando la red del host"
+
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1492
+#, 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:1491
-#, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
-msgstr "Creado el VIF %(vif_ref)s para VM %(vm_ref)s, red %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1495
+#, 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:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -7096,72 +7011,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "El estado del volumen debe estar disponible"
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr "Recuperandose de una ejecución fallida. Intenta el número %s"
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr "el grupo de volumenes %s no existe"
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr "Falso ISCSI: %s"
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7761,6 +7676,36 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr ""
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr ""
+
+#~ msgid "message %s"
+#~ msgstr "mensaje %s"
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7851,6 +7796,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr "(%(nm)s) publica (key: %(routing_key)s) %(message)s"
+
+#~ msgid "Publishing to route %s"
+#~ msgstr "Publicando la ruta %s"
+
+#~ msgid "Declaring queue %s"
+#~ msgstr "Declarando cola %s"
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr "Declarando intercambio %s"
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr "Enlazando %(queue)s a %(exchange)s con la llave %(routing_key)s"
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr "Obtendiendo desde %(queue)s: %(message)s"
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7959,6 +7922,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr "Creada VM %s..."
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr "VM creada %(instance_name)s como %(vm_ref)s."
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7970,6 +7939,18 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "Creando VBD para VDI %s ... "
 
@@ -7994,6 +7975,9 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr ""
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr "Instancia %s: no se pudo iniciar"
 
@@ -8003,6 +7987,27 @@ msgstr ""
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr "Iniciando VM %s..."
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -8012,9 +8017,80 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr "Creado el VIF %(vif_ref)s para VM %(vm_ref)s, red %(network_ref)s."
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr "Creando VBD para VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index 6d9272187..be6c86a29 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-04-01 23:03+0000\n"
-"PO-Revision-Date: 2012-03-16 09:03+0000\n"
-"Last-Translator: Gabriel U. <Unknown>\n"
+"POT-Creation-Date: 2012-04-08 23:04+0000\n"
+"PO-Revision-Date: 2012-04-06 14:54+0000\n"
+"Last-Translator: EmmanuelLeNormand <manu@ubuntu-fr.org>\n"
 "Language-Team: French <fr@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr "Nom de fichier de la clé privée"
 
 #: nova/crypto.py:54
 msgid "Filename of root Certificate Revocation List"
-msgstr ""
+msgstr "Nom du fichier de la liste de révocation du Certificat Racine"
 
 #: nova/crypto.py:57
 msgid "Where we keep our keys"
@@ -93,44 +93,46 @@ msgstr ""
 
 #: nova/exception.py:155
 msgid "An unknown exception occurred."
-msgstr ""
+msgstr "Une exception inconnue s'est produite."
 
 #: nova/exception.py:178
 msgid "Failed to decrypt text"
-msgstr ""
+msgstr "Échec du décryptage du text"
 
 #: nova/exception.py:182
 msgid "Failed to paginate through images from image service"
-msgstr ""
+msgstr "Échec de la pagination à travers les images depuis le service d'image"
 
 #: nova/exception.py:186
 msgid "Virtual Interface creation failed"
-msgstr ""
+msgstr "La création de l'Interface Virtuelle a échoué"
 
 #: nova/exception.py:190
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
+"Les 5 tentatives de création de l'interface virtuelle avec une adresse "
+"MAC unique ont échoué"
 
 #: nova/exception.py:195
 msgid "Connection to glance failed"
-msgstr ""
+msgstr "La connexion à Glance a échoué"
 
 #: nova/exception.py:199
 msgid "Connection to melange failed"
-msgstr ""
+msgstr "La connexion à Melange a échoué"
 
 #: nova/exception.py:203
 msgid "Not authorized."
-msgstr ""
+msgstr "Non autorisé."
 
 #: nova/exception.py:208
 msgid "User does not have admin privileges"
-msgstr ""
+msgstr "L’utilisateur n'a pas les privilèges administrateur"
 
 #: nova/exception.py:212
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
-msgstr ""
+msgstr "Le réglage des droits n'autorise pas %(action)s à être effectué(e)(s)"
 
 #: nova/exception.py:216
 #, fuzzy, python-format
@@ -139,24 +141,24 @@ msgstr "Pas de méthode pour le message : %s"
 
 #: nova/exception.py:220
 msgid "Unacceptable parameters."
-msgstr ""
+msgstr "Paramètres inacceptables."
 
 #: nova/exception.py:225
 msgid "Invalid snapshot"
-msgstr ""
+msgstr "Snapshot invalide"
 
 #: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
-msgstr ""
+msgstr "Le volume %(volume_id)s n'est lié à rien"
 
 #: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
-msgstr ""
+msgstr "La paire de clés de donnée n'est pas valide"
 
 #: nova/exception.py:237
 msgid "Failed to load data into json format"
-msgstr ""
+msgstr "Échec du chargement des données au format JSON"
 
 #: nova/exception.py:241
 msgid "The request is invalid."
@@ -165,48 +167,48 @@ msgstr "La requête est invalide."
 #: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
-msgstr ""
+msgstr "La signature %(signature)s est invalide pour l'utilisateur %(user)s."
 
 #: nova/exception.py:249
 msgid "Invalid input received"
-msgstr ""
+msgstr "Entrée invalide reçue"
 
 #: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
-msgstr ""
+msgstr "L'instance de type %(instance_type)s est invalide."
 
 #: nova/exception.py:257
 msgid "Invalid volume type"
-msgstr ""
+msgstr "Type de volume invalide"
 
 #: nova/exception.py:261
 msgid "Invalid volume"
-msgstr ""
+msgstr "Volume invalide"
 
 #: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
-msgstr ""
+msgstr "La plage de port %(from_port)s:%(to_port)s. %(msg)s est invalide"
 
 #: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
-msgstr ""
+msgstr "Le protocole IP %(protocol)s est invalide"
 
 #: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
-msgstr ""
+msgstr "Le type de contenu %(content_type)s est invalide"
 
 #: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
-msgstr ""
+msgstr "Le cidr %(cidr)s est invalide"
 
 #: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
-msgstr ""
+msgstr "Réutilisation invalide d'une connexion RPC"
 
 #: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
@@ -215,7 +217,7 @@ msgstr ""
 #: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
-msgstr ""
+msgstr "%(err)s"
 
 #: nova/exception.py:296
 #, python-format
@@ -223,6 +225,8 @@ msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
+"Impossible d'effectuer l'action '%(action)s' sur l'ensemble "
+"%(aggregate_id)s. Raison: %(reason)s."
 
 #: nova/exception.py:301
 #, python-format
@@ -235,71 +239,77 @@ msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 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:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
-msgstr ""
+msgstr "L'instance %(instance_id)s  ne fonctionne pas."
 
 #: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
-msgstr ""
+msgstr "L'instance %(instance_id)s  n'est pas suspendue"
 
 #: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
-msgstr ""
+msgstr "L'instance %(instance_id)s  n'est pas en mode secours"
 
 #: nova/exception.py:322
 msgid "Failed to suspend instance"
-msgstr ""
+msgstr "Échec de la suspension de l'instance"
 
 #: nova/exception.py:326
 msgid "Failed to resume server"
-msgstr ""
+msgstr "Échec de la reprise du serveur"
 
 #: nova/exception.py:330
 msgid "Failed to reboot instance"
-msgstr ""
+msgstr "Échec du redémarrage de l'instance"
 
 #: nova/exception.py:334
 #, fuzzy
 msgid "Failed to terminate instance"
-msgstr "Début de la destruction d'instance"
+msgstr "Échec du redémarrage de l'instance"
 
 #: nova/exception.py:338
 msgid "Service is unavailable at this time."
-msgstr ""
+msgstr "Le service est indisponible actuellement."
 
 #: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
-msgstr ""
+msgstr "Le service de volume est indisponible actuellement."
 
 #: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
-msgstr ""
+msgstr "Le service de calcul est indisponible actuellement."
 
 #: nova/exception.py:350
 #, 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:355
 msgid "Destination compute host is unavailable at this time."
-msgstr ""
+msgstr "L'hôte destinataire de calcul est indisponible actuellement."
 
 #: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
-msgstr ""
+msgstr "L'hôte original de calcul est indisponible actuellement."
 
 #: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
-msgstr ""
+msgstr "Le type de l'hyperviseur fourni n'est pas valide."
 
 #: nova/exception.py:367
 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:372
 #, python-format
@@ -1146,158 +1156,158 @@ msgstr "Ensemble de propriétés complet :"
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Exception interne : %s"
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr "Récupèration de %s"
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Execution de la commande (sous-processus) : %s"
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr "Le résultat était %s"
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Execution de la cmd (SSH): %s"
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr "Debug dans le rappel : %s"
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, 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:536
+#: nova/utils.py:537
 #, 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:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend invalide : %s"
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1523,8 +1533,9 @@ msgid "Delete key pair %s"
 msgstr "Suppression du bi-clef %s"
 
 #: nova/api/ec2/cloud.py:551
+#, fuzzy, python-format
 msgid "Invalid CIDR"
-msgstr ""
+msgstr "Le cidr %(cidr)s est invalide"
 
 #: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
 #: nova/api/ec2/cloud.py:800
@@ -2397,7 +2408,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -2811,7 +2822,7 @@ msgstr "Pas de données VPN pour le projet %s"
 #: nova/cloudpipe/pipelib.py:46
 #, fuzzy, python-format
 msgid "Instance type for vpn instances"
-msgstr "Récupération de la sortie de la console de l'instance %s"
+msgstr "L'instance de type %(instance_type)s est invalide."
 
 #: nova/cloudpipe/pipelib.py:49
 msgid "Template for cloudpipe instance boot script"
@@ -3313,9 +3324,9 @@ msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
 #: nova/compute/manager.py:1714
-#, python-format
+#, fuzzy, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
-msgstr ""
+msgstr "L'instance %(instance_id)s  n'est pas en mode secours"
 
 #: nova/compute/manager.py:1724
 #, python-format
@@ -3802,37 +3813,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3840,41 +3856,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3882,68 +3898,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, 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:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 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:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4104,51 +4125,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Renvoi de l'exception %s à l'appelant"
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr "Contexte décompacté : %s"
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr "%s reçu"
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr "Pas de méthode pour le message : %s"
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr "Pas de méthode pour le message : %s"
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID est %s"
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4164,61 +4185,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr "Reconnection à la queue"
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr "Initialisation du Consomateur d'Adapteur pour %s"
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr "réponse %s"
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr "le sujet est %s"
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr "message %s"
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4424,9 +4390,9 @@ msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/manager.py:159
-#, python-format
+#, fuzzy, python-format
 msgid "Setting instance %(instance_uuid)s to %(state)s state."
-msgstr ""
+msgstr "L'instance %(instance_id)s  n'est pas suspendue"
 
 #: nova/scheduler/scheduler_options.py:66
 #, python-format
@@ -4450,36 +4416,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr "(%(nm)s) publication (key: %(routing_key)s) %(message)s"
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr "Publication vers la route %s"
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr "Déclaration de la queue %s"
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr "Déclaration de l'échange %s"
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr "Rattachement de %(queue)s vers %(exchange)s avec la clef %(routing_key)s"
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr "Récupération depuis %(queue)s: %(message)s"
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4590,12 +4526,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4732,14 +4668,14 @@ 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/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4768,16 +4704,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4823,23 +4759,23 @@ msgstr ""
 "(optionel), et xenapi_connection_password pour utiliser "
 "connection_type=xenapi"
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr "Reçu exception : %s"
@@ -5046,7 +4982,7 @@ msgstr "instance %s: démarrage de la méthode toXML"
 msgid "instance %s: finished toXML method"
 msgstr "instance %s: fin d'éxécution de la méthode toXML"
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5061,7 +4997,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5184,175 +5120,177 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr "Device nbd %s n'est pas apparu"
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connexion à libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr "Connexion à libvirt interrompue"
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: re-démarrée"
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
+#, fuzzy
 msgid "Failed to soft reboot instance."
-msgstr ""
+msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
+#, fuzzy
 msgid "Guest does not have a console available"
-msgstr ""
+msgstr "L’utilisateur n'a pas les privilèges administrateur"
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5362,40 +5300,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5518,41 +5456,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5575,19 +5513,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6106,62 +6044,56 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr "VM %s crée..."
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
-msgstr "VM %(instance_name)s crée en tant que %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD non trouvé dans l'instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "le groupe %s existe déjà"
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Impossible de deconnecter le VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Impossible de supprimer le VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "VBD créé %(vbd_ref)s pour VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VBD créé %(vbd_ref)s pour VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6170,245 +6102,241 @@ msgstr ""
 "VDI créé %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) on"
 " %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
-#, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#: nova/virt/xenapi/vm_utils.py:379
+#, fuzzy, python-format
+msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 "Création de l'instantané (snapshot) pour la VM %(vm_ref)s avec le label "
 "'%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:394
-#, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:392
+#, fuzzy, python-format
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr "Instantané (snapshot) créé %(template_vm_ref)s pour la  VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Demande de chargement à xapi de %(vdi_uuids)s en tant qu'ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Fetching image %(image)s"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
-#, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, fuzzy, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr "Taille de l'image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copie de VDI %s vers /boot/guest sur dom0"
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Noyau/Ramdisk VDI %s détruit"
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
-msgstr ""
+#: nova/virt/xenapi/vm_utils.py:895
+#, fuzzy
+msgid "Failed to fetch glance image"
+msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Recherche du VDI %s pour le PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr "Le VDI %s est toujours disponible"
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr "(VM_UTILS) état xenserver vm -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr "(VM_UTILS) xenapi power_state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-parcours de SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s à pour parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -6417,409 +6345,411 @@ msgstr ""
 "L'UUID parent %(parent_uuid)s ne correspond pas au parent originel "
 "%(original_parent_uuid)s, attente de coalesence..."
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Connexion de VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Connexion de VBD %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destruction de VBD pour la VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destruction de VBD pour la VDI %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Exécution de pygrub sur %s"
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen %s trouvé"
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Pas de kernel Xen trouvé.  Démarrage en HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Ecriture de la table de partitionnement %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:233
+#, fuzzy
+msgid "Starting instance"
+msgstr "Création d'une instance raw"
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
-msgstr "instance %s: n'a pas pu être crée"
+#: nova/virt/xenapi/vmops.py:358
+#, fuzzy
+msgid "Failed to spawn, rolling back"
+msgstr "Échec de la suspension de l'instance"
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
-msgstr "Démarrage de la VM %s..."
-
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
-msgstr ""
+#: nova/virt/xenapi/vmops.py:544
+#, fuzzy
+msgid "Starting VM"
+msgstr "Re-démarrage xvp"
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+#, fuzzy, python-format
+msgid "Finished snapshot and upload for VM"
 msgstr "Fin de l'instantané et du chargement de VM %s"
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+#, fuzzy, python-format
+msgid "Starting snapshot for VM"
 msgstr "Début de création d'instantané (snapshot) pour la VM %s"
 
-#: nova/virt/xenapi/vmops.py:692
-#, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:686
+#, fuzzy, python-format
+msgid "Unable to Snapshot instance: %(exc)s"
+msgstr "Impossible d'attacher le volume à l'instance %s"
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr "Fichiers noyau/ramdisk supprimés"
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:1147
+#, fuzzy
+msgid "Destroying VM"
+msgstr "Re-démarrage xvp"
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Automatically hard rebooting %d"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1374
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1379
+#, fuzzy, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr "L'instance %(instance_id)s  n'est pas suspendue"
+
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
-#, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+#, fuzzy
+msgid "Injecting network info to xenstore"
+msgstr "réglage de l'hôte réseau"
+
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1492
+#, 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:1491
-#, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
-msgstr "VIF créé %(vif_ref)s pour la VM %(vm_ref)s, network %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1495
+#, 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:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erreur OpenSSL : %s"
@@ -7113,72 +7043,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "Le status du volume doit être disponible"
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr "Récupération après une exécution erronée. Tentative numéro %s"
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr "Le groupe de volume %s n'existe pas"
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr "Imposible de trouver une exportation iSCSI pour le volume %s"
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr "FAUX ISCSI: %s"
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr "rbd n'as pas de file %s"
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr "Sheepdog n'est pas actif : %s"
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr "Sheepdog n'est pas actif"
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7775,6 +7705,36 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr "Initialisation du Consomateur d'Adapteur pour %s"
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr "le sujet est %s"
+
+#~ msgid "message %s"
+#~ msgstr "message %s"
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7865,6 +7825,26 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr "(%(nm)s) publication (key: %(routing_key)s) %(message)s"
+
+#~ msgid "Publishing to route %s"
+#~ msgstr "Publication vers la route %s"
+
+#~ msgid "Declaring queue %s"
+#~ msgstr "Déclaration de la queue %s"
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr "Déclaration de l'échange %s"
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr ""
+#~ "Rattachement de %(queue)s vers %(exchange)s"
+#~ " avec la clef %(routing_key)s"
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr "Récupération depuis %(queue)s: %(message)s"
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7973,6 +7953,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr "VM %s crée..."
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr "VM %(instance_name)s crée en tant que %(vm_ref)s."
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7984,6 +7970,18 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "Création de VBD pour la VDI %s ... "
 
@@ -8008,12 +8006,39 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr "XenAPI.Failure %s ignorée"
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
+#~ msgid "instance %s: Failed to spawn"
+#~ msgstr "instance %s: n'a pas pu être crée"
+
 #~ msgid "Instance %s failed to spawn - performing clean-up"
 #~ msgstr ""
 
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr "Démarrage de la VM %s..."
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -8023,9 +8048,80 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr "VIF créé %(vif_ref)s pour la VM %(vm_ref)s, network %(network_ref)s."
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr "Création de VBD pour VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index 968723ed2..3474f0a4b 100644
--- a/nova/locale/it/LC_MESSAGES/nova.po
+++ b/nova/locale/it/LC_MESSAGES/nova.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
-"PO-Revision-Date: 2011-10-27 15:00+0000\n"
-"Last-Translator: DM74S <Unknown>\n"
+"POT-Creation-Date: 2012-04-08 23:04+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"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr ""
 
 #: nova/exception.py:155
 msgid "An unknown exception occurred."
-msgstr ""
+msgstr "E' stato riscontrato un errore sconosciuto"
 
 #: nova/exception.py:178
 msgid "Failed to decrypt text"
@@ -123,7 +123,7 @@ msgstr ""
 
 #: nova/exception.py:208
 msgid "User does not have admin privileges"
-msgstr ""
+msgstr "L'utente non ha i privilegi dell'amministratore"
 
 #: nova/exception.py:212
 #, python-format
@@ -137,7 +137,7 @@ msgstr "nessun metodo per il messaggio: %s"
 
 #: nova/exception.py:220
 msgid "Unacceptable parameters."
-msgstr ""
+msgstr "Parametri inaccettabili."
 
 #: nova/exception.py:225
 msgid "Invalid snapshot"
@@ -158,7 +158,7 @@ msgstr ""
 
 #: nova/exception.py:241
 msgid "The request is invalid."
-msgstr ""
+msgstr "La richiesta non è valida."
 
 #: nova/exception.py:245
 #, python-format
@@ -167,7 +167,7 @@ msgstr ""
 
 #: nova/exception.py:249
 msgid "Invalid input received"
-msgstr ""
+msgstr "E' stato ricevuto un input non valido"
 
 #: nova/exception.py:253
 #, python-format
@@ -176,11 +176,11 @@ msgstr ""
 
 #: nova/exception.py:257
 msgid "Invalid volume type"
-msgstr ""
+msgstr "Tipo del volume non valido"
 
 #: nova/exception.py:261
 msgid "Invalid volume"
-msgstr ""
+msgstr "Volume non valido"
 
 #: nova/exception.py:265
 #, python-format
@@ -251,19 +251,20 @@ msgstr ""
 
 #: nova/exception.py:322
 msgid "Failed to suspend instance"
-msgstr ""
+msgstr "Impossibile sospendere l'istanza"
 
 #: nova/exception.py:326
 msgid "Failed to resume server"
-msgstr ""
+msgstr "Impossibile ripristinare il server"
 
 #: nova/exception.py:330
 msgid "Failed to reboot instance"
-msgstr ""
+msgstr "Impossibile riavviare l'istanza"
 
 #: nova/exception.py:334
+#, fuzzy
 msgid "Failed to terminate instance"
-msgstr ""
+msgstr "Impossibile riavviare l'istanza"
 
 #: nova/exception.py:338
 msgid "Service is unavailable at this time."
@@ -1143,158 +1144,158 @@ msgstr "Insieme di FLAGS:"
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Eccezione interna: %s"
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr "Prelievo %s"
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Esecuzione del comando (sottoprocesso): %s"
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr "Il risultato é %s"
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Eseguendo cmd (SSH): %s"
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2382,7 +2383,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -2882,12 +2883,14 @@ msgid "Going to try to terminate instance"
 msgstr ""
 
 #: nova/compute/api.py:977
+#, fuzzy
 msgid "Going to try to stop instance"
-msgstr ""
+msgstr "Impossibile riavviare l'istanza"
 
 #: nova/compute/api.py:996
+#, fuzzy
 msgid "Going to try to start instance"
-msgstr ""
+msgstr "Impossibile riavviare l'istanza"
 
 #: nova/compute/api.py:1000
 #, python-format
@@ -3768,37 +3771,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3806,41 +3814,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3848,68 +3856,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4070,51 +4083,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Sollevando eccezione %s al chiamante"
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr "contesto decompresso: %s"
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr "ricevuto %s"
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr "nessun metodo per il messagggio: %s"
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID é %s"
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4130,61 +4143,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr "Riconnesso alla coda"
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr "Inizializzando il Consumer Adapter per %s"
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr "risposta %s"
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr "argomento é %s"
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr "messaggio %s"
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4416,36 +4374,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr "Pubblicando sulla route %s"
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr "Dichiarando la coda %s"
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr "Dichiarando il centralino %s"
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr ""
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4556,12 +4484,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4698,14 +4626,14 @@ 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/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4734,16 +4662,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4786,23 +4714,23 @@ msgid ""
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5007,7 +4935,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5022,7 +4950,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5145,175 +5073,177 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: creato con successo"
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
+#, fuzzy
 msgid "Failed to soft reboot instance."
-msgstr ""
+msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
+#, fuzzy
 msgid "Guest does not have a console available"
-msgstr ""
+msgstr "L'utente non ha i privilegi dell'amministratore"
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5323,40 +5253,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5479,41 +5409,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5536,19 +5466,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6065,714 +5995,701 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr "Creata VM %s.."
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
-msgstr "Creata VM %(instance_name)s come %(vm_ref)s"
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
+#: nova/virt/xenapi/vm_utils.py:379
 #, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:394
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
-#, python-format
-msgid "Fetching image %(image)s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s distrutti"
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
-msgstr ""
+#: nova/virt/xenapi/vm_utils.py:895
+#, fuzzy
+msgid "Failed to fetch glance image"
+msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Cercando vdi %s per kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:233
+#, fuzzy, python-format
+msgid "Starting instance"
+msgstr "Riavviando l'istanza %s"
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
-msgstr "Istanza %s: esecuzione fallita..."
+#: nova/virt/xenapi/vmops.py:358
+#, fuzzy
+msgid "Failed to spawn, rolling back"
+msgstr "Impossibile sospendere l'istanza"
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#: nova/virt/xenapi/vmops.py:544
+msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:692
-#, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:686
+#, fuzzy, python-format
+msgid "Unable to Snapshot instance: %(exc)s"
+msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1147
+msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1363
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1374
 #, python-format
-msgid "Automatically hard rebooting %d"
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1379
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+msgid "Injecting network info to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1492
 #, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1495
 #, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
 #: nova/virt/xenapi/vmops.py:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -7060,72 +6977,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "Lo stato del volume deve essere disponibile"
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr ""
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7731,6 +7648,36 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr "Inizializzando il Consumer Adapter per %s"
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr "argomento é %s"
+
+#~ msgid "message %s"
+#~ msgstr "messaggio %s"
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7821,6 +7768,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr ""
+
+#~ msgid "Publishing to route %s"
+#~ msgstr "Pubblicando sulla route %s"
+
+#~ msgid "Declaring queue %s"
+#~ msgstr "Dichiarando la coda %s"
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr "Dichiarando il centralino %s"
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr ""
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr ""
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7929,6 +7894,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr "Creata VM %s.."
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr "Creata VM %(instance_name)s come %(vm_ref)s"
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7940,9 +7911,27 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#~ msgstr ""
+
+#~ msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
 #~ msgid "Size for image %(image)s:%(virtual_size)d"
 #~ msgstr ""
 
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -7967,12 +7956,39 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr ""
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
+#~ msgid "instance %s: Failed to spawn"
+#~ msgstr "Istanza %s: esecuzione fallita..."
+
 #~ msgid "Instance %s failed to spawn - performing clean-up"
 #~ msgstr ""
 
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr ""
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -7982,9 +7998,89 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Finished snapshot and upload for VM %s"
+#~ msgstr ""
+
+#~ msgid "Starting snapshot for VM %s"
+#~ msgstr ""
+
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index df0901bbd..59e90a1b9 100644
--- a/nova/locale/ja/LC_MESSAGES/nova.po
+++ b/nova/locale/ja/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+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"
@@ -1144,158 +1144,158 @@ msgstr "FLAGSの一覧:"
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "内側で発生した例外： %s"
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr "ファイルをフェッチ： %s"
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "コマンド実行(subprocess): %s"
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr "コマンド実行結果： %s"
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "コマンド（SSH)を実行: %s"
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr "コールバック中のデバッグ: %s"
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "リンクローカルアドレスが見つかりません: %s"
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "%(interface)s のローカルIPアドレスのリンクが取得できません:%(ex)s"
 
-#: nova/utils.py:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "不正なバックエンドです: %s"
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr "バックエンドは %s です。"
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2384,7 +2384,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3777,37 +3777,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3815,41 +3820,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3857,68 +3862,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "リースしていないIP %s が開放されました。"
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "ネットワークの数とVLANの開始番号の和は 4094 より大きくできません。"
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4079,51 +4089,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "呼び出し元に 例外 %s を返却します。"
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr "context  %s をアンパックしました。"
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr "受信： %s"
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr "メッセージ %s に対するメソッドが存在しません。"
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr "メッセージ %s に対するメソッドが存在しません。"
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_IDは %s です。"
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4139,61 +4149,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr "キューに再接続しました。"
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr "%sのアダプターコンシューマー(Adapter Consumer)を初期化しています。"
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr "応答 %s"
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr "topic は %s です。"
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr "メッセージ %s"
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4425,36 +4380,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr "(%(nm)s) 公開 (キー: %(routing_key)s) %(message)s"
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr "ルート %s へパブリッシュ"
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr "queue %s の宣言"
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr "exchange %s の宣言"
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr "キー %(routing_key)s 付きで %(exchange)s に %(queue)s をバインドしています"
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr "%(queue)s から取得しています: %(message)s"
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4565,12 +4490,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4707,14 +4632,14 @@ msgstr "%s を受信。"
 msgid "Failed to open connection to the hypervisor"
 msgstr "ハイパーバイザへの接続に失敗しました。"
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4743,16 +4668,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4797,23 +4722,23 @@ msgstr ""
 "connection_type=xenapi を使用するには、以下の指定が必要です： xenapi_connection_url, "
 "xenapi_connection_username (オプション), xenapi_connection_password"
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr "例外 %s が発生しました。"
@@ -5018,7 +4943,7 @@ msgstr "インスタンス %s: toXML メソッドを開始。"
 msgid "instance %s: finished toXML method"
 msgstr "インスタンス %s: toXML メソッドを完了。"
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5033,7 +4958,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5156,175 +5081,175 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr "nbd デバイス %s が出現しません"
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "libvirt %s へ接続します。"
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr "libvirtへの接続が切れています。"
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "インスタンス%s: 再起動しました。"
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "データ: %(data)r, ファイルパス: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5334,40 +5259,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5490,41 +5415,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5547,19 +5472,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6076,62 +6001,56 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr "VM %s を作成します。"
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
-msgstr "%(vm_ref)s として VM %(instance_name)s を作成しています"
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "インスタンス %s のVBDが見つかりません。"
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "VBD %s の unplug に失敗しました。"
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "VBD %s の削除に失敗しました。"
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用仮想ブロックデバイス(VBD) %(vbd_ref)s を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用仮想ブロックデバイス(VBD) %(vbd_ref)s を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6140,654 +6059,650 @@ msgstr ""
 "%(sr_ref)s 上に VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, "
 "%(read_only)s) を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
-#, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#: nova/virt/xenapi/vm_utils.py:379
+#, fuzzy, python-format
+msgid "Snapshotting with label '%(label)s'"
 msgstr "ラベル '%(label)s' 付き VM %(vm_ref)s のスナップショットを作成しています…"
 
-#: nova/virt/xenapi/vm_utils.py:394
-#, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:392
+#, fuzzy, python-format
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr "VM %(vm_ref)s からスナップショット %(template_vm_ref)s を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "ID %(image_id)s として %(vdi_uuids)s のアップロードの為に xapi を問い合わせしています"
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
-#, python-format
-msgid "Fetching image %(image)s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, fuzzy, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr "イメージ %(image)s のサイズ:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "ドメイン0 上の /boot/guest に VDI %s をコピー中"
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "カーネル/RAMディスク VDI %s が削除されました"
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
+#: nova/virt/xenapi/vm_utils.py:895
+msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "PV kernelのvdi %s を取得します。"
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s は依然として存在しています。"
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr "(VM_UTILS) xenserver の vm state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr "(VM_UTILS) xenapi の power_state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "SR %s を再スキャンします。"
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s の親は %(parent_ref)s です"
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr "親 %(parent_uuid)s が元々の親 %(original_parent_uuid)s と一致しません。作成を待機しています…"
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "VBD %s を接続しています… "
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "仮想ブロックデバイス(VBD) %s の接続が完了しました。"
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "VDI %s 用の仮想ブロックデバイス(VBD)を削除しています… "
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "VDI %s 用の仮想ブロックデバイス(VBD)の削除が完了しました。"
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "%s に対して pygrub を実行しています"
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Xen Kernel %s が見つかりました。"
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 "No Xen kernel found.  Booting HVM.\r\n"
 "Xen 用カーネルが見つかりません。完全仮想化モード(HVM)で起動しています。"
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "パーティションテーブル %s の書き込みが完了しました。"
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:233
+#, fuzzy
+msgid "Starting instance"
+msgstr "raw instanceを生成します。"
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
-msgstr "インスタンス %s: 起動に失敗しました"
+#: nova/virt/xenapi/vmops.py:358
+msgid "Failed to spawn, rolling back"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr "ファイルパス '%s' を埋め込んでいます"
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
-msgstr "VM %s を開始します…"
-
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
-msgstr ""
+#: nova/virt/xenapi/vmops.py:544
+#, fuzzy
+msgid "Starting VM"
+msgstr "xvp を再起動しています"
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+#, fuzzy, python-format
+msgid "Finished snapshot and upload for VM"
 msgstr "VM %s のスナップショットとアップロードが完了しました。"
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+#, fuzzy, python-format
+msgid "Starting snapshot for VM"
 msgstr "VM %s に対するスナップショットを開始します。"
 
-#: nova/virt/xenapi/vmops.py:692
-#, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:686
+#, fuzzy, python-format
+msgid "Unable to Snapshot instance: %(exc)s"
+msgstr "インスタンス %s にボリュームを接続(attach)できません。"
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr "カーネル/RAMディスクファイルが削除されました"
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:1147
+#, fuzzy
+msgid "Destroying VM"
+msgstr "xvp を再起動しています"
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
-#, python-format
-msgid "Automatically hard rebooting %d"
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1374
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1379
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+#, fuzzy
+msgid "Injecting network info to xenstore"
+msgstr "ネットワークホストの設定をします。"
+
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1492
+#, 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:1491
-#, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
-msgstr "VM %(vm_ref)s, network %(network_ref)s 用 VIF %(vif_ref)s を作成しました。"
+#: nova/virt/xenapi/vmops.py:1495
+#, 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:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL エラー: %s"
@@ -7075,72 +6990,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "ボリュームのステータス(status)は available でなければなりません。"
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr "実行失敗からリカバリーします。%s 回目のトライ。"
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr "ボリュームグループ%sが存在しません。"
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr "ボリューム %s 用の iSCSI エクスポートが見つかりません"
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr "偽のISCSI: %s"
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr "rbd にプール %s がありません。"
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr "Sheepdog が動作していません: %s"
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr "Sheepdog が機能していません"
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7737,6 +7652,36 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr "%sのアダプターコンシューマー(Adapter Consumer)を初期化しています。"
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr "topic は %s です。"
+
+#~ msgid "message %s"
+#~ msgstr "メッセージ %s"
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7827,6 +7772,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr "(%(nm)s) 公開 (キー: %(routing_key)s) %(message)s"
+
+#~ msgid "Publishing to route %s"
+#~ msgstr "ルート %s へパブリッシュ"
+
+#~ msgid "Declaring queue %s"
+#~ msgstr "queue %s の宣言"
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr "exchange %s の宣言"
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr "キー %(routing_key)s 付きで %(exchange)s に %(queue)s をバインドしています"
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr "%(queue)s から取得しています: %(message)s"
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7935,6 +7898,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr "VM %s を作成します。"
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr "%(vm_ref)s として VM %(instance_name)s を作成しています"
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7946,6 +7915,18 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "VDI %s 用に VBD を作成しています… "
 
@@ -7970,12 +7951,39 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr "XenAPI.Failure %s を無視しています"
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
+#~ msgid "instance %s: Failed to spawn"
+#~ msgstr "インスタンス %s: 起動に失敗しました"
+
 #~ msgid "Instance %s failed to spawn - performing clean-up"
 #~ msgstr ""
 
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr "VM %s を開始します…"
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -7985,9 +7993,80 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr "VM %(vm_ref)s, network %(network_ref)s 用 VIF %(vif_ref)s を作成しました。"
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用 VBD を作成しています… "
 
diff --git a/nova/locale/ko/LC_MESSAGES/nova.po b/nova/locale/ko/LC_MESSAGES/nova.po
index 2b3590d40..da5ec34af 100644
--- a/nova/locale/ko/LC_MESSAGES/nova.po
+++ b/nova/locale/ko/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+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"
@@ -1143,158 +1143,158 @@ msgstr ""
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2382,7 +2382,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3768,37 +3768,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3806,41 +3811,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3848,68 +3853,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4070,51 +4080,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4130,61 +4140,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr ""
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4416,36 +4371,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr ""
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4556,12 +4481,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4698,14 +4623,14 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4734,16 +4659,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4786,23 +4711,23 @@ msgid ""
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5007,7 +4932,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5022,7 +4947,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5145,174 +5070,174 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5322,40 +5247,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5478,41 +5403,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5535,19 +5460,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6064,714 +5989,699 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
+#: nova/virt/xenapi/vm_utils.py:379
 #, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:394
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
-#, python-format
-msgid "Fetching image %(image)s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Image Type: %s"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
+#: nova/virt/xenapi/vm_utils.py:895
+msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:233
+#, fuzzy, python-format
+msgid "Starting instance"
+msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
-msgstr "인스턴스 %s: 생성에 실패했습니다"
+#: nova/virt/xenapi/vmops.py:358
+msgid "Failed to spawn, rolling back"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
+#: nova/virt/xenapi/vmops.py:544
+msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:692
-#, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:686
+#, fuzzy, python-format
+msgid "Unable to Snapshot instance: %(exc)s"
+msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1147
+msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Automatically hard rebooting %d"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1374
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1379
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
+#: nova/virt/xenapi/vmops.py:1469
+msgid "Injecting network info to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1492
 #, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1495
 #, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
 #: nova/virt/xenapi/vmops.py:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -7059,72 +6969,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "볼륨의 상태를 알 수 없습니다"
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr ""
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7729,6 +7639,42 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Reconnected to queue"
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr ""
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "response %s"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr ""
+
+#~ msgid "message %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7819,6 +7765,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr ""
+
+#~ msgid "Publishing to route %s"
+#~ msgstr ""
+
+#~ msgid "Declaring queue %s"
+#~ msgstr ""
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr ""
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr ""
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr ""
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7927,6 +7891,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr ""
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr ""
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7938,9 +7908,27 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#~ msgstr ""
+
+#~ msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
 #~ msgid "Size for image %(image)s:%(virtual_size)d"
 #~ msgstr ""
 
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -7965,12 +7953,39 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr ""
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
+#~ msgid "instance %s: Failed to spawn"
+#~ msgstr "인스턴스 %s: 생성에 실패했습니다"
+
 #~ msgid "Instance %s failed to spawn - performing clean-up"
 #~ msgstr ""
 
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr ""
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -7980,9 +7995,89 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Finished snapshot and upload for VM %s"
+#~ msgstr ""
+
+#~ msgid "Starting snapshot for VM %s"
+#~ msgstr ""
+
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index cc355232f..9c5fe6da8 100644
--- a/nova/locale/nova.pot
+++ b/nova/locale/nova.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nova 2012.2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+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"
@@ -1138,158 +1138,158 @@ msgstr ""
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2377,7 +2377,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3763,37 +3763,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3801,41 +3806,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3843,68 +3848,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4065,51 +4075,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4125,61 +4135,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr ""
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4411,36 +4366,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr ""
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4551,12 +4476,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4693,14 +4618,14 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4729,16 +4654,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4781,23 +4706,23 @@ msgid ""
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5002,7 +4927,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5017,7 +4942,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5140,174 +5065,174 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5317,40 +5242,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5473,41 +5398,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5530,19 +5455,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6059,714 +5984,698 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
+#: nova/virt/xenapi/vm_utils.py:379
 #, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:394
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Fetching image %(image)s"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
-#, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
+#: nova/virt/xenapi/vm_utils.py:895
+msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
+#: nova/virt/xenapi/vmops.py:233
+msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
+#: nova/virt/xenapi/vmops.py:358
+msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
+#: nova/virt/xenapi/vmops.py:544
+msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:692
+#: nova/virt/xenapi/vmops.py:686
 #, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+msgid "Unable to Snapshot instance: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1147
+msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Automatically hard rebooting %d"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1374
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1379
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1492
 #, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1495
 #, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
 #: nova/virt/xenapi/vmops.py:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -7052,72 +6961,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr ""
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index 3d1a37f3a..f3453f201 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-04-01 23:03+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+0000\n"
 "PO-Revision-Date: 2012-02-06 21:07+0000\n"
 "Last-Translator: Adriano Steffler <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -1144,158 +1144,158 @@ msgstr "Conjunto completo de FLAGS:"
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Exceção interna: %s"
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr "Buscando %s"
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Executando comando (subprocesso): %s"
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr "Resultado foi %s"
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Executando o comando (SSH): %s"
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr "depuração em retorno de chamada: %s"
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Endereço para Link Local não encontrado: %s"
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, 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:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend inválido: %s"
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2384,7 +2384,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3777,37 +3777,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3815,41 +3820,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3857,68 +3862,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4079,51 +4089,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Retornando exceção %s ao método de origem"
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr "conteúdo descompactado: %s"
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr "recebido %s"
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr "sem método para mensagem: %s"
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr "Sem método para mensagem: %s"
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID é %s"
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4139,61 +4149,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr "Reconectado à fila"
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr "Iniciando o Adaptador Consumidor para %s"
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr "resposta %s"
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr "topico é %s"
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr "mensagem %s"
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4425,36 +4380,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr "(%(nm)s) publicar (key: %(routing_key)s) %(message)s"
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr "Publicando para rota %s"
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr "Declarando fila %s"
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr "Declarando troca %s"
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr "Ligação %(queue)s para %(exchange)s com chave %(routing_key)s"
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr "Recebendo de %(queue)s: %(message)s"
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4565,12 +4490,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4707,14 +4632,14 @@ 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/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4743,16 +4668,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4795,23 +4720,23 @@ msgid ""
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5016,7 +4941,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5031,7 +4956,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5154,175 +5079,175 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: criado com sucesso"
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5332,40 +5257,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5488,41 +5413,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5545,19 +5470,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6076,62 +6001,56 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr "VM %s criada..."
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
-msgstr "VM %(instance_name)s criada como %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "O VBD não foi encontrado na instância %s"
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "group %s já existe"
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Não é possível desconectar o VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Não é possível destruir o VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "VBD %(vbd_ref)s criado para VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VBD %(vbd_ref)s criado para VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6140,654 +6059,645 @@ msgstr ""
 "VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) no SR "
 "%(sr_ref)s criada com sucesso."
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
-#, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#: nova/virt/xenapi/vm_utils.py:379
+#, fuzzy, python-format
+msgid "Snapshotting with label '%(label)s'"
 msgstr "Fazendo um snapshot da VM %(vm_ref)s com rótulo '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:394
-#, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:392
+#, fuzzy, python-format
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr "Snapshot %(template_vm_ref)s criado a partir da VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 "Solicitando à xapi para realizar upload da imagem %(vdi_uuids)s com ID "
 "%(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
-#, python-format
-msgid "Fetching image %(image)s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, fuzzy, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr "Tamanho da imagem %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copiando o VDI %s de /boot/guest no dom0"
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk %s destruidos"
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
+#: nova/virt/xenapi/vm_utils.py:895
+msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Verificando o vdi %s para kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr "O VDI %s continua disponível"
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr "(VM_UTILS) xenserver vm state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr "(VM_UTILS) xenapi power_state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-escaneando SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "O VHD %(vdi_uuid)s tem pai %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Conectando VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "O VDB %s foi conectado."
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destruindo VBD para o VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "O VBD para o VDI %s foi destruído."
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Rodando pygrub novamente %s"
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen encontrado: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Kernel Xen não encontrado. Iniciando como HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:233
+#, fuzzy, python-format
+msgid "Starting instance"
+msgstr "Reiniciando a instância %s"
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
-msgstr "instância %s: falha na geração"
+#: nova/virt/xenapi/vmops.py:358
+msgid "Failed to spawn, rolling back"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#: nova/virt/xenapi/vmops.py:544
+msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:692
-#, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:686
+#, fuzzy, python-format
+msgid "Unable to Snapshot instance: %(exc)s"
+msgstr "Não é possível anexar o volume na instância %s"
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1147
+msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
-#, python-format
-msgid "Automatically hard rebooting %d"
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1374
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1379
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+msgid "Injecting network info to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1492
+#, 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:1491
-#, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
-msgstr "VIF %(vif_ref)s criada para VM %(vm_ref)s, rede %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1495
+#, 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:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erro de OpenSSL: %s"
@@ -7077,72 +6987,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "O status do volume parece estar disponível"
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr ""
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7748,6 +7658,36 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr "Iniciando o Adaptador Consumidor para %s"
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr "topico é %s"
+
+#~ msgid "message %s"
+#~ msgstr "mensagem %s"
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7838,6 +7778,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr "(%(nm)s) publicar (key: %(routing_key)s) %(message)s"
+
+#~ msgid "Publishing to route %s"
+#~ msgstr "Publicando para rota %s"
+
+#~ msgid "Declaring queue %s"
+#~ msgstr "Declarando fila %s"
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr "Declarando troca %s"
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr "Ligação %(queue)s para %(exchange)s com chave %(routing_key)s"
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr "Recebendo de %(queue)s: %(message)s"
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7946,6 +7904,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr "VM %s criada..."
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr "VM %(instance_name)s criada como %(vm_ref)s."
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7957,6 +7921,18 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "Criando VBD para VDI %s ... "
 
@@ -7981,12 +7957,39 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr ""
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
+#~ msgid "instance %s: Failed to spawn"
+#~ msgstr "instância %s: falha na geração"
+
 #~ msgid "Instance %s failed to spawn - performing clean-up"
 #~ msgstr ""
 
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr ""
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -7996,9 +7999,86 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Finished snapshot and upload for VM %s"
+#~ msgstr ""
+
+#~ msgid "Starting snapshot for VM %s"
+#~ msgstr ""
+
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr "VIF %(vif_ref)s criada para VM %(vm_ref)s, rede %(network_ref)s."
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr "Criando VBD para VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index a75ffa1c0..3788f7b18 100644
--- a/nova/locale/ru/LC_MESSAGES/nova.po
+++ b/nova/locale/ru/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+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"
@@ -1169,158 +1169,158 @@ msgstr "Полный набор ФЛАГОВ:"
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Вложенное исключение: %s"
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr "Получение %s"
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "Приняты неизвестные аргументы ключевого слова для utils.execute: %r"
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Выполнение команды (субпроцесс): %s"
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr "Результат %s"
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r ошибка. Выполняется повтор."
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Выполнение команды (SSH): %s"
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr "Среда не поддерживается с использованием SSH"
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr "process_input не поддерживается с использованием SSH"
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr "отладка в обратном вызове: %s"
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Недопустимый внутренний интерфейс: %s"
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr "внутренний интерфейс %s"
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Ожидался объект типа: %s"
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Недопустимая server_string: %s"
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' заняла %(total_time).2f с."
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr "Исходное исключение было сброшено"
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr "Класс %(fullname)s устарел: %(msg)s"
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr "Класс %(fullname)s устарел"
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr "Функция %(name)s в %(location)s устарела: %(msg)s"
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr "Функция %(name)s в %(location)s устарела"
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Ошибка удаления контейнера: %s"
@@ -2432,7 +2432,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3860,37 +3860,42 @@ msgstr "Ошибка отсоединения vif копии '%s'"
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, fuzzy, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr "Сертификат %(certificate_id)s не найден."
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr "Интерфейс %(interface)s не найден"
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr "Адрес |%(address)s| не выделен"
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr "Адрес |%(address)s| не выделен вашему проекту |%(project)s|"
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr "Превышена квота для %s, попытка выделения адреса"
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3898,41 +3903,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr "Домен |%(domain)s| уже существует, изменение зоны на |%(av_zone)s|."
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "Домен |%(domain)s| уже существует, изменение проекта на |%(project)s|."
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr "установка сетевого узла"
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr "исключение сетевых распределений для копии |%s|"
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3943,48 +3948,53 @@ msgstr ""
 "доступной зоне |%(zone)s|. Копия |%(instance)s| расположена в зоне "
 "|%(zone2)s|. Запись DNS не будет создана."
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "Арендованный IP |%(address)s|"
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "Присвоенный IP |%(address)s|"
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr "cidr уже используется"
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 "запрошенная cidr (%(cidr)s) конфликтует с существующей супер-сетью "
 "(%(super)s)"
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -3993,22 +4003,22 @@ msgstr ""
 "запрошенная cidr (%(cidr)s) конфликтует с существующей, меньшей cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr "Сеть уже существует!"
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "Сеть должна быть исключена из проекта %s перед удалением"
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4175,51 +4185,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Возврат исключения %s вызывающему"
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr "неизвлечённый контекст: %s"
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr "получено %s"
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr "не определен метод для сообщения: %s"
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr "Не определен метод для сообщения: %s"
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr "Выполнение асинхронного вызова %s ..."
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID is %s"
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr "Отправка оповещения на %s..."
@@ -4237,65 +4247,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-"Сервер AMQP на %(fl_host)s:%(fl_port)d недоступен: %(e)s. Очередная "
-"попытка через %(fl_intv)d секунд."
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-"Невозможно подключиться к серверу AMQP после выполнения %(tries)d "
-"попыток. Завершение работы."
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr "Переподлючено к очереди"
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr "Ошибка получения сообщения из очереди: %s"
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr "ответ %s"
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr "тема %s"
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr "сообщение %s"
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4531,36 +4482,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr "Объявление очереди %s"
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr "Объявление точки обмена %s"
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr "Получение из %(queue)s: %(message)s"
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4671,12 +4592,12 @@ msgstr "Заданные данные: %s"
 msgid "Result data: %s"
 msgstr "Итоговые данные: %s"
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Создание файлов в %s для имитации гостевого агента"
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Удаление файлов имитации гостевого агента в %s"
@@ -4816,14 +4737,14 @@ msgstr "Получено %s"
 msgid "Failed to open connection to the hypervisor"
 msgstr "Ошибка открытия соединения c гипервизором"
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr "Запись Compute_service создана для %s "
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr "Запись Compute_service обновлена для %s "
@@ -4852,16 +4773,16 @@ msgstr "Добавление правила группы безопасност�
 msgid "Adding provider rule: %s"
 msgstr "Добавление правила поставщика: %s"
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr "Ошибка анализа 'qemu-img info'."
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "Преобразование в необработанный, но текущий формат %s"
@@ -4909,25 +4830,25 @@ msgstr ""
 "(необязательно) и xenapi_connection_password для использования "
 "connection_type=xenapi"
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr "Запуск узла на XenServer не поддерживается."
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 "Невозможно выполнить вход в XenAPI (недостаточно свободного места на "
 "Dom0?)"
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr "Исключение: %s"
@@ -5132,7 +5053,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5149,7 +5070,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5272,77 +5193,77 @@ msgstr "ошибка qemu-nbd: %s"
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Подключение к libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr "Неполадка с подключением к libvirt"
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "снимок %s: создание завершено"
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -5351,72 +5272,72 @@ msgstr ""
 "Найдены %(migration_count)d неподтверждённых перемещений, старше "
 "%(confirm_window)d секунд"
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr "Автоматические подтверждение перемещения %d"
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Пользователь не имеет административных привилегий"
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr "Создание изображения"
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr "block_device_list %s"
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -5425,28 +5346,28 @@ msgstr ""
 "Ошибка libvirt во время поиска %(instance_name)s: [Код ошибки "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/connection.py:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "устаревшая версия libvirt (не поддерживается getVersion)"
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr "'<cpu>' должно быть 1, но %d\n"
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5456,41 +5377,41 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 #, fuzzy, python-format
 msgid "Instance running successfully."
 msgstr "Копия %s: выполнение"
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5615,41 +5536,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5672,12 +5593,12 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr "Ошибка отсоединения vif копии '%s'"
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "iSCSI-устройство не найдено в %s"
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
@@ -5686,7 +5607,7 @@ msgstr ""
 "Том ISCSI не найден в: %(mount_device)s. Будет выполнена повторная "
 "проверка и попытка.  Повторение: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr "Найден узел iSCSI %(mount_device)s (после %(tries)s повторных проверок)"
@@ -6206,62 +6127,57 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr "Созданная ВМ %s..."
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
-msgstr "Созданная ВМ %(instance_name)s как %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:218
+#, fuzzy, python-format
+msgid "Created VM"
+msgstr "_создать: %s"
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD не найдено для копии %s"
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "группа %s уже существует"
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Невозможно отсоединить VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Невозможно ликвидировать VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Создана VBD %(vbd_ref)s для ВМ %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Создана VBD %(vbd_ref)s для ВМ %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "Невозможно ликвидировать VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6270,61 +6186,66 @@ msgstr ""
 "Создан VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) "
 "на %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, fuzzy, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "Отсутствует первичный VDI для%(vm_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:381
-#, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#: nova/virt/xenapi/vm_utils.py:379
+#, fuzzy, python-format
+msgid "Snapshotting with label '%(label)s'"
 msgstr "Снимок ВМ %(vm_ref)s с меткой '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:394
-#, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:392
+#, fuzzy, python-format
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr "Создан снимок %(template_vm_ref)s из ВМ %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Запрос xapi для выгрузки %(vdi_uuids)s в качестве ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr "Запрос xapi на приём образа vhd %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
@@ -6333,17 +6254,17 @@ msgstr ""
 "xapi 'download_vhd' возвратил VDI типа '%(vdi_type)s' с UUID "
 "'%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
@@ -6352,26 +6273,17 @@ msgstr ""
 "Размер образа %(size_bytes)d превышает допустимый instance_type  размер "
 "%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:840
-#, python-format
-msgid "Fetching image %(image)s"
+#: nova/virt/xenapi/vm_utils.py:831
+#, fuzzy, python-format
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr "Получение образа %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:841
-#, python-format
-msgid "Image Type: %s"
-msgstr "Тип образа: %s"
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
-msgstr "ISO: Найден sr, возможно содержащий образ ISO"
-
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
@@ -6380,211 +6292,211 @@ msgstr ""
 "Превышен размер ядра/Ramdisk образа: %(vdi_size)d байт, макс. "
 "%(max_size)d байт"
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Копирование VDI %s в /boot/guest на dom0"
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Ядро/Ramdisk VDI %s ликвидирован"
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
-msgstr ""
+#: nova/virt/xenapi/vm_utils.py:895
+#, fuzzy
+msgid "Failed to fetch glance image"
+msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "Обнаружен %(image_type_str)s формат для образа %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Поиск vdi %s для ядра PV"
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr "Неизвестный формат образа %(disk_image_type)s"
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s до сих пор доступен"
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Повторная проверка SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr "Невозможно найти SR типа содержимого ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr "ISO: поиск SR %(sr_rec)s"
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr "ISO: не содержимое iso типа"
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr "ISO: SR с локальной PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "Время ожидания при создании устройства %s"
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Подсоединение VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Подсоединение VBD %s выполнено."
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s подсоединено как %(orig_dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 "VBD %(vbd_ref)s подсоединено в неправильный dev, изменение назначения на "
 "%(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Ликвидирование VBD для VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Ликвидирование VBD для VDI %s завершено."
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Найдено ядро Xen %s"
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Ядро Xen не найдено.  Загрузка HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr "Разделы:"
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d секторов"
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
@@ -6593,355 +6505,361 @@ msgstr ""
 "Запись таблицы разделов %(primary_first)d %(primary_last)d в "
 "%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Запись таблицы разделов %s выполнена."
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr "Средства XenServer не установлены в этот образ"
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 "Ошибка присоединения файловой системы (ожидаемо для копий не на базе "
 "linux): %s"
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
-#, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
+#, fuzzy, python-format
+msgid "Updating progress to %(progress)d"
 msgstr "Обновление выполнения копии '%(instance_uuid)s' до %(progress)d"
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 "Предпринята попытка включения несуществующей копии, копии с неполадками с"
 " идентификатором %s"
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
+#: nova/virt/xenapi/vmops.py:233
+#, fuzzy, python-format
+msgid "Starting instance"
 msgstr "Запуск копии %s"
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "Удаление ядра/ramdisk файлов из dom0"
 
-#: nova/virt/xenapi/vmops.py:357
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
-msgstr "Копия %(instance_id)s не выполняется."
+#: nova/virt/xenapi/vmops.py:358
+#, fuzzy
+msgid "Failed to spawn, rolling back"
+msgstr "Ошибка обновления тома в базе данных"
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:462
+#, fuzzy, python-format
+msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 "Автоматическая настройка диска для копии %(instance_uuid)s, выполняется "
 "попытка изменения размера раздела..."
 
-#: nova/virt/xenapi/vmops.py:519
-#, python-format
-msgid "Invalid value for injected_files: '%s'"
+#: nova/virt/xenapi/vmops.py:515
+#, fuzzy, python-format
+msgid "Invalid value for injected_files: %r"
 msgstr "Недопустимое значение для injected_files: '%s'"
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr "Настройка пароля администратора"
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr "Восстановление сети"
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
-msgstr "Запуск ВМ %s..."
-
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
-msgstr ""
+#: nova/virt/xenapi/vmops.py:544
+#, fuzzy
+msgid "Starting VM"
+msgstr "Выполнение перезагрузки xvp"
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
-msgstr "Копия %s: ожидание запуска"
-
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
-msgstr "Копия %s: выполнение"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr "Запрос версии агента"
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "Версия агента копии: %s"
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr "Обновление агента до %s"
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr "opaque_ref не может быть определён для '%s'."
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+#, fuzzy, python-format
+msgid "Finished snapshot and upload for VM"
 msgstr "Готовый снимок и выгрузка для ВМ %s"
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+#, fuzzy, python-format
+msgid "Starting snapshot for VM"
 msgstr "Запуск снимка для ВМ %s"
 
-#: nova/virt/xenapi/vmops.py:692
-#, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:686
+#, fuzzy, python-format
+msgid "Unable to Snapshot instance: %(exc)s"
+msgstr "Невозможно найти узел для копии %s"
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr "Ошибка перемещения vhd на новый узел"
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "Изменение размера VDI %(cow_uuid)s с %(old_gb)dГБ до %(new_gb)dГБ"
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "Изменение размера VDI %(vdi_uuid)s с %(old_gb)dГБ до %(new_gb)dГБ"
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+#, fuzzy, python-format
+msgid "Resize complete"
 msgstr "Изменение размера копии %s завершено"
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr "Ошибка запроса версии агента: %(resp)r"
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr "Ошибка обновления агента: %(resp)r"
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr "Ошибка обмена ключей: %(resp)r"
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr "Ошибка обновления пароля: %(resp)r"
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
-msgstr "Завершение работы ВМ для копии %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr "Невозможно найти VBD для ВМ"
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+#, fuzzy, python-format
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 "Копия %(instance_uuid)s использует RAW или VHD, пропуск ядра и удаление "
 "ramdisk"
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "копия содержит ядро или ramdisk, но не оба"
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr "файлы ядра/ramdisk удалены"
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
-msgstr "Копия %(instance_uuid)s ВМ ликвидирована"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
-msgstr "Ликвидирование ВМ для копии %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1147
+#, fuzzy
+msgid "Destroying VM"
+msgstr "Выполнение перезагрузки xvp"
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr "ВМ не предоставлена, пропуск выполнения ликвидации..."
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "Копия в состоянии режима восстановления: %s"
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
-#, python-format
-msgid "Automatically hard rebooting %d"
+#: nova/virt/xenapi/vmops.py:1300
+#, fuzzy, python-format
+msgid "Automatically hard rebooting"
 msgstr "Автоматическая безотказная перезагрузка %d"
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
-msgstr "Невозможно получить сведения о пропускной способности."
+#: nova/virt/xenapi/vmops.py:1374
+#, fuzzy, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr "Завершение работы ВМ для копии %(instance_uuid)s"
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1379
+#, fuzzy, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr "Копия %(instance_id)s не найдена"
+
+#: nova/virt/xenapi/vmops.py:1383
+#, fuzzy, python-format
+msgid "In ERROR state"
+msgstr "Ошибка БД: %s"
+
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
-msgstr "создание vif(s) для вм: |%s|"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
-#, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr "Невозможно получить сведения о пропускной способности."
+
+#: nova/virt/xenapi/vmops.py:1469
+#, fuzzy
+msgid "Injecting network info to xenstore"
+msgstr "установка сетевого узла"
+
+#: nova/virt/xenapi/vmops.py:1483
+#, fuzzy
+msgid "Creating vifs"
+msgstr "Создание изображения"
+
+#: nova/virt/xenapi/vmops.py:1492
+#, fuzzy, python-format
+msgid "Creating VIF for network %(network_ref)s"
 msgstr "Создание VIF для ВМ %(vm_ref)s, сеть %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1491
-#, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
-msgstr "Создан VIF %(vif_ref)s для ВМ %(vm_ref)s, сеть %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1495
+#, 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:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
-#, python-format
+#: nova/virt/xenapi/vmops.py:1545
+#, fuzzy, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 "Вызов агентом %(method)s возвратил недопустимый ответ: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 
-#: nova/virt/xenapi/vmops.py:1604
-#, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+#: nova/virt/xenapi/vmops.py:1566
+#, 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:1608
-#, python-format
+#: nova/virt/xenapi/vmops.py:1570
+#, fuzzy, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 "НЕ РЕАЛИЗОВАНО: Вызов %(method)s не поддерживается агентом. VM "
 "id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/vmops.py:1613
-#, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
-msgstr ""
-"Вызов %(method)s возвратил ошибку: %(e)s. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+#: nova/virt/xenapi/vmops.py:1575
+#, 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:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Ошибка OpenSSL: %s"
@@ -7229,74 +7147,74 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "Состояние тома должно быть доступно"
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr "Восстановление после недопустимого выполнения.  Попытка номер %s"
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr "том группы %s не существует"
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr "Невозможно найти экспортирование iSCSI для тома %s"
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 "Невозможно подтвердить идентификатора экспортированного "
 "тома:%(volume_id)s."
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr ""
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr "rbd не имеет пула %s"
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr "Sheepdog не выполняется: %s"
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr "Sheepdog не выполняется"
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr "LoggingVolumeDriver: %s"
@@ -7869,9 +7787,6 @@ msgstr ""
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr "Невозможно перейти на предыдущую версию без потери данных"
 
-#~ msgid "Instance %(instance_id)s not found"
-#~ msgstr "Копия %(instance_id)s не найдена"
-
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7879,6 +7794,42 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+#~ "Сервер AMQP на %(fl_host)s:%(fl_port)d "
+#~ "недоступен: %(e)s. Очередная попытка через "
+#~ "%(fl_intv)d секунд."
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+#~ "Невозможно подключиться к серверу AMQP "
+#~ "после выполнения %(tries)d попыток. Завершение"
+#~ " работы."
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr "Ошибка получения сообщения из очереди: %s"
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr ""
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr "тема %s"
+
+#~ msgid "message %s"
+#~ msgstr "сообщение %s"
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7974,6 +7925,24 @@ msgstr ""
 #~ "\t MostAvailCap: Наилучший узел: "
 #~ "%(best_host)s. (доступно %(max_avail)s %(type_str)s)"
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr ""
+
+#~ msgid "Publishing to route %s"
+#~ msgstr ""
+
+#~ msgid "Declaring queue %s"
+#~ msgstr "Объявление очереди %s"
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr "Объявление точки обмена %s"
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr ""
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr "Получение из %(queue)s: %(message)s"
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -8081,6 +8050,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr "Созданная ВМ %s..."
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr "Созданная ВМ %(instance_name)s как %(vm_ref)s."
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr "Создание особого CDROM VBD для ВМ %(vm_ref)s, VDI %(vdi_ref)s ... "
 
@@ -8091,9 +8066,18 @@ msgstr ""
 #~ "Создана VBD на основе CDROM  %(vbd_ref)s"
 #~ "  для ВМ %(vm_ref)s, VDI %(vdi_ref)s."
 
+#~ msgid "Image Type: %s"
+#~ msgstr "Тип образа: %s"
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr "ISO: Найден sr, возможно содержащий образ ISO"
+
 #~ msgid "Size for image %(image)s:%(virtual_size)d"
 #~ msgstr ""
 
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "Создание VBD для VDI %s ... "
 
@@ -8127,6 +8111,15 @@ msgstr ""
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid "Starting VM %s..."
+#~ msgstr "Запуск ВМ %s..."
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr "Копия %s: ожидание запуска"
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr "Ресурсы для удаления:%s"
 
@@ -8136,9 +8129,47 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr "Пропуск ликвидации VDI для %s"
 
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr "Ликвидирование VDI для копии %(instance_uuid)s"
 
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr "Копия %(instance_uuid)s ВМ ликвидирована"
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr "Ликвидирование ВМ для копии %(instance_uuid)s"
+
+#~ msgid "Instance for migration %d not found, skipping"
+#~ msgstr ""
+
+#~ msgid "injecting network info to xs for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr "создание vif(s) для вм: |%s|"
+
+#~ msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr "Создан VIF %(vif_ref)s для ВМ %(vm_ref)s, сеть %(network_ref)s."
+
+#~ msgid "injecting hostname to xs for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+#~ "Вызов %(method)s возвратил ошибку: %(e)s. "
+#~ "VM id=%(instance_uuid)s; args=%(args)r"
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr "Создание VBD для ВМ %(vm_ref)s, VDI %(vdi_ref)s ... "
 
diff --git a/nova/locale/tl/LC_MESSAGES/nova.po b/nova/locale/tl/LC_MESSAGES/nova.po
index 15e3b92d8..6b6bc7841 100644
--- a/nova/locale/tl/LC_MESSAGES/nova.po
+++ b/nova/locale/tl/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+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"
@@ -1138,158 +1138,158 @@ msgstr ""
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2377,7 +2377,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3763,37 +3763,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3801,41 +3806,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3843,68 +3848,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4065,51 +4075,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr "natanggap %s"
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr "Walang paraan para sa mensahe: %s"
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4125,61 +4135,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr "Muling kumonekta sa queue"
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr ""
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4411,36 +4366,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr ""
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4551,12 +4476,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4693,14 +4618,14 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4729,16 +4654,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4781,23 +4706,23 @@ msgid ""
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5002,7 +4927,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5017,7 +4942,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5140,174 +5065,174 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5317,40 +5242,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5473,41 +5398,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5530,19 +5455,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6059,714 +5984,698 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
+#: nova/virt/xenapi/vm_utils.py:379
 #, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:394
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Fetching image %(image)s"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
-#, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
+#: nova/virt/xenapi/vm_utils.py:895
+msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
+#: nova/virt/xenapi/vmops.py:233
+msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
+#: nova/virt/xenapi/vmops.py:358
+msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
+#: nova/virt/xenapi/vmops.py:544
+msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:692
+#: nova/virt/xenapi/vmops.py:686
 #, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+msgid "Unable to Snapshot instance: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1147
+msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Automatically hard rebooting %d"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1374
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1379
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1492
 #, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1495
 #, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
 #: nova/virt/xenapi/vmops.py:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -7052,72 +6961,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr ""
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7723,6 +7632,39 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr ""
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "response %s"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr ""
+
+#~ msgid "message %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7813,6 +7755,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr ""
+
+#~ msgid "Publishing to route %s"
+#~ msgstr ""
+
+#~ msgid "Declaring queue %s"
+#~ msgstr ""
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr ""
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr ""
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr ""
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7921,6 +7881,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr ""
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr ""
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7932,9 +7898,27 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#~ msgstr ""
+
+#~ msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
 #~ msgid "Size for image %(image)s:%(virtual_size)d"
 #~ msgstr ""
 
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -7959,6 +7943,9 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr ""
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7968,6 +7955,27 @@ msgstr ""
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr ""
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -7977,9 +7985,89 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Finished snapshot and upload for VM %s"
+#~ msgstr ""
+
+#~ msgid "Starting snapshot for VM %s"
+#~ msgstr ""
+
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
diff --git a/nova/locale/tr/LC_MESSAGES/nova.po b/nova/locale/tr/LC_MESSAGES/nova.po
index 21dd6d971..5a143b777 100644
--- a/nova/locale/tr/LC_MESSAGES/nova.po
+++ b/nova/locale/tr/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+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"
@@ -1138,158 +1138,158 @@ msgstr ""
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2377,7 +2377,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3763,37 +3763,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3801,41 +3806,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3843,68 +3848,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4065,51 +4075,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4125,61 +4135,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr ""
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4411,36 +4366,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr ""
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4551,12 +4476,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4693,14 +4618,14 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4729,16 +4654,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4781,23 +4706,23 @@ msgid ""
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5002,7 +4927,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5017,7 +4942,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5140,174 +5065,174 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5317,40 +5242,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5473,41 +5398,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5530,19 +5455,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6059,714 +5984,698 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
+#: nova/virt/xenapi/vm_utils.py:379
 #, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:394
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Fetching image %(image)s"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
-#, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
+#: nova/virt/xenapi/vm_utils.py:895
+msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
+#: nova/virt/xenapi/vmops.py:233
+msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
+#: nova/virt/xenapi/vmops.py:358
+msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
+#: nova/virt/xenapi/vmops.py:544
+msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:692
+#: nova/virt/xenapi/vmops.py:686
 #, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+msgid "Unable to Snapshot instance: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1147
+msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Automatically hard rebooting %d"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1374
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1379
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1492
 #, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1495
 #, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
 #: nova/virt/xenapi/vmops.py:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -7052,72 +6961,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr ""
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7722,6 +7631,42 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Reconnected to queue"
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr ""
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "response %s"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr ""
+
+#~ msgid "message %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7812,6 +7757,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr ""
+
+#~ msgid "Publishing to route %s"
+#~ msgstr ""
+
+#~ msgid "Declaring queue %s"
+#~ msgstr ""
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr ""
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr ""
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr ""
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7920,6 +7883,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr ""
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr ""
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7931,9 +7900,27 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#~ msgstr ""
+
+#~ msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
 #~ msgid "Size for image %(image)s:%(virtual_size)d"
 #~ msgstr ""
 
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -7958,6 +7945,9 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr ""
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7967,6 +7957,27 @@ msgstr ""
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr ""
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -7976,9 +7987,89 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Finished snapshot and upload for VM %s"
+#~ msgstr ""
+
+#~ msgid "Starting snapshot for VM %s"
+#~ msgstr ""
+
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
diff --git a/nova/locale/uk/LC_MESSAGES/nova.po b/nova/locale/uk/LC_MESSAGES/nova.po
index 0190f1f0d..e19145cdc 100644
--- a/nova/locale/uk/LC_MESSAGES/nova.po
+++ b/nova/locale/uk/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+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"
@@ -1139,158 +1139,158 @@ msgstr ""
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2379,7 +2379,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3765,37 +3765,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3803,41 +3808,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3845,68 +3850,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4067,51 +4077,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr "отримано %s"
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr "без порядку для повідомлень: %s"
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr "Без порядку для повідомлень: %s"
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID %s"
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4127,61 +4137,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr "Оновлено з'єднання до черги"
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr "відповідь %s"
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr "заголовок %s"
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr "повідомлення %s"
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4413,36 +4368,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr "Оголошення черги %s"
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr "Оголошення точки обміну %s"
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr ""
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4553,12 +4478,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4695,14 +4620,14 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4731,16 +4656,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4783,23 +4708,23 @@ msgid ""
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5004,7 +4929,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5019,7 +4944,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5142,174 +5067,174 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5319,40 +5244,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5475,41 +5400,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5532,19 +5457,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6061,714 +5986,698 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
+#: nova/virt/xenapi/vm_utils.py:379
 #, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:394
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Fetching image %(image)s"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
-#, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
+#: nova/virt/xenapi/vm_utils.py:895
+msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
+#: nova/virt/xenapi/vmops.py:233
+msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
+#: nova/virt/xenapi/vmops.py:358
+msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
+#: nova/virt/xenapi/vmops.py:544
+msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:692
+#: nova/virt/xenapi/vmops.py:686
 #, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+msgid "Unable to Snapshot instance: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1147
+msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1363
 #, python-format
-msgid "Automatically hard rebooting %d"
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1374
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1379
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+msgid "Injecting network info to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
+#: nova/virt/xenapi/vmops.py:1492
 #, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1495
 #, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
 #: nova/virt/xenapi/vmops.py:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -7054,72 +6963,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr ""
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7725,6 +7634,36 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr ""
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr "заголовок %s"
+
+#~ msgid "message %s"
+#~ msgstr "повідомлення %s"
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7815,6 +7754,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr ""
+
+#~ msgid "Publishing to route %s"
+#~ msgstr ""
+
+#~ msgid "Declaring queue %s"
+#~ msgstr "Оголошення черги %s"
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr "Оголошення точки обміну %s"
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr ""
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr ""
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7923,6 +7880,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr ""
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr ""
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7934,9 +7897,27 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#~ msgstr ""
+
+#~ msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
 #~ msgid "Size for image %(image)s:%(virtual_size)d"
 #~ msgstr ""
 
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -7961,6 +7942,9 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr ""
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7970,6 +7954,27 @@ msgstr ""
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr ""
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -7979,9 +7984,89 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Finished snapshot and upload for VM %s"
+#~ msgstr ""
+
+#~ msgid "Starting snapshot for VM %s"
+#~ msgstr ""
+
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index feb75a0f1..3f97ae56a 100644
--- a/nova/locale/zh_CN/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_CN/LC_MESSAGES/nova.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
-"PO-Revision-Date: 2012-03-26 10:54+0000\n"
-"Last-Translator: Edward <Unknown>\n"
+"POT-Creation-Date: 2012-04-08 23:04+0000\n"
+"PO-Revision-Date: 2012-04-03 23:36+0000\n"
+"Last-Translator: cheesecake <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
@@ -1146,158 +1146,158 @@ msgstr "标记全集："
 msgid "%(flag)s : FLAG SET "
 msgstr "%(flag)s：标记集合 "
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "内层异常：%s"
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr "正在抓取 %s"
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "发现未知的 utils.execute 关键字参数：%r"
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "正在运行cmd (subprocess)：%s"
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr "运行结果为 %s"
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r 失败，重试。"
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "运行cmd (SSH)：%s"
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr "SSH上不支持环境变量"
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr "SSH上不支持的进程输入参数。"
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr "回调中debug：%s"
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "本地IP地址没有找到：%s"
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "无法连接到 %(interface)s 的本地IP：%(ex)s"
 
-#: nova/utils.py:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "无效的后台：%s"
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr "后台 %s"
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr "循环调用中。"
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, fuzzy, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "正在试图获取信号量 \"%(lock)s\" 为方法 \"%(method)s\"...锁"
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, fuzzy, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "获得信号量 \"%(lock)s\" 为方法 \"%(method)s\" ...锁"
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, fuzzy, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "正在 试图获取锁 \"%(lock)s\" 为方法 \"%(method)s\"...锁"
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, fuzzy, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "获得文件锁 \"%(lock)s\" 为方法 \"%(method)s\"...锁"
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "期望的对象类型：%s"
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "不正确的server_string：%s"
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc：'%(name)s' 用了%(total_time).2f 秒"
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr "正在丢弃原来的异常。"
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr "类 %(fullname)s 是不推荐的：%(msg)s"
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr "类 %(fullname)s 是不推荐的"
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr "函数 %(name)s 在%(location)s 里的是不推荐的：%(msg)s"
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr "函数 %(name)s 在%(location)s 里的是不推荐的"
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "移除容器失败：%s"
@@ -2391,7 +2391,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr "只有根证书能被获取。"
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3802,37 +3802,42 @@ msgstr "移除实例”%s“的虚拟网络设备时失败"
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, fuzzy, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr "证书 %(certificate_id)s 没有找到。"
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr "没有找到接口 %(interface)s"
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr "为实例 |%s| 分配浮动IP"
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr "为实例 |%s| 释放浮动IP"
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr "地址 |%(address)s| 没有分配"
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr "地址 |%(address)s| 没有分配给你的项目 |%(project)s|"
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr "%s 的配额超出，尝试分配地址"
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3840,41 +3845,41 @@ msgid ""
 "ignored."
 msgstr "数据库不一致：DNS域|%s| 在Nova数据库中注册，但是对浮动或者实例DNS驱动均不可见。将被忽略。"
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr "域 |%(domain)s| 已经存在，把区域改变为 |%(av_zone)s|。"
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "域 |%(domain)s| 已经存在，把项目改变为 |%(project)s|。"
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr "解除 %s 过期固定ip的关联"
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr "设置网络主机"
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr "为实例 |%s| 的网路分配"
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr "为实例 |%(instance_id)s| 获取的网络：|%(networks)s|"
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr "为实例 |%s| 解除网络分配"
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3884,68 +3889,73 @@ msgstr ""
 "instance-dns-zone是 |%(domain)s|，该域位于区域 |%(zone)s| 中。实例|%(instance)s| 在区域 "
 "|%(zone2)s| 里。没有DNS记录将创建。"
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "租用的IP |%(address)s|"
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "没有关联的IP %s 被租用了"
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr "没有分配的IP |%s| 被租用了"
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "释放的IP |%(address)s|"
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "没有关联的IP %s 被释放了"
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "没有租用的IP %s 被释放了"
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr "cidr 已经在使用"
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr "请求的cidr (%(cidr)s) 与已存在的超网络 (%(super)s) 冲突"
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, 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:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr "网络已经存在。"
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "网路在删除前必须与项目 %s 解除关联"
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "网络数量与VLAN起始数之和不能大于4049"
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4108,51 +4118,51 @@ msgstr "Problem '%(e)s' 试图发送到通知驱动 %(driver)s。"
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "返回 %s 异常给调用者"
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr "未打包的上下文：%s"
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr "已接收 %s"
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr "没有适用于消息的方法：%s"
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr "没有适用于消息的方法：%s"
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr "在 %s 做异步call"
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "消息ID(MSG_ID)是 %s"
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr "在 %s 做异步cast"
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr "做异步fanout cast"
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr "正在 %s 上发送通知"
@@ -4170,61 +4180,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr "等待RPC响应返回超时"
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr "%(fl_host)s:%(fl_port)d上的AMQP服务器不可达：%(e)s。 %(fl_intv)d 秒钟后再尝试。"
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr "%(tries)d 次尝试后依然无法连接到AMQP服务器。正在关闭。"
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr "重新连接队列"
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr "从队列获取消息失败：%s"
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr "为%s初始化适配器消费者(Adapter Consumer)"
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr "\"%(exchange)s\" fanout exchange用路由密钥 \"%(key)s\" 创建的"
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr "处理消费者出现异常"
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr "正在创建 \"%(exchange)s\" fanout exchange"
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr "响应 %s"
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr "主题是 %s"
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr "消息 %s"
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4461,36 +4416,6 @@ msgstr "卷没有足够可分配的空间"
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr "未设置 VCPUs；假设 CPU 集合损坏了"
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr "(%(nm)s) 发布 (键：%(routing_key)s) %(message)s"
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr "发布并路由到 %s"
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr "正在声明队列 %s"
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr "正在声明交换(exchange) %s"
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr "把队列 %(queue)s 绑定到 %(exchange)s 采用的键是 %(routing_key)s"
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr "从队列 %(queue)s 取消息：%(message)s"
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4603,12 +4528,12 @@ msgstr "给定数据：%s"
 msgid "Result data: %s"
 msgstr "结果数据：%s"
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "在%s 创建文件模拟客户代理"
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "移除在 %s 的模拟的客户代理文件"
@@ -4748,14 +4673,14 @@ msgstr "已接收 %s"
 msgid "Failed to open connection to the hypervisor"
 msgstr "打开虚拟机管理程序的连接失败"
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr "Compute_service记录为 %s 创建 "
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr "Compute_service记录为 %s 更新 "
@@ -4784,16 +4709,16 @@ msgstr "添加安全组规则：%r"
 msgid "Adding provider rule: %s"
 msgstr "添加提供者规则：%s"
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr "'qemu-img info'解析失败"
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr "fmt=%(fmt)s 由 %(backing_file)s 支持"
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "转化为裸格式，但目前格式是 %s"
@@ -4838,23 +4763,23 @@ msgstr ""
 "针对use connection_type=xenapi必须指定xenapi_connection_url, "
 "xenapi_connection_username (可选) 和 xenapi_connection_password"
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr "无法确定iscsi initiator名字"
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr "不支持在XenServer启动主机"
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "无法登录到XenAPI(Dom0磁盘是空么？)"
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr "得到异常：%s"
@@ -5059,7 +4984,7 @@ msgstr "实例 %s：开始方法 toXML"
 msgid "instance %s: finished toXML method"
 msgstr "实例 %s：方法toXML 完成"
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5074,7 +4999,7 @@ msgstr "#### RLK: cpu_arch = %s "
 msgid "Updating!"
 msgstr "正在更新。"
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr "正在更新主机状态"
@@ -5197,171 +5122,171 @@ msgstr "qemu-nbd 错误：%s"
 msgid "nbd device %s did not show up"
 msgstr "nbd 设备 %s 没有出现"
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "正在连接 libvirt：%s"
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr "连接 libvirt 失败"
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, 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:382
+#: nova/virt/libvirt/connection.py:400
 #, 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:393
+#: nova/virt/libvirt/connection.py:411
 #, 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:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr "实例销毁成功。"
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, 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:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr "删除实例文件 %(target)s"
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr "附加 LXC 块设备"
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr "分离LXC 块设备"
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "实例成功重启。"
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "重新启动实例失败"
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "实例成功生产。"
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr "重启过程中，实例消失。"
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr "实例成功重启。"
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, 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:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr "正在自动确认迁移 %d"
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr "实例在运行"
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr "实例成功生产。"
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data：%(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "用户没有管理员权限"
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr "正在创建镜像"
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr "将 %(injection)s 注入到镜像 %(img_id)s"
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, 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:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr "块设备列表 block_device_list %s"
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr "正在启动 toXML 方法"
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr "toXML方法完成"
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "libvirt版本过旧(不支持getVersion)"
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr "'<cpu>' 必须为 1, 但是为 %d\n"
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr "拓扑 (%(topology)s) 必须含有 %(ks)s"
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -5370,7 +5295,7 @@ msgstr ""
 "已启动实例的CPU信息：\n"
 "%s"
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5385,42 +5310,42 @@ msgstr ""
 "\n"
 "参考 %(u)s"
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr "迁移 %s 超时"
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "因它像卷，所以跳过 %(path)s"
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr "实例 %s：开始执行 migrate_disk_and_power_off"
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 #, fuzzy, python-format
 msgid "During wait running, instance disappeared."
 msgstr "%s 在运行中消失了。"
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 #, fuzzy, python-format
 msgid "Instance running successfully."
 msgstr "实例 %s 成功运行。"
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr "实例 %s：开始执行 finish_migration"
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr "实例 %s：开始执行 finish_revert_migration"
@@ -5547,41 +5472,41 @@ msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像不在使用中"
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像在使用中"
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr "跳过验证，在 %s 上没有基础目录"
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr "验证基础镜像"
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr "未知的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr "活跃的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr "损坏的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr "可删除的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr "确认完成"
 
@@ -5604,19 +5529,19 @@ msgstr "保证桥 %s"
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr "移除实例”%s“的虚拟网络设备时失败"
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "在 %s 未找到iSCSI设备"
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr "在 %(mount_device)s 上还没有找到iSCSI卷。将再次扫描并重试。尝试次数：%(tries)s"
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr "找到iSCSI节点 %(mount_device)s （经过%(tries)s 次再扫描）"
@@ -6138,62 +6063,57 @@ msgstr ""
 "网络 %(bridge)s 的 PIF %(pif_rec['uuid'])s  有VLAN id %(pif_vlan)d。期待的数目是 "
 "%(vlan_num)d"
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr "创建虚拟机 %s ..."
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
-msgstr "已经将虚拟机 %(instance_name)s 创建成 %(vm_ref)s。"
+#: nova/virt/xenapi/vm_utils.py:218
+#, fuzzy, python-format
+msgid "Created VM"
+msgstr "_create: %s"
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "没有在实例 %s 找到VBD"
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "已经分离"
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "无法移除 VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "无法销毁 VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "创建了VBD %(vbd_ref)s 目的是为了虚拟机 %(vm_ref)s，VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "创建了VBD %(vbd_ref)s 目的是为了虚拟机 %(vm_ref)s，VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "无法销毁 VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6202,654 +6122,660 @@ msgstr ""
 "创建了 VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) 位置在"
 " %(sr_ref)s。"
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr "复制了 VDI %(vdi_ref)s ，对象来自VDI %(vdi_to_copy_ref)s ，位置在 %(sr_ref)s。"
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr "克隆了 VDI %(vdi_ref)s 对象来自VDI %(vdi_to_clone_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, fuzzy, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "未找到 %(vm_ref)s 的主VDI"
 
-#: nova/virt/xenapi/vm_utils.py:381
-#, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#: nova/virt/xenapi/vm_utils.py:379
+#, fuzzy, python-format
+msgid "Snapshotting with label '%(label)s'"
 msgstr "正在为虚拟机 %(vm_ref)s 做快照，采用标签是 “%(label)s”"
 
-#: nova/virt/xenapi/vm_utils.py:394
-#, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:392
+#, fuzzy, python-format
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr "已经创建了快照 %(template_vm_ref)s 快照对象是虚拟机 %(vm_ref)s。"
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "请求xapi 上传 %(vdi_uuids)s 作为镜像ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr "只能在ext类型的缺省本地存储库支持快速克隆。这个系统的存储库类型为 %(sr_type)s。忽略此 cow 标记。"
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr "请求 xapi 获取 vhd 镜像 %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr "xapi 'download_vhd' 返回“%(vdi_type)s”类型的VDI，其UUID为 “%(vdi_uuid)s”"
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr "image_size_bytes=%(size_bytes)d，allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr "镜像大小 %(size_bytes)d 超过instance_type所允许的小大 %(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:840
-#, python-format
-msgid "Fetching image %(image)s"
+#: nova/virt/xenapi/vm_utils.py:831
+#, fuzzy, python-format
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr "获取镜像 %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:841
-#, python-format
-msgid "Image Type: %s"
-msgstr "镜像类型：%s"
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
-msgstr "ISO：找到可能包含该ISO镜像的存储库"
-
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, fuzzy, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr "镜像 %(image)s 的大小：%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr "内核/内存盘镜像太大：%(vdi_size)d 字节，最大 %(max_size)d 字节"
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "将VDI %s 复制到dom0的/boot/guest下"
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "内核/内存盘 VDI %s 已销毁"
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
+#: nova/virt/xenapi/vm_utils.py:895
+#, fuzzy, python-format
+msgid "Failed to fetch glance image"
 msgstr "实例 %s：获取Glance镜像失败"
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "检测到 %(image_type_str)s 格式，目标是镜像 %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "为PV内核查询vdi %s"
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr "未知的镜像格式 %(disk_image_type)s"
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s 依然可用"
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr "(VM_UTILS) xenserver 虚拟机状态 -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr "(VM_UTILS) xenapi power_state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "重新扫描存储库 %s"
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr "标记sr_matching_filter '%s' 没有遵循格式要求"
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr "XenAPI无法找到安装客户实例的存储库。请检查你的配置或者配置标记'sr_matching_filter'"
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr "无法找到content-type ISO的存储库"
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr "ISO：正在查看存储库 %(sr_rec)s"
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr "ISO：非iso内容"
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO：iso content_type，没有 'i18n-key' 键"
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr "ISO：iso content_type，i18n-key的值不是 'local-storage-iso'"
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: 存储库符合标准"
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr "ISO: ISO, 正在查看是否是本地的主机"
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr "ISO: PBD %(pbd_ref)s 消失了"
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr "ISO: PBD匹配, 想要 %(pbd_rec)s, 目前有 %(host)s"
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr "ISO：含有本地PBD的存储库"
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr "无法为含服务器详细信息的虚拟机 %(vm_uuid)s 获取RRD XML：%(server)s。"
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr "无法获取包含服务器详细情况的RRD XML更新：%(server)s。"
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr "来自Xenserver无效的统计数据：%s"
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s 有父 %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr "父标识 %(parent_uuid)s 和原先的父标识 %(original_parent_uuid)s 不匹配，正在等待合并..."
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr "VHD coalesce 将要超过(%(max_attempts)d)，放弃中..."
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "等待设备 %s 创建超时"
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "插入VBD %s... "
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "插入VBD %s 完成。"
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s 作为 %(orig_dev)s 插入"
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr "VBD %(vbd_ref)s 插入错误的设备，重新映射为 %(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "正在销毁VDI为 %s 的 VBD "
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "已经销毁VDI为 %s 的 VBD"
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "对 %s 运行pygrub"
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "找到Xen内核 %s"
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "没有找到Xen内核。正在启动HVM。"
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr "分区："
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sectors"
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr "将分区表 %(primary_first)d %(primary_last)d 写入到 %(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "完成写入分区表 %s 。"
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr "安装在该镜像的XenServer工具可以进行网络注入。网络文件不会被操作。"
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr "该镜像有XenServer工具，但是不能进行网络注入"
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr "没有在该镜像上安装XenServer工具"
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr "直接操作接口文件"
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr "挂载文件系统失败(期望的是非Linux实例)：%s"
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
-#, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
+#, fuzzy, python-format
+msgid "Updating progress to %(progress)d"
 msgstr "将实例 '%(instance_uuid)s' 的进度更新到 %(progress)d"
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr "尝试过启动不存在的实例，实例的id %s 不正确"
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
-msgstr "启动实例 %s"
+#: nova/virt/xenapi/vmops.py:233
+#, fuzzy
+msgid "Starting instance"
+msgstr "正在启动虚拟机"
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "从 dom0 中移除内核/内存盘文件"
 
-#: nova/virt/xenapi/vmops.py:357
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
-msgstr "实例 %(instance_id)s 没有运行。"
+#: nova/virt/xenapi/vmops.py:358
+#, fuzzy
+msgid "Failed to spawn, rolling back"
+msgstr "在数据库更新卷失败"
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:462
+#, fuzzy, python-format
+msgid "Auto configuring disk, attempting to resize partition..."
 msgstr "正在自动配置实例 %(instance_uuid)s 的磁盘，尝试调整分区大小..."
 
-#: nova/virt/xenapi/vmops.py:519
-#, python-format
-msgid "Invalid value for injected_files: '%s'"
+#: nova/virt/xenapi/vmops.py:515
+#, fuzzy, python-format
+msgid "Invalid value for injected_files: %r"
 msgstr "injected_files无效的值：'%s'"
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr "注入文件路径：'%s'"
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr "设置管理员密码"
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr "重置网络"
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr "设置VCPU 权重"
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
-msgstr "启动虚拟机 %s..."
-
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
-msgstr "生产 VM %(instance_uuid)s 它是由 %(vm_ref)s 创建的。"
+#: nova/virt/xenapi/vmops.py:544
+#, fuzzy
+msgid "Starting VM"
+msgstr "重启xvp"
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr "%(hypervisor)s/%(os)s/%(architecture)s 最新的agent build 是 %(version)s 版本"
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr "没有找到 %(hypervisor)s/%(os)s/%(architecture)s 的代理创建"
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
-msgstr "实例 %s：等待运行"
-
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
-msgstr "实例 %s：运行"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr "查询代理版本"
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "实例代理版本：%s"
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr "把代理更新为 %s"
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr "无法为 '%s' 确定opaque_ref。"
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+#, fuzzy, python-format
+msgid "Finished snapshot and upload for VM"
 msgstr "快照完毕并为虚拟机 %s 上传"
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+#, fuzzy, python-format
+msgid "Starting snapshot for VM"
 msgstr "开始为虚拟机 %s 快照"
 
-#: nova/virt/xenapi/vmops.py:692
-#, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#: nova/virt/xenapi/vmops.py:686
+#, fuzzy, python-format
+msgid "Unable to Snapshot instance: %(exc)s"
 msgstr "无法为实例 %(instance_uuid)s 快照：%(exc)s"
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr "将 vhd 转移到新主机失败"
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "将 VDI %(cow_uuid)s 由 %(old_gb)dGB 调小到  %(new_gb)dGB"
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "将 VDI %(vdi_uuid)s 由 %(old_gb)dGB 调大到  %(new_gb)dGB"
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+#, fuzzy, python-format
+msgid "Resize complete"
 msgstr "调整实例 %s 的大小完毕"
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr "查询代理版本失败：%(resp)r"
 
-#: nova/virt/xenapi/vmops.py:955
-#, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#: nova/virt/xenapi/vmops.py:949
+#, fuzzy, python-format
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr "domid 由 %(olddomid)s 改变为 %(newdomid)s"
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr "更新代理失败：%(resp)r"
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr "交换钥匙失败：%(resp)r"
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr "更新密码失败：%(resp)r"
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr "注入文件失败：%(resp)r"
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+#, fuzzy, python-format
+msgid "VM already halted, skipping shutdown..."
 msgstr "虚拟机 %(instance_uuid)s 已经终止，跳过关闭..."
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
-msgstr "为实例 %(instance_uuid)s 关闭虚拟机"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr "无法为虚拟机找到VBD"
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+#, fuzzy, python-format
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr "实例 %(instance_uuid)s 使用RAW或者VHD，跳过内核和内存盘的删除"
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "实例拥有内核或者内存盘，但不是二者均有"
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr "内核/内存盘文件移除了"
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
-msgstr "实例 %(instance_uuid)s 销毁了"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
-msgstr "正在为实例%(instance_uuid)s 销毁虚拟机"
+#: nova/virt/xenapi/vmops.py:1147
+#, fuzzy
+msgid "Destroying VM"
+msgstr "重启xvp"
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr "虚拟机不存在，跳过销毁..."
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "实例已处于救援模式：%s"
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr "找到%(instance_count)d个超过%(timeout)d秒悬挂的重启"
 
-#: nova/virt/xenapi/vmops.py:1315
-#, python-format
-msgid "Automatically hard rebooting %d"
+#: nova/virt/xenapi/vmops.py:1300
+#, fuzzy, python-format
+msgid "Automatically hard rebooting"
 msgstr "自动冷重启 %d"
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1363
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1374
+#, fuzzy, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr "为实例 %(instance_uuid)s 关闭虚拟机"
+
+#: nova/virt/xenapi/vmops.py:1379
+#, fuzzy, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr "没有找到实例 %(instance_id)s"
+
+#: nova/virt/xenapi/vmops.py:1383
+#, fuzzy
+msgid "In ERROR state"
+msgstr "节点处于未知的错误状态。"
+
+#: nova/virt/xenapi/vmops.py:1389
+#, python-format
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "Instance for migration %d not found, skipping"
-msgstr "没有找到为迁移 %d 的实例，正在跳过"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
+#: nova/virt/xenapi/vmops.py:1418
 msgid "Could not get bandwidth info."
 msgstr "无法得到带宽信息"
 
-#: nova/virt/xenapi/vmops.py:1461
-#, python-format
-msgid "injecting network info to xs for vm: |%s|"
+#: nova/virt/xenapi/vmops.py:1469
+#, fuzzy, python-format
+msgid "Injecting network info to xenstore"
 msgstr "为虚拟机注入网络信息到xs：|%s|"
 
-#: nova/virt/xenapi/vmops.py:1479
-#, python-format
-msgid "creating vif(s) for vm: |%s|"
-msgstr "正在为虚拟机创建 vif(s)：|%s|"
+#: nova/virt/xenapi/vmops.py:1483
+#, fuzzy
+msgid "Creating vifs"
+msgstr "正在创建镜像"
 
-#: nova/virt/xenapi/vmops.py:1488
-#, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1492
+#, fuzzy, python-format
+msgid "Creating VIF for network %(network_ref)s"
 msgstr "正在为虚拟机 %(vm_ref)s，网络 %(network_ref)s 创建VIF。"
 
-#: nova/virt/xenapi/vmops.py:1491
-#, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
-msgstr "创建VIF %(vif_ref)s 是为了虚拟机 %(vm_ref)s，网络 %(network_ref)s。"
+#: nova/virt/xenapi/vmops.py:1495
+#, 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:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+#, fuzzy, python-format
+msgid "Injecting hostname to xenstore"
 msgstr "为虚拟机注入hostname到xs：|%s|"
 
-#: nova/virt/xenapi/vmops.py:1582
-#, python-format
+#: nova/virt/xenapi/vmops.py:1545
+#, fuzzy, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 "%(method)s 的代理调用返回无效的响应：%(ret)r。虚拟机id=%(instance_uuid)s; path=%(path)s; "
 "args=%(addl_args)r"
 
-#: nova/virt/xenapi/vmops.py:1604
-#, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+#: nova/virt/xenapi/vmops.py:1566
+#, 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:1608
-#, python-format
+#: nova/virt/xenapi/vmops.py:1570
+#, fuzzy, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"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:1613
-#, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
-msgstr "%(method)s 的调用返回错误：%(e)s。虚拟机id=%(instance_uuid)s; args=%(args)r"
+#: nova/virt/xenapi/vmops.py:1575
+#, 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:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL错误：%s"
@@ -7137,72 +7063,72 @@ msgstr "必须可用"
 msgid "Volume Snapshot status must be available or error"
 msgstr "卷组状态必须可获取"
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr "从失败的执行中恢复。尝试编号 %s"
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr "卷组 %s 不存在"
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr "跳过ensure_export。没有为卷提供iscsi_target：%d"
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr "跳过remove_export。没有为卷提供iscsi_target：%d"
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr "跳过remove_export。没有为卷导出iscsi_target：%d"
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr "采用discovery，ISCSI provider_location 没有存储"
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr "无法为卷 %s 找到 iSCSI 导出"
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr "ISCSI Discovery：找到 %s"
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr "无法确认导出的卷id：%(volume_id)s。"
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr "FAKE ISCSI: %s"
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr "RBD没有池 %s"
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr "Sheepdog 没有工作：%s"
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr "Sheepdog 没有工作"
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr "LoggingVolumeDriver: %s"
@@ -7720,8 +7646,38 @@ msgstr ""
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr "无法不丢失数据地降级"
 
-#~ msgid "Instance %(instance_id)s not found"
-#~ msgstr "没有找到实例 %(instance_id)s"
+#~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr "%(fl_host)s:%(fl_port)d上的AMQP服务器不可达：%(e)s。 %(fl_intv)d 秒钟后再尝试。"
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr "%(tries)d 次尝试后依然无法连接到AMQP服务器。正在关闭。"
+
+#~ msgid "Reconnected to queue"
+#~ msgstr "重新连接队列"
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr "从队列获取消息失败：%s"
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr "为%s初始化适配器消费者(Adapter Consumer)"
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr "\"%(exchange)s\" fanout exchange用路由密钥 \"%(key)s\" 创建的"
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr "处理消费者出现异常"
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr "正在创建 \"%(exchange)s\" fanout exchange"
+
+#~ msgid "topic is %s"
+#~ msgstr "主题是 %s"
+
+#~ msgid "message %s"
+#~ msgstr "消息 %s"
 
 #~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
@@ -7798,6 +7754,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr "\t MostAvailCap：最佳主机： %(best_host)s。 (可用 %(max_avail)s %(type_str)s)"
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr "(%(nm)s) 发布 (键：%(routing_key)s) %(message)s"
+
+#~ msgid "Publishing to route %s"
+#~ msgstr "发布并路由到 %s"
+
+#~ msgid "Declaring queue %s"
+#~ msgstr "正在声明队列 %s"
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr "正在声明交换(exchange) %s"
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr "把队列 %(queue)s 绑定到 %(exchange)s 采用的键是 %(routing_key)s"
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr "从队列 %(queue)s 取消息：%(message)s"
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr "测试：模拟错误的 VSA 名称。抛出异常"
 
@@ -7859,6 +7833,12 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr "nwfilter(%(instance_secgroup_filter_name)s) 未找到"
 
+#~ msgid "Created VM %s..."
+#~ msgstr "创建虚拟机 %s ..."
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr "已经将虚拟机 %(instance_name)s 创建成 %(vm_ref)s。"
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr "正在为虚拟机 %(vm_ref)s 创建一个特定的CDROM VBD，  VDI %(vdi_ref)s ... "
 
@@ -7867,6 +7847,12 @@ msgstr ""
 #~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
 #~ msgstr "已经创建了一个基于CDROM 的VBD %(vbd_ref)s，目的是为虚拟机 %(vm_ref)s，VDI %(vdi_ref)s。"
 
+#~ msgid "Image Type: %s"
+#~ msgstr "镜像类型：%s"
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr "ISO：找到可能包含该ISO镜像的存储库"
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "正在为VDI%s创建VBD "
 
@@ -7891,6 +7877,9 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr "忽略 XenAPI.Failure %s"
 
+#~ msgid "Starting instance %s"
+#~ msgstr "启动实例 %s"
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr "实例 %s：生产失败"
 
@@ -7900,6 +7889,18 @@ msgstr ""
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr "实例 %s：生产失败 - 无法创建虚拟机"
 
+#~ msgid "Starting VM %s..."
+#~ msgstr "启动虚拟机 %s..."
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr "生产 VM %(instance_uuid)s 它是由 %(vm_ref)s 创建的。"
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr "实例 %s：等待运行"
+
+#~ msgid "Instance %s: running"
+#~ msgstr "实例 %s：运行"
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr "将要移除的资源：%s"
 
@@ -7912,6 +7913,27 @@ msgstr ""
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr "正在为实例 %(instance_uuid)s 销毁 VDIs"
 
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr "实例 %(instance_uuid)s 销毁了"
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr "正在为实例%(instance_uuid)s 销毁虚拟机"
+
+#~ msgid "Instance for migration %d not found, skipping"
+#~ msgstr "没有找到为迁移 %d 的实例，正在跳过"
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr "正在为虚拟机创建 vif(s)：|%s|"
+
+#~ msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr "创建VIF %(vif_ref)s 是为了虚拟机 %(vm_ref)s，网络 %(network_ref)s。"
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr "%(method)s 的调用返回错误：%(e)s。虚拟机id=%(instance_uuid)s; args=%(args)r"
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr "为虚拟机 %(vm_ref)s ，VDI %(vdi_ref)s 创建VBD... "
 
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index e9faa1794..dbfc40576 100644
--- a/nova/locale/zh_TW/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_TW/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-01 23:03+0000\n"
+"POT-Creation-Date: 2012-04-08 23:04+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"
@@ -1143,158 +1143,158 @@ msgstr ""
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:78
+#: nova/utils.py:79
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:164
+#: nova/utils.py:165
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:209
+#: nova/utils.py:210
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:219
+#: nova/utils.py:220
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:235 nova/utils.py:314
+#: nova/utils.py:236 nova/utils.py:315
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:248
+#: nova/utils.py:249
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:291
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:292
+#: nova/utils.py:293
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:296
+#: nova/utils.py:297
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:351
+#: nova/utils.py:352
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:533
+#: nova/utils.py:534
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:536
+#: nova/utils.py:537
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:647
+#: nova/utils.py:648
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:658
+#: nova/utils.py:659
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:708
+#: nova/utils.py:709
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:926
+#: nova/utils.py:927
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:930
+#: nova/utils.py:931
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:934
+#: nova/utils.py:935
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:941
+#: nova/utils.py:942
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:1000
+#: nova/utils.py:1001
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1007
+#: nova/utils.py:1008
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:1022
+#: nova/utils.py:1023
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1027
+#: nova/utils.py:1028
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1138
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1168
+#: nova/utils.py:1169
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1297
+#: nova/utils.py:1298
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1329
+#: nova/utils.py:1330
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1448
+#: nova/utils.py:1461
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1450
+#: nova/utils.py:1463
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1482
+#: nova/utils.py:1495
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1484
+#: nova/utils.py:1497
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1668
+#: nova/utils.py:1681
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2382,7 +2382,7 @@ msgstr ""
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe.py:139
+#: nova/api/openstack/compute/contrib/cloudpipe.py:146
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try "
 "again in a few minutes"
@@ -3768,37 +3768,42 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:294 nova/network/manager.py:490
+#: nova/network/manager.py:291
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/manager.py:300 nova/network/manager.py:496
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:309
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:347
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:380
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:396
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:608
+#: nova/network/manager.py:614
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3806,41 +3811,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:654
+#: nova/network/manager.py:660
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:664
+#: nova/network/manager.py:670
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:772
+#: nova/network/manager.py:778
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:776
+#: nova/network/manager.py:782
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:890
+#: nova/network/manager.py:896
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:895
+#: nova/network/manager.py:901
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:924
+#: nova/network/manager.py:930
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1152
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3848,68 +3853,73 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1227
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:1244
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1229
+#: nova/network/manager.py:1248
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1237
+#: nova/network/manager.py:1256
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1242
+#: nova/network/manager.py:1261
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1246
+#: nova/network/manager.py:1265
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1249
+#: nova/network/manager.py:1268
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1312
+#: nova/network/manager.py:1331
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1315
+#: nova/network/manager.py:1334
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1326
+#: nova/network/manager.py:1345
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1385
+#: nova/network/manager.py:1404
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1404
+#: nova/network/manager.py:1423
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1813
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1820
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4070,51 +4080,51 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
+#: nova/rpc/amqp.py:146
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
+#: nova/rpc/amqp.py:188
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
+#: nova/rpc/amqp.py:231
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
+#: nova/rpc/amqp.py:236
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
+#: nova/rpc/amqp.py:237
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
+#: nova/rpc/amqp.py:321
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
+#: nova/rpc/amqp.py:324
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
+#: nova/rpc/amqp.py:346
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
+#: nova/rpc/amqp.py:354
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
+#: nova/rpc/amqp.py:379
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4130,61 +4140,6 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
-#, python-format
-msgid ""
-"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
-"again in %(fl_intv)d seconds."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:203
-#, python-format
-msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:223
-msgid "Reconnected to queue"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:230
-#, python-format
-msgid "Failed to fetch message from queue: %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:238
-#, python-format
-msgid "Initing the Adapter Consumer for %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:337
-#, python-format
-msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:382
-msgid "Exception while processing consumer"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:419
-#, python-format
-msgid "Creating \"%(exchange)s\" fanout exchange"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:646
-#, python-format
-msgid "response %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:655
-#, python-format
-msgid "topic is %s"
-msgstr ""
-
-#: nova/rpc/impl_carrot.py:656
-#, python-format
-msgid "message %s"
-msgstr ""
-
 #: nova/rpc/impl_kombu.py:111
 msgid "Failed to process message... skipping it."
 msgstr ""
@@ -4416,36 +4371,6 @@ msgstr ""
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
-#: nova/testing/fake/rabbit.py:50
-#, python-format
-msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:54
-#, python-format
-msgid "Publishing to route %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:84
-#, python-format
-msgid "Declaring queue %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:90
-#, python-format
-msgid "Declaring exchange %s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:96
-#, python-format
-msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-msgstr ""
-
-#: nova/testing/fake/rabbit.py:133
-#, python-format
-msgid "Getting from %(queue)s: %(message)s"
-msgstr ""
-
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
@@ -4556,12 +4481,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:621
+#: nova/tests/test_xenapi.py:626
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:632
+#: nova/tests/test_xenapi.py:637
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -4698,14 +4623,14 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2013
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:396
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:2045
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2016
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:399
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:2048
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4734,16 +4659,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:100
+#: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4786,23 +4711,23 @@ msgid ""
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:454
+#: nova/virt/xenapi_conn.py:329 nova/virt/libvirt/connection.py:472
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:461
+#: nova/virt/xenapi_conn.py:460
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:491
+#: nova/virt/xenapi_conn.py:489
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:529
+#: nova/virt/xenapi_conn.py:527
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
+#: nova/virt/xenapi_conn.py:599 nova/virt/xenapi_conn.py:612
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5007,7 +4932,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1783
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1815
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5022,7 +4947,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2577
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2609
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5145,175 +5070,175 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:247
+#: nova/virt/libvirt/connection.py:265
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:286
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:370
+#: nova/virt/libvirt/connection.py:388
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:382
+#: nova/virt/libvirt/connection.py:400
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:393
+#: nova/virt/libvirt/connection.py:411
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:405
+#: nova/virt/libvirt/connection.py:423
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:417
+#: nova/virt/libvirt/connection.py:435
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:443
+#: nova/virt/libvirt/connection.py:461
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:536
+#: nova/virt/libvirt/connection.py:554
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:549
+#: nova/virt/libvirt/connection.py:567
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:692
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:674
+#: nova/virt/libvirt/connection.py:696
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:703
+#: nova/virt/libvirt/connection.py:725
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:739 nova/virt/libvirt/connection.py:883
+#: nova/virt/libvirt/connection.py:761 nova/virt/libvirt/connection.py:905
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:744
+#: nova/virt/libvirt/connection.py:766
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:845 nova/virt/xenapi/vmops.py:1371
+#: nova/virt/libvirt/connection.py:867 nova/virt/xenapi/vmops.py:1358
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:849 nova/virt/xenapi/vmops.py:1375
+#: nova/virt/libvirt/connection.py:871
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:896
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:888
+#: nova/virt/libvirt/connection.py:910
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:904
+#: nova/virt/libvirt/connection.py:926
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:956
+#: nova/virt/libvirt/connection.py:978
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "使用者並沒有管理者權力"
 
-#: nova/virt/libvirt/connection.py:992
+#: nova/virt/libvirt/connection.py:1020
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:996
+#: nova/virt/libvirt/connection.py:1024
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1000 nova/virt/libvirt/connection.py:1004
+#: nova/virt/libvirt/connection.py:1028 nova/virt/libvirt/connection.py:1032
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1122
+#: nova/virt/libvirt/connection.py:1153
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1307
+#: nova/virt/libvirt/connection.py:1339
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1317
+#: nova/virt/libvirt/connection.py:1349
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1349
+#: nova/virt/libvirt/connection.py:1381
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1626
+#: nova/virt/libvirt/connection.py:1658
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1630
+#: nova/virt/libvirt/connection.py:1662
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1647
+#: nova/virt/libvirt/connection.py:1679
 #, 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:1888
+#: nova/virt/libvirt/connection.py:1920
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1910
+#: nova/virt/libvirt/connection.py:1942
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1937
+#: nova/virt/libvirt/connection.py:1969
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2035
+#: nova/virt/libvirt/connection.py:2067
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2047
+#: nova/virt/libvirt/connection.py:2079
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5323,40 +5248,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2104
+#: nova/virt/libvirt/connection.py:2136
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2320
+#: nova/virt/libvirt/connection.py:2352
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2375
+#: nova/virt/libvirt/connection.py:2407
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2426
+#: nova/virt/libvirt/connection.py:2458
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2481
+#: nova/virt/libvirt/connection.py:2513
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2486
+#: nova/virt/libvirt/connection.py:2518
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2493
+#: nova/virt/libvirt/connection.py:2525
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2533
+#: nova/virt/libvirt/connection.py:2565
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5479,41 +5404,41 @@ msgstr ""
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:377
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:381
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:414
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:418
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:426
 msgid "Verification complete"
 msgstr ""
 
@@ -5536,19 +5461,19 @@ msgstr ""
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:158
+#: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:161
+#: nova/virt/libvirt/volume.py:166
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:173
+#: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -6065,714 +5990,698 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
-#, python-format
-msgid "Created VM %s..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:220
-#, python-format
-msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#: nova/virt/xenapi/vm_utils.py:218
+msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:247
+#: nova/virt/xenapi/vm_utils.py:245
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:264
+#: nova/virt/xenapi/vm_utils.py:262
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:267
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:270
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:277
+#: nova/virt/xenapi/vm_utils.py:275
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:288
+#: nova/virt/xenapi/vm_utils.py:286
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:307
+#: nova/virt/xenapi/vm_utils.py:305
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:310
+#: nova/virt/xenapi/vm_utils.py:308
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:321
+#: nova/virt/xenapi/vm_utils.py:319
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:338
+#: nova/virt/xenapi/vm_utils.py:336
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:347
+#: nova/virt/xenapi/vm_utils.py:345
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:381
+#: nova/virt/xenapi/vm_utils.py:379
 #, python-format
-msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:394
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
-msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:433
+#: nova/virt/xenapi/vm_utils.py:431
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:640
+#: nova/virt/xenapi/vm_utils.py:583
+#, python-format
+msgid "Creating blank HD of size %(req_size)d gigs"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:634
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:732
+#: nova/virt/xenapi/vm_utils.py:724
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:742
+#: nova/virt/xenapi/vm_utils.py:734
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:750
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:769
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:797
+#: nova/virt/xenapi/vm_utils.py:789
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:813
+#: nova/virt/xenapi/vm_utils.py:805
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:817
+#: nova/virt/xenapi/vm_utils.py:809
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:840
+#: nova/virt/xenapi/vm_utils.py:831
 #, python-format
-msgid "Fetching image %(image)s"
+msgid "Fetching image %(image)s, type %(image_type_str)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
-#, python-format
-msgid "Image Type: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:845
-msgid "ISO: Found sr possibly containing the ISO image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:854
+#: nova/virt/xenapi/vm_utils.py:844
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:862
+#: nova/virt/xenapi/vm_utils.py:853
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:879
+#: nova/virt/xenapi/vm_utils.py:870
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:892
+#: nova/virt/xenapi/vm_utils.py:884
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
-#, python-format
-msgid "instance %s: Failed to fetch glance image"
+#: nova/virt/xenapi/vm_utils.py:895
+msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:941
+#: nova/virt/xenapi/vm_utils.py:934
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:962
+#: nova/virt/xenapi/vm_utils.py:955
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1023
+#: nova/virt/xenapi/vm_utils.py:1016
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1059
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1068
+#: nova/virt/xenapi/vm_utils.py:1061
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1095
+#: nova/virt/xenapi/vm_utils.py:1088
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1108
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1143
+#: nova/virt/xenapi/vm_utils.py:1136
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1161
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1174
+#: nova/virt/xenapi/vm_utils.py:1167
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1175
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1177
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1187
+#: nova/virt/xenapi/vm_utils.py:1180
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1183
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1194
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1192
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1195
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1198
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1220
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1236
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1297
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1350
+#: nova/virt/xenapi/vm_utils.py:1343
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1424
+#: nova/virt/xenapi/vm_utils.py:1417
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1434
+#: nova/virt/xenapi/vm_utils.py:1427
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1469
+#: nova/virt/xenapi/vm_utils.py:1462
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1476
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1478
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1481
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1505
+#: nova/virt/xenapi/vm_utils.py:1498
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1518
+#: nova/virt/xenapi/vm_utils.py:1511
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1518
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1527
+#: nova/virt/xenapi/vm_utils.py:1520
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1533
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1546
+#: nova/virt/xenapi/vm_utils.py:1539
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1572
+#: nova/virt/xenapi/vm_utils.py:1565
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1585
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1639
+#: nova/virt/xenapi/vm_utils.py:1632
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1671
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1721
+#: nova/virt/xenapi/vm_utils.py:1714
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1729
+#: nova/virt/xenapi/vm_utils.py:1722
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1749
+#: nova/virt/xenapi/vm_utils.py:1742
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1751
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:722
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:230
+#: nova/virt/xenapi/vmops.py:231
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:232
-#, python-format
-msgid "Starting instance %s"
+#: nova/virt/xenapi/vmops.py:233
+msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:302
+#: nova/virt/xenapi/vmops.py:303
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
-#, python-format
-msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
+#: nova/virt/xenapi/vmops.py:358
+msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:464
-#, python-format
-msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to "
-"resize partition..."
+#: nova/virt/xenapi/vmops.py:443
+msgid "Detected ISO image type, creating blank VM for install"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:462
+msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:515
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:520
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:527
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:534
+#: nova/virt/xenapi/vmops.py:531
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:541
+#: nova/virt/xenapi/vmops.py:538
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
-#, python-format
-msgid "Starting VM %s..."
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:550
-#, python-format
-msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#: nova/virt/xenapi/vmops.py:544
+msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:560
+#: nova/virt/xenapi/vmops.py:554
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:567
-#, python-format
-msgid "Instance %s: waiting for running"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:576
-#, python-format
-msgid "Instance %s: running"
+#: nova/virt/xenapi/vmops.py:561
+msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:580
+#: nova/virt/xenapi/vmops.py:573
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:583
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:587
+#: nova/virt/xenapi/vmops.py:581
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:621
+#: nova/virt/xenapi/vmops.py:616
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:675
-#, python-format
-msgid "Finished snapshot and upload for VM %s"
+#: nova/virt/xenapi/vmops.py:670
+msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:683
-#, python-format
-msgid "Starting snapshot for VM %s"
+#: nova/virt/xenapi/vmops.py:677
+msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:692
-#, python-format
-msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:686
+#, fuzzy, python-format
+msgid "Unable to Snapshot instance: %(exc)s"
+msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/xenapi/vmops.py:708
+#: nova/virt/xenapi/vmops.py:702
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:770
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:893
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:906
-#, python-format
-msgid "Resize instance %s complete"
+#: nova/virt/xenapi/vmops.py:901
+msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:928
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:955
+#: nova/virt/xenapi/vmops.py:949
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
+msgid "domid changed from %(domid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:994
+#: nova/virt/xenapi/vmops.py:983
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1010
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1037
+#: nova/virt/xenapi/vmops.py:1023
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1046
-#, python-format
-msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#: nova/virt/xenapi/vmops.py:1032
+msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1050
-#, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1036
+msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1069
+#: nova/virt/xenapi/vmops.py:1054
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1112
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+#: nova/virt/xenapi/vmops.py:1097
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1119
+#: nova/virt/xenapi/vmops.py:1104
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1126
+#: nova/virt/xenapi/vmops.py:1111
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1136
-#, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+#: nova/virt/xenapi/vmops.py:1121
+msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1163
-#, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
+#: nova/virt/xenapi/vmops.py:1147
+msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1237
+#: nova/virt/xenapi/vmops.py:1222
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1311
+#: nova/virt/xenapi/vmops.py:1296
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1315
+#: nova/virt/xenapi/vmops.py:1300
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1363
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1374
 #, python-format
-msgid "Automatically hard rebooting %d"
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1380
+#: nova/virt/xenapi/vmops.py:1379
 #, python-format
-msgid "Instance for migration %d not found, skipping"
+msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
-msgid "Could not get bandwidth info."
+#: nova/virt/xenapi/vmops.py:1383
+msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1461
+#: nova/virt/xenapi/vmops.py:1389
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1479
+#: nova/virt/xenapi/vmops.py:1396
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1418
+msgid "Could not get bandwidth info."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1469
+msgid "Injecting network info to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1483
+msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1488
+#: nova/virt/xenapi/vmops.py:1492
 #, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1495
 #, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
 #: nova/virt/xenapi/vmops.py:1520
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1582
+#: nova/virt/xenapi/vmops.py:1545
 #, python-format
 msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1604
+#: nova/virt/xenapi/vmops.py:1566
 #, python-format
-msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1608
+#: nova/virt/xenapi/vmops.py:1570
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
-" id=%(instance_uuid)s; args=%(args)r"
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1613
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
-" args=%(args)r"
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1661
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -7060,72 +6969,72 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "Volume 狀態需要可被使用"
 
-#: nova/volume/driver.py:89
+#: nova/volume/driver.py:96
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:99
+#: nova/volume/driver.py:106
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:263
+#: nova/volume/driver.py:270
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:311
+#: nova/volume/driver.py:318
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:320
+#: nova/volume/driver.py:327
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:330
+#: nova/volume/driver.py:337
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:377
+#: nova/volume/driver.py:384
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:381
+#: nova/volume/driver.py:388
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: nova/volume/driver.py:459
+#: nova/volume/driver.py:466
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: nova/volume/driver.py:486
+#: nova/volume/driver.py:493
 #, python-format
 msgid "FAKE ISCSI: %s"
 msgstr ""
 
-#: nova/volume/driver.py:498
+#: nova/volume/driver.py:505
 #, python-format
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: nova/volume/driver.py:568
+#: nova/volume/driver.py:579
 #, python-format
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:570
+#: nova/volume/driver.py:581
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:669 nova/volume/driver.py:674
+#: nova/volume/driver.py:680 nova/volume/driver.py:685
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
@@ -7730,6 +7639,42 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "AMQP server on %(fl_host)s:%(fl_port)d is "
+#~ "unreachable: %(e)s. Trying again in "
+#~ "%(fl_intv)d seconds."
+#~ msgstr ""
+
+#~ msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
+#~ msgstr ""
+
+#~ msgid "Reconnected to queue"
+#~ msgstr ""
+
+#~ msgid "Failed to fetch message from queue: %s"
+#~ msgstr ""
+
+#~ msgid "Initing the Adapter Consumer for %s"
+#~ msgstr ""
+
+#~ msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
+#~ msgstr ""
+
+#~ msgid "Exception while processing consumer"
+#~ msgstr ""
+
+#~ msgid "Creating \"%(exchange)s\" fanout exchange"
+#~ msgstr ""
+
+#~ msgid "response %s"
+#~ msgstr ""
+
+#~ msgid "topic is %s"
+#~ msgstr ""
+
+#~ msgid "message %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Cannot confirm tmpfile at %(ipath)s is"
 #~ " on same shared storage between "
 #~ "%(src)s and %(dest)s."
@@ -7820,6 +7765,24 @@ msgstr ""
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
 
+#~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
+#~ msgstr ""
+
+#~ msgid "Publishing to route %s"
+#~ msgstr ""
+
+#~ msgid "Declaring queue %s"
+#~ msgstr ""
+
+#~ msgid "Declaring exchange %s"
+#~ msgstr ""
+
+#~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
+#~ msgstr ""
+
+#~ msgid "Getting from %(queue)s: %(message)s"
+#~ msgstr ""
+
 #~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
@@ -7928,6 +7891,12 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Created VM %s..."
+#~ msgstr ""
+
+#~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
+#~ msgstr ""
+
 #~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""
 
@@ -7939,9 +7908,27 @@ msgstr ""
 #~ msgid "No primary VDI found for%(vm_ref)s"
 #~ msgstr ""
 
+#~ msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
+#~ msgstr ""
+
+#~ msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Fetching image %(image)s"
+#~ msgstr ""
+
+#~ msgid "Image Type: %s"
+#~ msgstr ""
+
+#~ msgid "ISO: Found sr possibly containing the ISO image"
+#~ msgstr ""
+
 #~ msgid "Size for image %(image)s:%(virtual_size)d"
 #~ msgstr ""
 
+#~ msgid "instance %s: Failed to fetch glance image"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -7966,6 +7953,9 @@ msgstr ""
 #~ msgid "Ignoring XenAPI.Failure %s"
 #~ msgstr ""
 
+#~ msgid "Starting instance %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7975,6 +7965,27 @@ msgstr ""
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Auto configuring disk for instance "
+#~ "%(instance_uuid)s, attempting to resize "
+#~ "partition..."
+#~ msgstr ""
+
+#~ msgid "Invalid value for injected_files: '%s'"
+#~ msgstr ""
+
+#~ msgid "Starting VM %s..."
+#~ msgstr ""
+
+#~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
+#~ msgstr ""
+
+#~ msgid "Instance %s: waiting for running"
+#~ msgstr ""
+
+#~ msgid "Instance %s: running"
+#~ msgstr ""
+
 #~ msgid "Resources to remove:%s"
 #~ msgstr ""
 
@@ -7984,9 +7995,89 @@ msgstr ""
 #~ msgid "Skipping VDI destroy for %s"
 #~ msgstr ""
 
+#~ msgid "Finished snapshot and upload for VM %s"
+#~ msgstr ""
+
+#~ msgid "Starting snapshot for VM %s"
+#~ msgstr ""
+
+#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
+#~ msgstr ""
+
+#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize instance %s complete"
+#~ msgstr ""
+
+#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
+#~ msgstr ""
+
+#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
+#~ msgstr ""
+
+#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Instance %(instance_uuid)s using RAW or "
+#~ "VHD, skipping kernel and ramdisk "
+#~ "deletion"
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s VM destroyed"
+#~ msgstr ""
+
+#~ msgid "Destroying VM for Instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "creating vif(s) for vm: |%s|"
+#~ msgstr ""
+
+#~ msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "The call to %(method)s returned an "
+#~ "error: %(e)s. VM id=%(instance_uuid)s; "
+#~ "args=%(args)r"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 #~ msgstr ""