diff --git a/nova/locale/en_US/LC_MESSAGES/nova.po b/nova/locale/en_US/LC_MESSAGES/nova.po
index 7da810ba563f..74873ef96cdb 100644
--- a/nova/locale/en_US/LC_MESSAGES/nova.po
+++ b/nova/locale/en_US/LC_MESSAGES/nova.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
 "POT-Creation-Date: 2012-10-29 00:01+0000\n"
-"PO-Revision-Date: 2012-09-13 10:30+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"PO-Revision-Date: 2013-01-21 18:28+0000\n"
+"Last-Translator: Jeremy Stanley <fungi@yuggoth.org>\n"
 "Language-Team: en_US <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
@@ -137,9 +137,9 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Policy doesn't allow %(action)s to be performed."
 
 #: nova/exception.py:214
-#, fuzzy, python-format
+#, python-format
 msgid "Image %(image_id)s is not active."
-msgstr "Image %(image_id)s could not be found."
+msgstr "Image %(image_id)s is not active."
 
 #: nova/exception.py:218
 #, python-format
@@ -195,9 +195,8 @@ msgid "Invalid metadata"
 msgstr "Invalid metadata"
 
 #: nova/exception.py:267
-#, fuzzy
 msgid "Invalid metadata size"
-msgstr "Invalid metadata key"
+msgstr "Invalid metadata size"
 
 #: nova/exception.py:271
 #, python-format
@@ -398,9 +397,9 @@ msgid "Resource could not be found."
 msgstr "Resource could not be found."
 
 #: nova/exception.py:438
-#, fuzzy, python-format
+#, python-format
 msgid "Could not find driver for compute_driver %(name)s"
-msgstr "Could not find driver for connection_type %(name)s"
+msgstr "Could not find driver for compute_driver %(name)s"
 
 #: nova/exception.py:442
 #, python-format
@@ -624,7 +623,7 @@ msgstr ""
 #: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
-msgstr ""
+msgstr "More than one instance is associated with fixed ip address '%(address)s'."
 
 #: nova/exception.py:619
 #, python-format
@@ -665,14 +664,13 @@ msgid "Floating ip not found for host %(host)s."
 msgstr "Floating ip not found for host %(host)s."
 
 #: nova/exception.py:656
-#, fuzzy, python-format
+#, python-format
 msgid "Multiple floating ips are found for address %(address)s."
-msgstr "Floating ip not found for address %(address)s."
+msgstr "Multiple floating ips are found for address %(address)s."
 
 #: nova/exception.py:660
-#, fuzzy
 msgid "Floating ip pool not found."
-msgstr "No floating_ip found"
+msgstr "Floating ip pool not found."
 
 #: nova/exception.py:665
 msgid "Zero floating ips available."
@@ -699,7 +697,7 @@ msgstr "Interface %(interface)s not found."
 
 #: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
-msgstr ""
+msgstr "Cannot disassociate auto assigined floating ip"
 
 #: nova/exception.py:690
 #, python-format
@@ -965,14 +963,14 @@ msgid "Instance %(name)s already exists."
 msgstr "Instance %(name)s already exists."
 
 #: nova/exception.py:897
-#, fuzzy, python-format
+#, python-format
 msgid "Instance Type with name %(name)s already exists."
-msgstr "Instance Type %(name)s already exists."
+msgstr "Instance Type with name %(name)s already exists."
 
 #: nova/exception.py:901
-#, fuzzy, python-format
+#, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
-msgstr "Instance Type %(name)s already exists."
+msgstr "Instance Type with ID %(flavor_id)s already exists."
 
 #: nova/exception.py:905
 #, python-format
@@ -1194,9 +1192,9 @@ msgid "Instance %(instance_id)s could not be found."
 msgstr "Instance %(instance_id)s could not be found."
 
 #: nova/exception.py:1098
-#, fuzzy, python-format
+#, python-format
 msgid "Marker %(marker)s could not be found."
