diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index 7fc4996a7d1f..3fb3972980a6 100644
--- a/nova/locale/nova.pot
+++ b/nova/locale/nova.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nova 2013.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-01-05 00:07+0000\n"
+"POT-Creation-Date: 2013-01-06 00:03+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"
@@ -3456,7 +3456,7 @@ msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
 #: nova/compute/manager.py:1090 nova/compute/manager.py:2053
-#: nova/compute/manager.py:3381
+#: nova/compute/manager.py:3388
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
@@ -3654,167 +3654,167 @@ msgstr ""
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2468
 #, python-format
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2539
+#: nova/compute/manager.py:2541
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2600
+#: nova/compute/manager.py:2602
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2628
+#: nova/compute/manager.py:2630
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2681
+#: nova/compute/manager.py:2683
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2683
+#: nova/compute/manager.py:2685
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2699
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2840
+#: nova/compute/manager.py:2842
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2884
+#: nova/compute/manager.py:2887
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2893
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2899
+#: nova/compute/manager.py:2902
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2906
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2910
+#: nova/compute/manager.py:2913
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2917
+#: nova/compute/manager.py:2920
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2925
+#: nova/compute/manager.py:2928
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2940
+#: nova/compute/manager.py:2943
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:2958
+#: nova/compute/manager.py:2961
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2981
+#: nova/compute/manager.py:2984
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3095
+#: nova/compute/manager.py:3102
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3113
+#: nova/compute/manager.py:3120
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3142
+#: nova/compute/manager.py:3149
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3148 nova/compute/manager.py:3186
+#: nova/compute/manager.py:3155 nova/compute/manager.py:3193
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3180
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3216
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3221 nova/compute/manager.py:3232
-#: nova/compute/manager.py:3246
+#: nova/compute/manager.py:3228 nova/compute/manager.py:3239
+#: nova/compute/manager.py:3253
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3226
+#: nova/compute/manager.py:3233
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3239
+#: nova/compute/manager.py:3246
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3255
+#: nova/compute/manager.py:3262
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3263
+#: nova/compute/manager.py:3270
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3285
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:3334
+#: nova/compute/manager.py:3341
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:3341
+#: nova/compute/manager.py:3348
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:3348
+#: nova/compute/manager.py:3355
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
@@ -3903,14 +3903,14 @@ msgstr ""
 msgid "Instance not resizing, skipping migration."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:535
+#: nova/compute/resource_tracker.py:538
 #, python-format
 msgid ""
 "Detected running orphan instance: %(uuid)s (consuming %(memory_mb)s MB "
 "memory"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:548
+#: nova/compute/resource_tracker.py:551
 #, python-format
 msgid "Missing keys: %s"
 msgstr ""
@@ -3929,12 +3929,12 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/manager.py:59
+#: nova/conductor/manager.py:62
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:188
+#: nova/conductor/manager.py:198
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4310,69 +4310,69 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:324
+#: nova/network/manager.py:326
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:333 nova/network/manager.py:604
+#: nova/network/manager.py:335 nova/network/manager.py:606
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:348
+#: nova/network/manager.py:350
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:412
+#: nova/network/manager.py:414
 msgid "Floating IP is not associated. Ignore."
 msgstr ""
 
-#: nova/network/manager.py:430
+#: nova/network/manager.py:432
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:434
+#: nova/network/manager.py:436
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:455
+#: nova/network/manager.py:457
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate floating IP"
 msgstr ""
 
-#: nova/network/manager.py:517
+#: nova/network/manager.py:519
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:751
+#: nova/network/manager.py:753
 #, python-format
 msgid "Starting migration network for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/network/manager.py:758
+#: nova/network/manager.py:760
 #, python-format
 msgid ""
 "Floating ip address |%(address)s| no longer belongs to instance "
 "%(instance_uuid)s. Will notmigrate it "
 msgstr ""
 