-msgstr "Image %(image_id)s could not be found."
+msgstr "Marker %(marker)s could not be found."
 
 #: nova/exception.py:1102
 #, python-format
@@ -1811,7 +1809,7 @@ msgstr "Floating ip is not associated."
 #: nova/api/ec2/cloud.py:1201
 #: nova/api/openstack/compute/contrib/floating_ips.py:100
 msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
+msgstr "Cannot disassociate auto assigned floating ip"
 
 #: nova/api/ec2/cloud.py:1228
 msgid "Image must be available"
@@ -2101,9 +2099,8 @@ msgid "Empty body provided in request"
 msgstr "Empty body provided in request"
 
 #: nova/api/openstack/wsgi.py:897
-#, fuzzy
 msgid "Invalid XML in request body"
-msgstr "Invalid request body"
+msgstr "Invalid XML in request body"
 
 #: nova/api/openstack/wsgi.py:916
 #, python-format
@@ -2649,9 +2646,9 @@ msgstr "Floating ip is not associated"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:151
 #: nova/api/openstack/compute/contrib/floating_ips.py:199
-#, fuzzy, python-format
+#, python-format
 msgid "Floating ip not found for id %s"
-msgstr "Floating ip not found for id %(id)s."
+msgstr "Floating ip not found for id %s"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:184
 #, python-format
@@ -2691,9 +2688,8 @@ msgstr "l3driver call to add floating ip failed"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:272
 #: nova/api/openstack/compute/contrib/floating_ips.py:301
-#, fuzzy
 msgid "floating ip not found"
-msgstr "No floating_ip found"
+msgstr "floating ip not found"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:275
 msgid "Error. Unable to associate floating ip"
@@ -2907,18 +2903,16 @@ msgid "Instance has had its instance_type removed from the DB"
 msgstr "Instance has had its instance_type removed from the DB"
 
 #: nova/api/openstack/volume/volumes.py:277
-#, fuzzy
 msgid "Invalid request body. 'volume' not found"
-msgstr "Invalid request body"
+msgstr "Invalid request body. 'volume' not found"
 
 #: nova/api/openstack/volume/volumes.py:307
-#, fuzzy
 msgid "Invalid request body. 'size' not found"
-msgstr "Invalid request body"
+msgstr "Invalid request body. 'size' not found"
 
 #: nova/api/openstack/volume/volumes.py:317
 msgid "Snapshot and image cannot be specified together."
-msgstr ""
+msgstr "Snapshot and image cannot be specified together."
 
 #: nova/api/openstack/volume/volumes.py:361
 #, python-format
@@ -2928,11 +2922,11 @@ msgstr "Removing options '%(bad_options)s' from query"
 #: nova/api/openstack/volume/contrib/admin_actions.py:72
 #, python-format
 msgid "Updating status of %(resource)s '%(id)s' to '%(status)s'"
-msgstr ""
+msgstr "Updating status of %(resource)s '%(id)s' to '%(status)s'"
 
 #: nova/api/openstack/volume/contrib/volume_actions.py:90
 msgid "No image_name was specified in request."
-msgstr ""
+msgstr "No image_name was specified in request."
 
 #: nova/cloudpipe/pipelib.py:44
 msgid "Instance type for vpn instances"
@@ -3031,9 +3025,8 @@ msgid "No host for instance, deleting immediately"
 msgstr "No host for instance, deleting immediately"
 
 #: nova/compute/api.py:929
-#, fuzzy
 msgid "host for instance is down, deleting from database"
-msgstr "No host for instance, deleting immediately"
+msgstr "host for instance is down, deleting from database"
 
 #: nova/compute/api.py:950
 msgid "Going to try to terminate instance"
@@ -3200,7 +3193,7 @@ msgstr "Possibly task preempted."
 
 #: nova/compute/manager.py:230
 msgid "Compute driver option required, but not specified"
-msgstr ""
+msgstr "Compute driver option required, but not specified"
 
 #: nova/compute/manager.py:233
 #, python-format
@@ -3243,9 +3236,8 @@ msgid "Setting up bdm %s"
 msgstr "Setting up bdm %s"
 
 #: nova/compute/manager.py:518
-#, fuzzy
 msgid "Failed to dealloc network for deleted instance"
-msgstr "Deallocating network for instance"
+msgstr "Failed to dealloc network for deleted instance"
 
 #: nova/compute/manager.py:550
 #, python-format
@@ -3343,7 +3335,7 @@ msgstr "terminating bdm %s"
 #: nova/compute/manager.py:927
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
-msgstr ""
+msgstr "Ignoring volume cleanup failure due to %s"
 
 #: nova/compute/manager.py:967 nova/compute/manager.py:1808
 #: nova/compute/manager.py:2993
@@ -3461,7 +3453,7 @@ msgstr "Migrating"
 #: nova/compute/manager.py:1805
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
-msgstr ""
+msgstr "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 
 #: nova/compute/manager.py:1861
 msgid "Pausing"
@@ -3732,31 +3724,35 @@ msgid ""
 "Host field should be not be set on the instance until resources have been"
 " claimed."
 msgstr ""
+"Host field should be not be set on the instance until resources have been"
+" claimed."
 
 #: nova/compute/resource_tracker.py:168
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Attempting claim: memory %(memory_mb)d MB, disk %(disk_gb)d GB, VCPUs "
 "%(vcpus)d"
 msgstr ""
-"Attempting claim: memory %(memory_mb)d MB, disk %(disk_gb)d GB, mem limit"
-" %(memory_mb_limit)s"
+"Attempting claim: memory %(memory_mb)d MB, disk %(disk_gb)d GB, VCPUs "
+"%(vcpus)d"
 
 #: nova/compute/resource_tracker.py:210
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Total memory: %(total_mem)d MB, used: %(used_mem)d MB, free: %(free_mem)d"
 " MB"
-msgstr "Total memory: %(total_mem)d MB, used: %(used_mem)d MB, free: %(free_mem)d"
+msgstr
+"Total memory: %(total_mem)d MB, used: %(used_mem)d MB, free: %(free_mem)d"
+" MB"
 
 #: nova/compute/resource_tracker.py:219
 msgid "Memory limit not specified, defaulting to unlimited"
-msgstr ""
+msgstr "Memory limit not specified, defaulting to unlimited"
 
 #: nova/compute/resource_tracker.py:225
-#, fuzzy, python-format
+#, python-format
 msgid "Memory limit: %(memory_mb_limit)d MB, free: %(free_ram_mb)d MB"
-msgstr "Limit: %(memory_mb_limit)d MB, free: %(free_ram_mb)d"
+msgstr "Memory limit: %(memory_mb_limit)d MB, free: %(free_ram_mb)d MB"
 
 #: nova/compute/resource_tracker.py:232
 #, python-format
@@ -3768,20 +3764,22 @@ msgstr ""
 "memory %(memory_mb)d MB"
 
 #: nova/compute/resource_tracker.py:241
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Total disk: %(total_disk)d GB, used: %(used_disk)d GB, free: "
 "%(free_disk)d GB"
-msgstr "Total memory: %(total_mem)d MB, used: %(used_mem)d MB, free: %(free_mem)d"
+msgstr ""
+"Total disk: %(total_disk)d GB, used: %(used_disk)d GB, free: "
+"%(free_disk)d GB"
 
 #: nova/compute/resource_tracker.py:250
 msgid "Disk limit not specified, defaulting to unlimited"
-msgstr ""
+msgstr "Disk limit not specified, defaulting to unlimited"
 
 #: nova/compute/resource_tracker.py:256
-#, fuzzy, python-format
+#, python-format
 msgid "Disk limit: %(disk_gb_limit)d GB, free: %(free_disk_gb)d GB"