-#: nova/network/manager.py:788
+#: nova/network/manager.py:790
 #, python-format
 msgid "Finishing migration network for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/network/manager.py:796
+#: nova/network/manager.py:798
 #, python-format
 msgid ""
 "Floating ip address |%(address)s| no longer belongs to instance "
 "%(instance_uuid)s. Will notsetup it."
 msgstr ""
 
-#: nova/network/manager.py:843
+#: nova/network/manager.py:845
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4380,39 +4380,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:889
+#: nova/network/manager.py:891
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:899
+#: nova/network/manager.py:901
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:1015
+#: nova/network/manager.py:1017
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:1019
+#: nova/network/manager.py:1021
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:1146
+#: nova/network/manager.py:1148
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:1151
+#: nova/network/manager.py:1153
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:1187
+#: nova/network/manager.py:1189
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1417
+#: nova/network/manager.py:1419
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4420,89 +4420,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1505
+#: nova/network/manager.py:1507
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1524
+#: nova/network/manager.py:1526
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1528
+#: nova/network/manager.py:1530
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1536
+#: nova/network/manager.py:1538
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1541
+#: nova/network/manager.py:1543
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1545
+#: nova/network/manager.py:1547
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1548
+#: nova/network/manager.py:1550
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1567
+#: nova/network/manager.py:1569
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1591
+#: nova/network/manager.py:1593
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1611
+#: nova/network/manager.py:1613
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1692
+#: nova/network/manager.py:1694
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1695
+#: nova/network/manager.py:1697
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1706
+#: nova/network/manager.py:1708
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1763
+#: nova/network/manager.py:1765
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1783
+#: nova/network/manager.py:1785
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2306
+#: nova/network/manager.py:2308
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2313
+#: nova/network/manager.py:2315
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -5185,9 +5185,9 @@ msgid ""
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
-#: nova/scheduler/filters/retry_filter.py:38
+#: nova/scheduler/filters/retry_filter.py:41
 #, python-format
-msgid "Previously tried hosts: %(hosts)s.  (host=%(host)s)"
+msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
 msgstr ""
 
 #: nova/scheduler/filters/trusted_filter.py:200
@@ -6268,7 +6268,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:163 nova/virt/libvirt/driver.py:3106
+#: nova/virt/hyperv/hostops.py:163 nova/virt/libvirt/driver.py:3105
 #: nova/virt/xenapi/host.py:149
 msgid "Updating host stats"
 msgstr ""
@@ -6945,7 +6945,7 @@ msgstr ""
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1242
+#: nova/virt/libvirt/driver.py:1241
 msgid "Creating image"
 msgstr ""
 
@@ -6985,73 +6985,73 @@ msgid ""
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1820
+#: nova/virt/libvirt/driver.py:1819
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1823
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1841
+#: nova/virt/libvirt/driver.py:1840
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1995
+#: nova/virt/libvirt/driver.py:1994
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2112
+#: nova/virt/libvirt/driver.py:2111
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2195
+#: nova/virt/libvirt/driver.py:2194
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2219
+#: nova/virt/libvirt/driver.py:2218
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2223
+#: nova/virt/libvirt/driver.py:2222
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2339
+#: nova/virt/libvirt/driver.py:2338
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2347
+#: nova/virt/libvirt/driver.py:2346
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2384
+#: nova/virt/libvirt/driver.py:2383
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2409
+#: nova/virt/libvirt/driver.py:2408
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2421
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -7061,51 +7061,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2437
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2486
+#: nova/virt/libvirt/driver.py:2485
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2558
+#: nova/virt/libvirt/driver.py:2557
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2647
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2763
+#: nova/virt/libvirt/driver.py:2762
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2811
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2861
+#: nova/virt/libvirt/driver.py:2860
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2919
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2927
+#: nova/virt/libvirt/driver.py:2926
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2978
+#: nova/virt/libvirt/driver.py:2977
 msgid "Starting finish_revert_migration"
 msgstr ""