-msgstr "Limit: %(memory_mb_limit)d MB, free: %(free_ram_mb)d"
+msgstr "Disk limit: %(disk_gb_limit)d GB, free: %(free_disk_gb)d GB"
 
 #: nova/compute/resource_tracker.py:262
 #, python-format
@@ -3795,25 +3793,25 @@ msgstr ""
 #: nova/compute/resource_tracker.py:273
 #, python-format
 msgid "Total VCPUs: %(total_vcpus)d, used: %(used_vcpus)d"
-msgstr ""
+msgstr "Total VCPUs: %(total_vcpus)d, used: %(used_vcpus)d"
 
 #: nova/compute/resource_tracker.py:280
 msgid "VCPU limit not specified, defaulting to unlimited"
-msgstr ""
+msgstr "VCPU limit not specified, defaulting to unlimited"
 
 #: nova/compute/resource_tracker.py:284
 #, python-format
 msgid "CPU limit: %(vcpu_limit)d"
-msgstr ""
+msgstr "CPU limit: %(vcpu_limit)d"
 
 #: nova/compute/resource_tracker.py:291
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Unable to claim resources.  Free CPU %(free_vcpus)d < requested CPU "
 "%(vcpus)d"
 msgstr ""
-"Unable to claim resources.  Free disk %(free_disk_gb)d GB < requested "
-"disk %(disk_gb)d GB"
+"Unable to claim resources.  Free CPU %(free_vcpus)d < requested CPU "
+"%(vcpus)d"
 
 #: nova/compute/resource_tracker.py:310
 #, python-format
@@ -3851,40 +3849,40 @@ msgstr "No service record for host %s"
 #: nova/compute/resource_tracker.py:435
 #, python-format
 msgid "Hypervisor: free ram (MB): %s"
-msgstr ""
+msgstr "Hypervisor: free ram (MB): %s"
 
 #: nova/compute/resource_tracker.py:436
-#, fuzzy, python-format
+#, python-format
 msgid "Hypervisor: free disk (GB): %s"
-msgstr "free_disk_gb: %s"
+msgstr "Hypervisor: free disk (GB): %s"
 
 #: nova/compute/resource_tracker.py:441
 #, python-format
 msgid "Hypervisor: free VCPUs: %s"
-msgstr ""
+msgstr "Hypervisor: free VCPUs: %s"
 
 #: nova/compute/resource_tracker.py:443
 msgid "Hypervisor: VCPU information unavailable"
-msgstr ""
+msgstr "Hypervisor: VCPU information unavailable"
 
 #: nova/compute/resource_tracker.py:450
-#, fuzzy, python-format
+#, python-format
 msgid "Free ram (MB): %s"
-msgstr "free_ram_mb: %s"
+msgstr "Free ram (MB): %s"
 
 #: nova/compute/resource_tracker.py:451
-#, fuzzy, python-format
+#, python-format
 msgid "Free disk (GB): %s"
-msgstr "free_disk_gb: %s"
+msgstr "Free disk (GB): %s"
 
 #: nova/compute/resource_tracker.py:456
-#, fuzzy, python-format
+#, python-format
 msgid "Free VCPUS: %s"
-msgstr "free_disk_gb: %s"
+msgstr "Free VCPUS: %s"
 
 #: nova/compute/resource_tracker.py:458
 msgid "Free VCPU information unavailable"
-msgstr ""
+msgstr "Free VCPU information unavailable"
 
 #: nova/compute/resource_tracker.py:533
 #, python-format
@@ -4302,34 +4300,32 @@ msgid "Failed to update usages deallocating floating IP"
 msgstr "Failed to update usages deallocating floating IP"
 
 #: nova/network/manager.py:650
-#, fuzzy, python-format
+#, python-format
 msgid "Starting migration network for instance %(instance_uuid)s"
-msgstr "Destroying VDIs for Instance %(instance_uuid)s"
+msgstr "Starting migration network for instance %(instance_uuid)s"
 
 #: nova/network/manager.py:657
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Floating ip address |%(address)s| no longer belongs to instance "
 "%(instance_uuid)s. Will notmigrate it "
 msgstr ""
-"Fixed IP address %(address)s is already in use on instance "
-"%(instance_uuid)s."
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
 
 #: nova/network/manager.py:678
-#, fuzzy, python-format
+#, python-format
 msgid "Finishing migration network for instance %(instance_uuid)s"
-msgstr ""
-"Automatically confirming migration %(migration_id)s for instance "
-"%(instance_uuid)s"
+msgstr "Finishing migration network for instance %(instance_uuid)s"
 
 #: nova/network/manager.py:686
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Floating ip address |%(address)s| no longer belongs to instance "
 "%(instance_uuid)s. Will notsetup it."
 msgstr ""
-"Fixed IP address %(address)s is already in use on instance "
-"%(instance_uuid)s."
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
 
 #: nova/network/manager.py:733
 #, python-format
@@ -4544,9 +4540,9 @@ msgid "validate_networks() for %s"
 msgstr "validate_networks() for %s"
 
 #: nova/network/quantumv2/api.py:438
-#, fuzzy, python-format
+#, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
-msgstr "Floating ip not found for id %(id)s."
+msgstr "Multiple floating IP pools matches found for name '%s'"
 
 #: nova/openstack/common/lockutils.py:98
 #, python-format
@@ -4564,9 +4560,9 @@ msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 
 #: nova/openstack/common/lockutils.py:216
-#, fuzzy, python-format
+#, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
-msgstr "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
+msgstr "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 
 #: nova/openstack/common/log.py:298
 #, python-format
@@ -4574,9 +4570,9 @@ msgid "syslog facility must be one of: %s"
 msgstr "syslog facility must be one of: %s"
 
 #: nova/openstack/common/policy.py:394
-#, fuzzy, python-format
+#, python-format
 msgid "Failed to understand rule %(rule)s"
-msgstr "Failed to understand rule %(match)r"
+msgstr "Failed to understand rule %(rule)s"
 
 #: nova/openstack/common/policy.py:404
 #, python-format
@@ -4584,9 +4580,9 @@ msgid "No handler for matches of kind %s"
 msgstr "No handler for matches of kind %s"
 
 #: nova/openstack/common/policy.py:679
-#, fuzzy, python-format
+#, python-format
 msgid "Failed to understand rule %(rule)r"
-msgstr "Failed to understand rule %(match)r"
+msgstr "Failed to understand rule %(rule)r"
 
 #: nova/openstack/common/notifier/api.py:125
 #, python-format
@@ -4949,7 +4945,7 @@ msgstr "Could not find another compute"
 
 #: nova/scheduler/driver.py:64
 msgid "Exception during scheduler.run_instance"
-msgstr ""
+msgstr "Exception during scheduler.run_instance"
 
 #: nova/scheduler/driver.py:68 nova/scheduler/manager.py:181
 #, python-format
@@ -5064,9 +5060,9 @@ msgid "No service for compute ID %s"
 msgstr "No service for compute ID %s"
 
 #: nova/scheduler/manager.py:79
-#, fuzzy, python-format
+#, python-format
 msgid "Failed to schedule create_volume: %(ex)s"
-msgstr "Failed to schedule_%(method)s: %(ex)s"
+msgstr "Failed to schedule create_volume: %(ex)s"
 
 #: nova/scheduler/manager.py:165
 #, python-format
@@ -5127,13 +5123,13 @@ msgid "VCPUs not set; assuming CPU collection broken"
 msgstr "VCPUs not set; assuming CPU collection broken"
 
 #: nova/scheduler/filters/disk_filter.py:47
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "%(host_state)s does not have %(requested_disk)s MB usable disk, it only "
 "has %(usable_disk_mb)s MB usable disk."
 msgstr ""
-"%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
-" %(usable_ram)s MB usable ram."
+"%(host_state)s does not have %(requested_disk)s MB usable disk, it only "
+"has %(usable_disk_mb)s MB usable disk."
 
 #: nova/scheduler/filters/image_props_filter.py:48
 #, python-format
@@ -5173,6 +5169,8 @@ msgid ""
 "%(host_state)s fails I/O ops check: Max IOs per host is set to "
 "%(max_io_ops)s"
 msgstr ""
+"%(host_state)s fails I/O ops check: Max IOs per host is set to "
+"%(max_io_ops)s"
 
 #: nova/scheduler/filters/num_instances_filter.py:39
 #, python-format
@@ -5180,6 +5178,8 @@ msgid ""
 "%(host_state)s fails num_instances check: Max instances per host is set "
 "to %(max_instances)s"
 msgstr ""
+"%(host_state)s fails num_instances check: Max instances per host is set "
+"to %(max_instances)s"
 
 #: nova/scheduler/filters/ram_filter.py:46
 #, python-format
@@ -5499,11 +5499,13 @@ msgid ""
 "Length mismatch: %(result)s\n"
 "%(expected)s."
 msgstr ""
+"Length mismatch: %(result)s\n"
+"%(expected)s."
 
 #: nova/tests/integrated/test_api_samples.py:164
-#, fuzzy, python-format
+#, python-format
 msgid "Result: %(res_obj)s not in %(expected)s."
-msgstr "Result: %(result)s is not a dict."
+msgstr "Result: %(res_obj)s not in %(expected)s."
 
 #: nova/tests/integrated/test_api_samples.py:181
 #: nova/tests/integrated/test_api_samples.py:194
@@ -5911,7 +5913,7 @@ msgstr "injected file path not valid"
 
 #: nova/virt/disk/api.py:518
 msgid "Not implemented on Windows"
-msgstr ""
+msgstr "Not implemented on Windows"
 
 #: nova/virt/disk/api.py:552
 #, python-format
@@ -5941,7 +5943,7 @@ msgstr "unknown guestmount error"
 #: nova/virt/disk/guestfs.py:119
 #, python-format
 msgid "Failed to umount image at %s, guestmount was still running after 10s"
-msgstr ""
+msgstr "Failed to umount image at %s, guestmount was still running after 10s"
 
 #: nova/virt/disk/loop.py:31
 #, python-format
@@ -6620,9 +6622,8 @@ msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "Failed to cleanup directory %(target)s: %(e)s"
 
 #: nova/virt/libvirt/driver.py:729
-#, fuzzy
 msgid "During detach_volume, instance disappeared."
-msgstr "During wait destroy, instance disappeared."
+msgstr "During detach_volume, instance disappeared."
 
 #: nova/virt/libvirt/driver.py:739
 msgid "attaching LXC block device"
@@ -7017,7 +7018,7 @@ msgstr "Verification complete"
 #: nova/virt/libvirt/snapshots.py:83 nova/virt/libvirt/snapshots.py:86
 #: nova/virt/libvirt/snapshots.py:89
 msgid "LVM snapshots not implemented"
-msgstr ""
+msgstr "LVM snapshots not implemented"
 
 #: nova/virt/libvirt/utils.py:131
 #, python-format
@@ -7042,11 +7043,11 @@ msgstr ""
 #: nova/virt/libvirt/utils.py:187
 #, python-format
 msgid "Path %s must be LVM logical volume"
-msgstr ""
+msgstr "Path %s must be LVM logical volume"
 
 #: nova/virt/libvirt/utils.py:410
 msgid "Can't retrieve root device path from instance libvirt configuration"
-msgstr ""
+msgstr "Can't retrieve root device path from instance libvirt configuration"
 
 #: nova/virt/libvirt/utils.py:499
 #, python-format
@@ -7145,7 +7146,7 @@ msgstr "No space left on any volume group"
 #: nova/virt/powervm/exception.py:45
 #, python-format
 msgid "Operation '%(operation)s' on LPAR '%(instance_name)s' timed out"
-msgstr ""
+msgstr "Operation '%(operation)s' on LPAR '%(instance_name)s' timed out"
 
 #: nova/virt/powervm/exception.py:50
 msgid "Image creation failed on PowerVM"
@@ -7260,17 +7261,16 @@ msgid "Could not create logical volume. No space left on any volume group."
 msgstr "Could not create logical volume. No space left on any volume group."
 
 #: nova/virt/powervm/operator.py:554
-#, fuzzy
 msgid "Unable to get checksum"
-msgstr "Unable to get console"
+msgstr "Unable to get checksum"
 
 #: nova/virt/powervm/operator.py:557
 msgid "Image checksums do not match"
-msgstr ""
+msgstr "Image checksums do not match"
 
 #: nova/virt/powervm/operator.py:582
 msgid "Uncompressed image file not found"
-msgstr ""
+msgstr "Uncompressed image file not found"
 
 #: nova/virt/vmwareapi/driver.py:111
 msgid ""
@@ -7891,9 +7891,9 @@ msgid "Unable to get SR for this host: %s"
 msgstr "Unable to get SR for this host: %s"
 
 #: nova/virt/xenapi/host.py:190
-#, fuzzy, python-format
+#, python-format
 msgid "Failed to extract instance support from %s"
-msgstr "Failed to terminate instance"
+msgstr "Failed to extract instance support from %s"
 
 #: nova/virt/xenapi/host.py:207
 msgid "Unable to get updated status"
@@ -8048,9 +8048,8 @@ msgstr ""
 " on %(sr_ref)s."
 
 #: nova/virt/xenapi/vm_utils.py:454
-#, fuzzy
 msgid "SR not present and could not be introduced"
-msgstr "Instance could not be found"
+msgstr "SR not present and could not be introduced"
 
 #: nova/virt/xenapi/vm_utils.py:555
 #, python-format
@@ -8110,9 +8109,9 @@ msgid "download_vhd failed: %r"
 msgstr "download_vhd failed: %r"
 
 #: nova/virt/xenapi/vm_utils.py:1028
-#, fuzzy, python-format
+#, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
-msgstr "Invalid value '%s' for force. "
+msgstr "Invalid value '%s' for xenapi_torrent_images"
 
 #: nova/virt/xenapi/vm_utils.py:1039
 #, python-format
@@ -8485,9 +8484,9 @@ msgid "Failed to transfer vhd to new host"
 msgstr "Failed to transfer vhd to new host"
 
 #: nova/virt/xenapi/vmops.py:655
-#, fuzzy, python-format
+#, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-msgstr "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgstr "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 
 #: nova/virt/xenapi/vmops.py:779
 #, python-format
@@ -8700,14 +8699,14 @@ msgid "Unable to find vbd for vdi %s"
 msgstr "Unable to find vbd for vdi %s"
 
 #: nova/virt/xenapi/volume_utils.py:281
-#, fuzzy, python-format
+#, python-format
 msgid "Unable to obtain target information %(mountpoint)s"
-msgstr "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgstr "Unable to obtain target information %(mountpoint)s"
 
 #: nova/virt/xenapi/volume_utils.py:309
-#, fuzzy, python-format
+#, python-format
 msgid "Unable to obtain target information %(connection_data)s"
-msgstr "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgstr "Unable to obtain target information %(connection_data)s"
 
 #: nova/virt/xenapi/volume_utils.py:335
 #, python-format
@@ -8863,12 +8862,11 @@ msgstr ""
 
 #: nova/volume/api.py:145
 msgid "Size of specified image is larger than volume size."
-msgstr ""
+msgstr "Size of specified image is larger than volume size."
 
 #: nova/volume/api.py:215
-#, fuzzy
 msgid "Failed to update quota for deleting volume."
-msgstr "Failed to update usages deleting volume"
+msgstr "Failed to update quota for deleting volume."
 
 #: nova/volume/api.py:223
 msgid "Volume status must be available or error"
@@ -8888,14 +8886,12 @@ msgid "Volume Snapshot status must be available or error"
 msgstr "Volume Snapshot status must be available or error"
 
 #: nova/volume/api.py:479
-#, fuzzy
 msgid "Volume status must be available/in-use."
-msgstr "Volume status must be available or error"
+msgstr "Volume status must be available/in-use."
 
 #: nova/volume/api.py:482
-#, fuzzy
 msgid "Volume status is in-use."
-msgstr "volume %s: volume is busy"
+msgstr "Volume status is in-use."
 
 #: nova/volume/cinder.py:68
 #, python-format
@@ -8963,27 +8959,27 @@ msgstr "rbd has no pool %s"
 #: nova/volume/driver.py:740
 #, python-format
 msgid "Image %s is not stored in rbd"
-msgstr ""
+msgstr "Image %s is not stored in rbd"
 
 #: nova/volume/driver.py:744
 #, python-format
 msgid "Image %s has blank components"
-msgstr ""
+msgstr "Image %s has blank components"
 
 #: nova/volume/driver.py:747
 #, python-format
 msgid "Image %s is not an rbd snapshot"
-msgstr ""
+msgstr "Image %s is not an rbd snapshot"
 
 #: nova/volume/driver.py:762
 #, python-format
 msgid "%s is in a different ceph cluster"
-msgstr ""
+msgstr "%s is in a different ceph cluster"
 
 #: nova/volume/driver.py:773
-#, fuzzy, python-format
+#, python-format
 msgid "Unable to read image %s"
-msgstr "Unable to locate volume %s"
+msgstr "Unable to read image %s"
 
 #: nova/volume/driver.py:815
 #, python-format
@@ -9015,6 +9011,8 @@ msgid ""
 "Failed to create iscsi target for volume id:%(vol_id)s. Please ensure "
 "your tgtd config file contains 'include %(volumes_dir)s/*'"
 msgstr ""
+"Failed to create iscsi target for volume id:%(vol_id)s. Please ensure "
+"your tgtd config file contains 'include %(volumes_dir)s/*'"
 
 #: nova/volume/iscsi.py:154 nova/volume/iscsi.py:196
 #, python-format
@@ -9042,12 +9040,12 @@ msgstr "volume %s: skipping export"
 
 #: nova/volume/manager.py:109
 msgid "Resuming any in progress delete operations"
-msgstr ""
+msgstr "Resuming any in progress delete operations"
 
 #: nova/volume/manager.py:112
-#, fuzzy, python-format
+#, python-format
 msgid "Resuming delete on volume: %s"
-msgstr "Removing volume: %s"
+msgstr "Resuming delete on volume: %s"
 
 #: nova/volume/manager.py:121
 #, python-format
@@ -9130,12 +9128,12 @@ msgstr "snapshot %s: deleted successfully"
 #: nova/volume/manager.py:323
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
-msgstr ""
+msgstr "Downloaded image %(image_id)s to %(volume_id)s successfully"
 
 #: nova/volume/manager.py:342
-#, fuzzy, python-format
+#, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
-msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
+msgstr "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 
 #: nova/volume/manager.py:426
 msgid "Checking volume capabilities"
@@ -9636,7 +9634,7 @@ msgstr ""
 
 #: nova/volume/storwize_svc.py:373
 msgid "If compression is set to True, rsize must also be set (not equal to -1)"
-msgstr ""
+msgstr "If compression is set to True, rsize must also be set (not equal to -1)"
 
 #: nova/volume/storwize_svc.py:378
 msgid "enter: do_setup"
@@ -10194,7 +10192,7 @@ msgid "Failed to reach backend %d"
 msgstr "Failed to reach backend %d"
 
 #: nova/volume/xensm.py:102
-#, fuzzy, python-format
+#, python-format
 msgid "XenSMDriver requires xenapi connection, using %s"
 msgstr "XenSMDriver requires xenapi connection"