summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorOpenStack Jenkins <jenkins@openstack.org>2012-09-25 00:02:45 +0000
committerOpenStack Jenkins <jenkins@openstack.org>2012-09-25 00:02:45 +0000
commit13f6b3c98ff2edff5def3b68f9533b435bd0ded3 (patch)
treec4038ed88fefa86707c91c820b948b91976b1780 /nova
parentbd9767b1aa664e25ca905b40bd9de4ead2f6a959 (diff)
downloadnova-13f6b3c98ff2edff5def3b68f9533b435bd0ded3.tar.gz
nova-13f6b3c98ff2edff5def3b68f9533b435bd0ded3.tar.xz
nova-13f6b3c98ff2edff5def3b68f9533b435bd0ded3.zip
Imported Translations from Transifex
Change-Id: I563b768bea263fa80068a51eb321f5cef292fd15
Diffstat (limited to 'nova')
-rw-r--r--nova/locale/bs/LC_MESSAGES/nova.po282
-rw-r--r--nova/locale/cs/LC_MESSAGES/nova.po281
-rw-r--r--nova/locale/da/LC_MESSAGES/nova.po282
-rw-r--r--nova/locale/de/LC_MESSAGES/nova.po282
-rw-r--r--nova/locale/en_AU/LC_MESSAGES/nova.po282
-rw-r--r--nova/locale/en_GB/LC_MESSAGES/nova.po282
-rw-r--r--nova/locale/en_US/LC_MESSAGES/nova.po281
-rw-r--r--nova/locale/es/LC_MESSAGES/nova.po282
-rw-r--r--nova/locale/fr/LC_MESSAGES/nova.po282
-rw-r--r--nova/locale/it/LC_MESSAGES/nova.po282
-rw-r--r--nova/locale/ja/LC_MESSAGES/nova.po282
-rw-r--r--nova/locale/ko/LC_MESSAGES/nova.po282
-rw-r--r--nova/locale/nb/LC_MESSAGES/nova.po282
-rw-r--r--nova/locale/nova.pot279
-rw-r--r--nova/locale/pt_BR/LC_MESSAGES/nova.po282
-rw-r--r--nova/locale/ru/LC_MESSAGES/nova.po281
-rw-r--r--nova/locale/tl/LC_MESSAGES/nova.po282
-rw-r--r--nova/locale/tr/LC_MESSAGES/nova.po282
-rw-r--r--nova/locale/uk/LC_MESSAGES/nova.po282
-rw-r--r--nova/locale/zh_CN/LC_MESSAGES/nova.po281
-rw-r--r--nova/locale/zh_TW/LC_MESSAGES/nova.po282
21 files changed, 3034 insertions, 2881 deletions
diff --git a/nova/locale/bs/LC_MESSAGES/nova.po b/nova/locale/bs/LC_MESSAGES/nova.po
index de3efab8f..54f26a87d 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-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2012-01-19 20:22+0000\n"
"Last-Translator: yazar <zrncescientiae@gmail.com>\n"
"Language-Team: Bosnian <bs@li.org>\n"
@@ -155,7 +155,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr ""
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr ""
@@ -2845,10 +2845,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr ""
-
#: nova/cloudpipe/pipelib.py:43
msgid "Instance type for vpn instances"
msgstr ""
@@ -2968,116 +2964,116 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, python-format
msgid "snapshot for %s"
msgstr ""
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, python-format
msgid "Going to try to live migrate instance to %s"
msgstr ""
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr ""
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
msgid "Security group is still in use"
msgstr ""
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr ""
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr ""
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr ""
@@ -3233,353 +3229,358 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
msgid "Rebuilding instance"
msgstr ""
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr ""
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
msgid "Detaching volume from unknown instance"
msgstr ""
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4033,7 +4034,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr ""
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -4960,6 +4961,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5181,7 +5186,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr ""
@@ -5198,7 +5203,7 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7319,19 +7324,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8052,117 +8057,117 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1371
+#: nova/virt/xenapi/vmops.py:1373
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9744,3 +9749,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index 8adaa2cd0..18c96fae7 100644
--- a/nova/locale/cs/LC_MESSAGES/nova.po
+++ b/nova/locale/cs/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-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2012-05-17 20:04+0000\n"
"Last-Translator: Zbyněk Schwarz <Unknown>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -163,7 +163,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr "Svazek %(volume_id)s není k ničemu připojen"
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr "Data páru klíčů jsou neplatná"
@@ -2932,10 +2932,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr "Pokus o vytvoření instanci jedináčka"
-
#: nova/cloudpipe/pipelib.py:43
#, fuzzy
msgid "Instance type for vpn instances"
@@ -3069,16 +3065,16 @@ msgstr "Hledání podle: %s"
msgid "Image type not recognized %s"
msgstr "Nerozpoznaný typ obrazu %s"
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, fuzzy, python-format
msgid "snapshot for %s"
msgstr "Spouštění snímku ve VM %s"
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr "flavor_id je None. Předpokládán přesun."
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
@@ -3087,47 +3083,47 @@ msgstr ""
"Stará instance typu %(current_instance_type_name)s, nová instance typu "
"%(new_instance_type_name)s"
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, fuzzy, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr "Překročena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, fuzzy, python-format
msgid "Going to try to live migrate instance to %s"
msgstr "Pokus o ukončení %s"
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr "Dvojice klíčů musí být dlouhá 1 až 255 znaků."
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr "Bezpečnostní skupina %s není řetězec nebo unicode"
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr "Bezpečnostní skupina %s nemůže být prázdná."
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, fuzzy, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -3136,55 +3132,55 @@ msgstr ""
"Hodnota (%s) parametru GroupName je neplatná. Délka překračuje maximum "
"255 znaků."
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr "Bezpečnostní skupina %s by neměla být větší než 255 znaků."
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr "Vytvořit bezpečnostní skupinu %s"
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr "Bezpečnostní skupina %s již existuje"
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
#, fuzzy
msgid "Security group is still in use"
msgstr "Id bezpečnostní skupiny by mělo být celé číslo"
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr "Smazat bezpečnostní skupinu %s"
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr "Pravidlo (%s) nenalezeno"
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
#, fuzzy
msgid "Quota exceeded, too many security group rules."
msgstr "Přidávání pravidla bezpečnostní skupiny: %r"
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr "Povolit přístup bezpečnostní skupiny %s"
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr "Zrušit přístup bezpečnostní skupiny %s"
@@ -3345,23 +3341,28 @@ msgstr "Ignorování DiskNenalezen: %s"
msgid "terminating bdm %s"
msgstr "ukončování bdm %s"
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr "%s. Nastavování stavu vm instance na ERROR"
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
#, fuzzy
msgid "Rebuilding instance"
msgstr "Znovu sestavování instance %s"
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
#, fuzzy
msgid "Rebooting instance"
msgstr "Restartování instance %s"
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, fuzzy, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -3370,17 +3371,17 @@ msgstr ""
"pokus o restartování nespuštěné instance: %(instance_uuid)s (stav: "
"%(state)s očekáváno: %(running)s)"
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Nelze znovu sestavit instanci [%(instance_uuid)s]: %(exc)s"
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
#, fuzzy
msgid "instance snapshotting"
msgstr "instance %s: pořizování snímku"
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, fuzzy, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -3389,46 +3390,46 @@ msgstr ""
"pokus o vytvoření snímku z nespuštěné instance: %(instance_uuid)s (stav: "
"%(state)s očekáváno: %(running)s)"
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr "Nalezeno %(num_images)d obrazů (střídání: %(rotation)d)"
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr "Střídání %d záloh"
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr "Mazání obrazu %s"
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr "Nelze nastavit heslo správce. Instance %s není spuštěna"
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
#, fuzzy
msgid "Root password set"
msgstr "Instance %s: Nastavení hesla root"
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr "set_admin_password není tímto ovladačem zavedeno"
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, fuzzy, python-format
msgid "set_admin_password failed: %s"
msgstr "set_admin_password není tímto ovladačem zavedeno"
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
#, fuzzy
msgid "error setting admin password"
msgstr "Chyba při nastavování hesla správce"
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, fuzzy, python-format
msgid ""
"trying to inject a file into a non-running (state: "
@@ -3437,136 +3438,136 @@ msgstr ""
"pokus o vsunutí souboru do nespuštěné instance: %(instance_uuid)s (stav: "
"%(current_power_state)s očekáváno: %(expected_state)s)"
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, fuzzy, python-format
msgid "injecting file to %(path)s"
msgstr "Vkládání cesty souboru: '%s'"
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
#, fuzzy
msgid "Unrescuing"
msgstr "instance %s: rušení záchrany"
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr "cíl stejný jako zdroj!"
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
#, fuzzy
msgid "Pausing"
msgstr "Aktualizování!"
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "instance %s: získávání diagnostik"
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
#, fuzzy
msgid "Reset network"
msgstr "Reset sítě"
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
#, fuzzy
msgid "Inject network info"
msgstr "instance %s: vkládání informací o síti"
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr "network_info vkládá: |%s|"
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
#, fuzzy
msgid "Get console output"
msgstr "Získat výstup konzole pro instanci %s"
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
#, fuzzy
msgid "Getting vnc console"
msgstr "instance %s: získávání konzole vnc"
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr "Zavádění pomocí svazku %(volume_id)s ve %(mountpoint)s"
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, fuzzy, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr "Zavádění pomocí svazku %(volume_id)s ve %(mountpoint)s"
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr "Odpojování svazku %(volume_id)s z bodu připojení %(mp)s"
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Odpojování svazku z neznámé instance %s"
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, fuzzy, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr "Instance nemá svazek."
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr "Přesun před spuštěním selhal na %(dest)s"
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
#, fuzzy
msgid "_post_live_migration() is started.."
msgstr "zahájen přesun po spuštění."
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr "Nenalezeny žádné plovoucí ip"
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr "Nenalezeny žádné plovoucí ip."
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
@@ -3575,12 +3576,12 @@ msgstr ""
"Přesun za provozu: Neočekávaná chyba: nelze zdědit plovoucí ip.\n"
"%(e)s"
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr "Přesun instance do %(dest)s úspěšně dokončen."
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
@@ -3588,16 +3589,16 @@ msgstr ""
"Můžete vidět tuto chybu \"libvirt: QEMU error: Domain not found: no "
"domain with matching name.\" Tuto chybu můžete bezpečně ignorovat."
-#: nova/compute/manager.py:2268
+#: nova/compute/manager.py:2280
#, fuzzy
msgid "Post operation of migration started"
msgstr "Spuštěna operace po migraci"
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
@@ -3606,59 +3607,59 @@ msgstr ""
"Nalezeno %(migration_count)d nepotvrzených přesunů starších než "
"%(confirm_window)d vteřin"
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, fuzzy, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr "Vypínání VM pro instanci %(instance_uuid)s"
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, fuzzy, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "Instance %(instance_id)s nenalezena"
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
#, fuzzy
msgid "In ERROR state"
msgstr "Uzel je v neznámém chybovém stavu."
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr "Aktualizace mezipaměti využití šířky pásma"
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr "Aktualizace stavu hostitele"
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -3667,48 +3668,48 @@ msgstr ""
"Nalezeno %(num_db_instances)s v databázi a %(num_vm_instances)s na "
"hypervizoru."
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "Instance není zapnuta"
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr "FLAGS.reclaim_instance_interval <= 0, překskování..."
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr "Znovu získávání smazané instance"
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, fuzzy, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
@@ -3717,7 +3718,7 @@ msgstr ""
"Zjištěna instance se jmenovkou '%(name_label)s', která je označena jako "
"SMAZÁNA, ale stále je přítomna na hostiteli."
-#: nova/compute/manager.py:2763
+#: nova/compute/manager.py:2775
#, fuzzy, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
@@ -3726,7 +3727,7 @@ msgstr ""
"Ničení instance se jmenovkou '%(name_label)s', která je označena jako "
"SMAZÁNA, ale stále je přítomna na hostiteli."
-#: nova/compute/manager.py:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4193,7 +4194,7 @@ msgstr "Parametry: %s"
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr "Přidělit adresu %(public_ip)s k instanci %(instance_id)s"
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr "Tento ovladač podporuje pouze záznamy typu 'a'."
@@ -5150,6 +5151,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr "Pokus o vytvoření instanci jedináčka"
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5374,7 +5379,7 @@ msgstr "test_snímek_podrobnosti: resp_dict=%s"
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr "Spouštění instancí: %s"
@@ -5391,7 +5396,7 @@ msgstr "Po ukončení instancí: %s"
msgid "Internal error"
msgstr "Vnitřní chyba"
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr "Po vynuceném ukončení instancí: %s"
@@ -7631,14 +7636,14 @@ msgstr "Získávání velikosto brazu %s"
msgid "Got image size of %(size)s for the image %(image)s"
msgstr "Získáná velikost %(size)s obrazu %(image)s"
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, fuzzy, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
"ČASOVÝ LIMIT: Vypršel čas volání %(method)s. VM id=%(instance_uuid)s; "
"arg=%(args)r"
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, fuzzy, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -7647,7 +7652,7 @@ msgstr ""
"NEZAVEDENO: Volání %(method)s není agentem podporováno. VM "
"id=%(instance_uuid)s; arg=%(args)r"
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, fuzzy, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr "Volání %(method)s vrátilo chybu: %(e)s."
@@ -8407,130 +8412,130 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr "Nelze převést vhd na nového hostitele"
-#: nova/virt/xenapi/vmops.py:650
-#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:654
+#, fuzzy, python-format
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr "Zmenšení velikosti VDI %(cow_uuid)s z %(old_gb)d GB na %(new_gb)d GB"
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr "Zvětšení velikosti VDI %(vdi_uuid)s z%(old_gb)d GB na %(new_gb)d GB"
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
#, fuzzy
msgid "Resize complete"
msgstr "Změna velikosti %s je hotova"
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
#, fuzzy
msgid "Unable to find root VBD/VDI for VM"
msgstr "Neůze najít vbd pro vdi %s"
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, fuzzy, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr "Svazek není nalezen v instanci %(instance_id)s."
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
#, fuzzy
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
"Instance %(instance_uuid)s pomocí RAW nebo VHD, přeskakování mazání "
"kernelu a ramdisku"
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr "Instance mí kernel nebo ramdisk, ale ne oba"
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr "soubory kernel/ramdisk odstraněny"
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
#, fuzzy
msgid "Destroying VM"
msgstr "Restartování xvp"
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr "VM není přítomno, přeskakování ničení..."
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr "Instance již je v záchranném režimu: %s"
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
#, fuzzy
msgid "VM is not present, skipping power off..."
msgstr "VM není přítomno, přeskakování ničení..."
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
"Nalezeno %(instance_count)d zaseknutých restartování starších než "
"%(timeout)d vteřin"
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
#, fuzzy
msgid "Automatically hard rebooting"
msgstr "Automatický tvrdý restart %d"
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr "Nelze získat informacce o šířce pásma."
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
#, fuzzy
msgid "Injecting network info to xenstore"
msgstr "Vkládání informací o síti do xs pro vm: |%s|"
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
#, fuzzy
msgid "Creating vifs"
msgstr "Vytváření obrazu"
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, fuzzy, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr "vytváření VIF pro VM %(vm_ref)s, síť %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1371
+#: nova/virt/xenapi/vmops.py:1373
#, fuzzy, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr "vytváření VIF pro VM %(vm_ref)s, síť %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1395
+#: nova/virt/xenapi/vmops.py:1397
#, fuzzy
msgid "Injecting hostname to xenstore"
msgstr "Vkládání názvu hostitele do xs pro vm: |%s|"
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
#, fuzzy
msgid "Migrate Send failed"
msgstr "Vytvoření selhalo"
diff --git a/nova/locale/da/LC_MESSAGES/nova.po b/nova/locale/da/LC_MESSAGES/nova.po
index cc4ed0925..0414241ed 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-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2011-01-15 21:46+0000\n"
"Last-Translator: Soren Hansen <soren@linux2go.dk>\n"
"Language-Team: Danish <da@li.org>\n"
@@ -155,7 +155,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr ""
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr ""
@@ -2845,10 +2845,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr ""
-
#: nova/cloudpipe/pipelib.py:43
msgid "Instance type for vpn instances"
msgstr ""
@@ -2968,116 +2964,116 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, python-format
msgid "snapshot for %s"
msgstr ""
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, python-format
msgid "Going to try to live migrate instance to %s"
msgstr ""
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr ""
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
msgid "Security group is still in use"
msgstr ""
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr ""
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr ""
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr ""
@@ -3233,353 +3229,358 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
msgid "Rebuilding instance"
msgstr ""
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr ""
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
msgid "Detaching volume from unknown instance"
msgstr ""
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4033,7 +4034,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr ""
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -4960,6 +4961,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5181,7 +5186,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr ""
@@ -5198,7 +5203,7 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7320,19 +7325,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8053,117 +8058,117 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1371
+#: nova/virt/xenapi/vmops.py:1373
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9742,3 +9747,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index b1325b5c0..333af3d36 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-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2011-08-23 11:23+0000\n"
"Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
"Language-Team: German <de@li.org>\n"
@@ -160,7 +160,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr ""
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr ""
@@ -2851,10 +2851,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr ""
-
#: nova/cloudpipe/pipelib.py:43
msgid "Instance type for vpn instances"
msgstr ""
@@ -2974,116 +2970,116 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, python-format
msgid "snapshot for %s"
msgstr ""
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, python-format
msgid "Going to try to live migrate instance to %s"
msgstr ""
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr ""
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
msgid "Security group is still in use"
msgstr ""
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr ""
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr ""
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr ""
@@ -3239,356 +3235,361 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
msgid "Rebuilding instance"
msgstr ""
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
#, fuzzy
msgid "instance snapshotting"
msgstr "Instanz %s: Rettung"
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "Instanz %s: Rettung"
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4042,7 +4043,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr ""
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -4969,6 +4970,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5190,7 +5195,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr ""
@@ -5207,7 +5212,7 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7332,19 +7337,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8065,117 +8070,117 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1371
+#: nova/virt/xenapi/vmops.py:1373
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9759,3 +9764,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+
diff --git a/nova/locale/en_AU/LC_MESSAGES/nova.po b/nova/locale/en_AU/LC_MESSAGES/nova.po
index cd279340a..760103ffb 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-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2011-10-21 11:27+0000\n"
"Last-Translator: Tom Fifield <Unknown>\n"
"Language-Team: English (Australia) <en_AU@li.org>\n"
@@ -160,7 +160,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr ""
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr ""
@@ -2863,10 +2863,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr "Attempted to instantiate singleton"
-
#: nova/cloudpipe/pipelib.py:43
#, fuzzy
msgid "Instance type for vpn instances"
@@ -2992,117 +2988,117 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, fuzzy, python-format
msgid "snapshot for %s"
msgstr "Starting snapshot for VM %s"
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, fuzzy, python-format
msgid "Going to try to live migrate instance to %s"
msgstr "Going to try to terminate %s"
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr "Create Security Group %s"
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
#, fuzzy
msgid "Security group is still in use"
msgstr "Revoke security group ingress %s"
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr "Delete security group %s"
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr "Authorise security group ingress %s"
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr "Revoke security group ingress %s"
@@ -3258,364 +3254,369 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
#, fuzzy
msgid "Rebuilding instance"
msgstr "Rebooting instance %s"
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
#, fuzzy
msgid "Rebooting instance"
msgstr "Rebooting instance %s"
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Running instances: %s"
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
#, fuzzy
msgid "instance snapshotting"
msgstr "instance %s: snapshotting"
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, fuzzy, python-format
msgid "injecting file to %(path)s"
msgstr "Injecting file path: '%s'"
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
#, fuzzy
msgid "Unrescuing"
msgstr "instance %s: unrescuing"
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "instance %s: retrieving diagnostics"
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
#, fuzzy
msgid "Reset network"
msgstr "setting network host"
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
#, fuzzy
msgid "Inject network info"
msgstr "setting network host"
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
#, fuzzy
msgid "Get console output"
msgstr "Get console output for instance %s"
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
#, fuzzy
msgid "Getting vnc console"
msgstr "Adding console"
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Detaching volume from unknown instance %s"
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, fuzzy, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "instance %s: booted"
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4070,7 +4071,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -5002,6 +5003,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr "Attempted to instantiate singleton"
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5223,7 +5228,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr "Running instances: %s"
@@ -5240,7 +5245,7 @@ msgstr "After terminating instances: %s"
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7379,19 +7384,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8126,119 +8131,119 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr "kernel/ramdisk files removed"
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
#, fuzzy
msgid "Destroying VM"
msgstr "Restarting xvp"
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
#, fuzzy
msgid "Injecting network info to xenstore"
msgstr "setting network host"
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, 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:1371
+#: nova/virt/xenapi/vmops.py:1373
#, 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:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9826,3 +9831,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+
diff --git a/nova/locale/en_GB/LC_MESSAGES/nova.po b/nova/locale/en_GB/LC_MESSAGES/nova.po
index 94daf7710..db8d4d7ed 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-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2012-03-30 11:10+0000\n"
"Last-Translator: Anthony Harrington <untaintableangel@hotmail.co.uk>\n"
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -160,7 +160,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr "Volume %(volume_id)s is not attached to anything"
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr "Keypair data is invalid"
@@ -2858,10 +2858,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr ""
-
#: nova/cloudpipe/pipelib.py:43
#, fuzzy
msgid "Instance type for vpn instances"
@@ -2982,116 +2978,116 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, python-format
msgid "snapshot for %s"
msgstr ""
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, python-format
msgid "Going to try to live migrate instance to %s"
msgstr ""
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr ""
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
msgid "Security group is still in use"
msgstr ""
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr ""
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr ""
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr ""
@@ -3247,361 +3243,366 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
#, fuzzy
msgid "Rebuilding instance"
msgstr "Rebooting instance %s"
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
#, fuzzy
msgid "Rebooting instance"
msgstr "Rebooting instance %s"
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "VBD not found in instance %s"
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
#, fuzzy
msgid "instance snapshotting"
msgstr "instance %s: snapshotting"
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "instance %s: retrieving diagnostics"
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
#, fuzzy
msgid "Reset network"
msgstr "instance %s: reset network"
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
#, fuzzy
msgid "Get console output"
msgstr "Get console output for instance %s"
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Detaching volume from unknown instance %s"
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, fuzzy, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, fuzzy, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "Instance %(instance_id)s is not running."
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "instance %s: snapshotting"
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4056,7 +4057,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr ""
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -4986,6 +4987,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5207,7 +5212,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr ""
@@ -5224,7 +5229,7 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7359,19 +7364,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8099,117 +8104,117 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, fuzzy, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr "Instance %(instance_id)s is not running."
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, 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:1371
+#: nova/virt/xenapi/vmops.py:1373
#, 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:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9796,3 +9801,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+
diff --git a/nova/locale/en_US/LC_MESSAGES/nova.po b/nova/locale/en_US/LC_MESSAGES/nova.po
index 7380846b0..1b31ef5af 100644
--- a/nova/locale/en_US/LC_MESSAGES/nova.po
+++ b/nova/locale/en_US/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Nova\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2012-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2012-09-13 10:30+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: en_US <LL@li.org>\n"
@@ -160,7 +160,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr "Volume %(volume_id)s is still attached, detach volume first."
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr "Keypair data is invalid"
@@ -2913,10 +2913,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr "Attempted to instantiate singleton"
-
#: nova/cloudpipe/pipelib.py:43
msgid "Instance type for vpn instances"
msgstr "Instance type for vpn instances"
@@ -3041,16 +3037,16 @@ msgstr "Searching by: %s"
msgid "Image type not recognized %s"
msgstr "Image type not recognized %s"
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, python-format
msgid "snapshot for %s"
msgstr "snapshot for %s"
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr "flavor_id is None. Assuming migration."
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
@@ -3059,47 +3055,47 @@ msgstr ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr "Locking"
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr "Unlocking"
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr "Volume must be attached in order to detach."
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, python-format
msgid "Going to try to live migrate instance to %s"
msgstr "Going to try to live migrate instance to %s"
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr "Keypair name contains unsafe characters"
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr "Keypair name must be between 1 and 255 characters long"
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr "Security group %s is not a string or unicode"
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr "Security group %s cannot be empty."
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -3108,53 +3104,53 @@ msgstr ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr "Security group %s should not be greater than 255 characters."
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr "Quota exceeded, too many security groups."
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr "Create Security Group %s"
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr "Security group %s already exists"
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
msgid "Security group is still in use"
msgstr "Security group is still in use"
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr "Failed to update usages deallocating security group"
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr "Delete security group %s"
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr "Rule (%s) not found"
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr "Quota exceeded, too many security group rules."
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr "Authorize security group ingress %s"
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr "Revoke security group ingress %s"
@@ -3314,21 +3310,26 @@ msgstr "Ignoring VolumeNotFound: %s"
msgid "terminating bdm %s"
msgstr "terminating bdm %s"
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr "%s. Setting instance vm_state to ERROR"
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
msgid "Rebuilding instance"
msgstr "Rebuilding instance"
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
msgid "Rebooting instance"
msgstr "Rebooting instance"
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -3337,16 +3338,16 @@ msgstr ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Cannot reboot instance: %(exc)s"
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
msgid "instance snapshotting"
msgstr "instance snapshotting"
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -3355,44 +3356,44 @@ msgstr ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr "Found %(num_images)d images (rotation: %(rotation)d)"
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr "Rotating out %d backups"
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr "Deleting image %s"
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr "Failed to set admin password. Instance %s is not running"
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr "Root password set"
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr "set_admin_password is not implemented by this driver."
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr "set_admin_password failed: %s"
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr "error setting admin password"
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
@@ -3401,80 +3402,80 @@ msgstr ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr "injecting file to %(path)s"
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr "Rescuing"
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
msgid "Unrescuing"
msgstr "Unrescuing"
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr "Changing instance metadata according to %(diff)r"
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr "destination same as source!"
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr "Migrating"
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr "Pausing"
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr "Unpausing"
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
msgid "Retrieving diagnostics"
msgstr "Retrieving diagnostics"
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr "Resuming"
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
msgid "Reset network"
msgstr "Reset network"
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
msgid "Inject network info"
msgstr "Inject network info"
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr "network_info to inject: |%s|"
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
msgid "Get console output"
msgstr "Get console output"
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
msgid "Getting vnc console"
msgstr "Getting vnc console"
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr "Booting with volume %(volume_id)s at %(mountpoint)s"
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr "Attaching volume %(volume_id)s to %(mountpoint)s"
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
@@ -3483,47 +3484,47 @@ msgstr ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Failed to attach volume %(volume_id)s at %(mountpoint)s"
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr "Detach volume %(volume_id)s from mountpoint %(mp)s"
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
msgid "Detaching volume from unknown instance"
msgstr "Detaching volume from unknown instance"
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr "Faild to detach volume %(volume_id)s from %(mp)s"
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr "Instance has no volume."
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr "Pre live migration failed at %(dest)s"
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr "_post_live_migration() is started.."
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr "No floating_ip found"
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr "No floating_ip found."
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
@@ -3532,12 +3533,12 @@ msgstr ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr "Migrating instance to %(dest)s finished successfully."
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
@@ -3545,15 +3546,15 @@ msgstr ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
-#: nova/compute/manager.py:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr "Post operation of migration started"
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr "Updated the info_cache for instance"
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
@@ -3562,12 +3563,12 @@ msgstr ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr "Setting migration %(migration_id)s to error: %(reason)s"
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
@@ -3576,26 +3577,26 @@ msgstr ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "Instance %(instance_uuid)s not found"
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr "In ERROR state"
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr "Error auto-confirming resize: %(e)s. Will retry later."
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
@@ -3604,20 +3605,20 @@ msgstr ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr "Failed to generate usage audit for instance on host %s"
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr "Updating bandwidth usage cache"
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr "Updating host status"
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -3626,11 +3627,11 @@ msgstr ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr "During sync_power_state the instance has a pending task. Skip."
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
@@ -3639,36 +3640,36 @@ msgstr ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
-#: nova/compute/manager.py:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr "Instance shutdown by itself. Calling the stop API."
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr "error during stop() in sync_power_state."
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr "Instance is paused or suspended unexpectedly. Calling the stop API."
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr "Instance is not stopped. Calling the stop API."
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
msgid "Instance is not (soft-)deleted."
msgstr "Instance is not (soft-)deleted."
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr "FLAGS.reclaim_instance_interval <= 0, skipping..."
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr "Reclaiming deleted instance"
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
@@ -3677,7 +3678,7 @@ msgstr ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
-#: nova/compute/manager.py:2763
+#: nova/compute/manager.py:2775
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
@@ -3686,7 +3687,7 @@ msgstr ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
-#: nova/compute/manager.py:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
@@ -4156,7 +4157,7 @@ msgstr "kwargs: %s"
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr "re-assign floating IP %(address)s from instance %(instance_id)s"
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr "This driver only supports type 'a' entries."
@@ -5130,6 +5131,10 @@ msgstr "Previously tried hosts: %(hosts)s. (host=%(host)s)"
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr "Attempted to instantiate singleton"
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5361,7 +5366,7 @@ msgstr "test_snapshot_detail: resp_dict=%s"
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr "Running instances: %s"
@@ -5378,7 +5383,7 @@ msgstr "After terminating instances: %s"
msgid "Internal error"
msgstr "Internal error"
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr "After force-killing instances: %s"
@@ -7586,12 +7591,12 @@ msgstr "Getting image size for the image %s"
msgid "Got image size of %(size)s for the image %(image)s"
msgstr "Got image size of %(size)s for the image %(image)s"
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -7600,7 +7605,7 @@ msgstr ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr "The call to %(method)s returned an error: %(e)s. args=%(args)r"
@@ -8363,102 +8368,102 @@ msgstr "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgid "Failed to transfer vhd to new host"
msgstr "Failed to transfer vhd to new host"
-#: nova/virt/xenapi/vmops.py:650
-#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:654
+#, fuzzy, 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"
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr "Resize complete"
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr "Starting halted instance found during reboot"
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr "Unable to find root VBD/VDI for VM"
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr "Destroying VDIs for Instance %(instance_uuid)s"
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr "Using RAW or VHD, skipping kernel and ramdisk deletion"
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr "instance has a kernel or ramdisk but not both"
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr "kernel/ramdisk files removed"
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
msgid "Destroying VM"
msgstr "Destroying VM"
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr "VM is not present, skipping destroy..."
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr "Instance is already in Rescue Mode: %s"
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr "VM is not present, skipping power off..."
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr "Automatically hard rebooting"
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr "Could not get bandwidth info."
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr "Fetching VM ref while BUILDING failed"
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
msgid "Injecting network info to xenstore"
msgstr "Injecting network info to xenstore"
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr "Creating vifs"
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr "Creating VIF for network %(network_ref)s"
-#: nova/virt/xenapi/vmops.py:1371
+#: nova/virt/xenapi/vmops.py:1373
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr "Created VIF %(vif_ref)s, network %(network_ref)s"
-#: nova/virt/xenapi/vmops.py:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr "Injecting hostname to xenstore"
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
@@ -8467,15 +8472,15 @@ msgstr ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr "Migrate Receive failed"
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr "VM.assert_can_migratefailed"
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr "Migrate Send failed"
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index 4ef05b294..4a43c4b05 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-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2012-05-16 06:44+0000\n"
"Last-Translator: Paco Molinero <paco@byasl.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -166,7 +166,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr "Volumen %(volume_id)s no está conectado con nada"
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr ""
@@ -2871,10 +2871,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr "Intento de instanciar sigleton"
-
#: nova/cloudpipe/pipelib.py:43
#, fuzzy
msgid "Instance type for vpn instances"
@@ -3004,117 +3000,117 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, fuzzy, python-format
msgid "snapshot for %s"
msgstr "Comenzando snapshot para la VM %s"
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, fuzzy, python-format
msgid "Going to try to live migrate instance to %s"
msgstr "Se va a iniciar la finalización de las instancias"
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr "Crear Grupo de Seguridad %s"
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
#, fuzzy
msgid "Security group is still in use"
msgstr "Revocar ingreso al grupo de seguridad %s"
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr "Borrar grupo de seguridad %s"
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr "Autorizar ingreso al grupo de seguridad %s"
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr "Revocar ingreso al grupo de seguridad %s"
@@ -3270,362 +3266,367 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
#, fuzzy
msgid "Rebuilding instance"
msgstr "Reiniciando instancia %s"
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
#, fuzzy
msgid "Rebooting instance"
msgstr "Reiniciando instancia %s"
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Ejecutando instancias: %s"
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
#, fuzzy
msgid "instance snapshotting"
msgstr "instancia %s: creando snapshot"
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "instancia %s: obteniendo los diagnosticos"
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
#, fuzzy
msgid "Reset network"
msgstr "configurando la red del host"
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
#, fuzzy
msgid "Inject network info"
msgstr "configurando la red del host"
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
#, fuzzy
msgid "Get console output"
msgstr "Obtener salida de la consola para la instancia %s"
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Desvinculando volumen de instancia desconocida %s"
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, fuzzy, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, fuzzy, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "La instacia %(instance_id)s no esta suspendida"
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "instancia %s: arrancada"
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4080,7 +4081,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr ""
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -5011,6 +5012,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr "Intento de instanciar sigleton"
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5232,7 +5237,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr "Ejecutando instancias: %s"
@@ -5249,7 +5254,7 @@ msgstr "Después de terminar las instancias: %s"
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7389,19 +7394,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8134,118 +8139,118 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, fuzzy, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr "La instacia %(instance_id)s no esta suspendida"
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
#, fuzzy
msgid "Injecting network info to xenstore"
msgstr "configurando la red del host"
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, 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:1371
+#: nova/virt/xenapi/vmops.py:1373
#, 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:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9839,3 +9844,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index b084a55e9..ba592b742 100644
--- a/nova/locale/fr/LC_MESSAGES/nova.po
+++ b/nova/locale/fr/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2012-05-14 08:35+0000\n"
"Last-Translator: Erwan Gallen <Unknown>\n"
"Language-Team: French <fr@li.org>\n"
@@ -164,7 +164,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr "Le volume %(volume_id)s n'est lié à rien"
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr "La paire de clés de donnée n'est pas valide"
@@ -2921,10 +2921,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr "Tentative d'instanciation d'un singleton"
-
#: nova/cloudpipe/pipelib.py:43
#, fuzzy
msgid "Instance type for vpn instances"
@@ -3054,117 +3050,117 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, fuzzy, python-format
msgid "snapshot for %s"
msgstr "Début de création d'instantané (snapshot) pour la VM %s"
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, fuzzy, python-format
msgid "Going to try to live migrate instance to %s"
msgstr "Va essayer d'arrêter %s"
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr "Création du groupe de sécurité %s"
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
#, fuzzy
msgid "Security group is still in use"
msgstr "Révocation de groupe de sécurité %s"
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr "Suppression du groupe de sécurité %s"
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr "Authorisation du groupe de sécurité %s"
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr "Révocation de groupe de sécurité %s"
@@ -3320,364 +3316,369 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
#, fuzzy
msgid "Rebuilding instance"
msgstr "Redémarrage de l'instance %s"
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
#, fuzzy
msgid "Rebooting instance"
msgstr "Redémarrage de l'instance %s"
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Instance actives : %s"
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
#, fuzzy
msgid "instance snapshotting"
msgstr "instance %s: création d'un instantané (snapshot)"
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, fuzzy, python-format
msgid "injecting file to %(path)s"
msgstr "Injection du chemin d'accès : '%s'"
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
#, fuzzy
msgid "Unrescuing"
msgstr "instance %s: dé-récupération"
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "instance %s: récupération des diagnostiques"
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
#, fuzzy
msgid "Reset network"
msgstr "réglage de l'hôte réseau"
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
#, fuzzy
msgid "Inject network info"
msgstr "réglage de l'hôte réseau"
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
#, fuzzy
msgid "Get console output"
msgstr "Récupération de la sortie de la console de l'instance %s"
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
#, fuzzy
msgid "Getting vnc console"
msgstr "Ajout de console"
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Démontage de volume d'une instance inconnue %s"
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, fuzzy, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, fuzzy, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "instance %s: a démarrée"
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4135,7 +4136,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr "Association de l'adresse %(public_ip)s avec l'instance %(instance_id)s"
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -5068,6 +5069,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr "Tentative d'instanciation d'un singleton"
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5289,7 +5294,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr "Instance actives : %s"
@@ -5306,7 +5311,7 @@ msgstr "Après l'arrêt d'instances : %s"
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7449,19 +7454,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8200,119 +8205,119 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, fuzzy, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr "Volume non trouvé pour l'instance %(instance_id)s."
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr "Fichiers noyau/ramdisk supprimés"
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
#, fuzzy
msgid "Destroying VM"
msgstr "Re-démarrage xvp"
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
#, fuzzy
msgid "Injecting network info to xenstore"
msgstr "réglage de l'hôte réseau"
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, 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:1371
+#: nova/virt/xenapi/vmops.py:1373
#, 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:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9908,3 +9913,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index 03bf34d51..8a768c3b3 100644
--- a/nova/locale/it/LC_MESSAGES/nova.po
+++ b/nova/locale/it/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2012-04-01 18:59+0000\n"
"Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -160,7 +160,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr ""
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr ""
@@ -2856,10 +2856,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr ""
-
#: nova/cloudpipe/pipelib.py:43
msgid "Instance type for vpn instances"
msgstr ""
@@ -2981,116 +2977,116 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, python-format
msgid "snapshot for %s"
msgstr ""
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, fuzzy, python-format
msgid "Going to try to live migrate instance to %s"
msgstr "Impossibile riavviare l'istanza"
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr ""
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
msgid "Security group is still in use"
msgstr ""
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr ""
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr ""
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr ""
@@ -3246,360 +3242,365 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
#, fuzzy
msgid "Rebuilding instance"
msgstr "Riavviando l'istanza %s"
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
#, fuzzy
msgid "Rebooting instance"
msgstr "Riavviando l'istanza %s"
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Impossibile montare il volume all'istanza %s"
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
#, fuzzy
msgid "instance snapshotting"
msgstr "istanza %s: creazione snapshot in corso"
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "istanza %s: ricezione diagnostiche"
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
#, fuzzy
msgid "Reset network"
msgstr "istanza %s: ripristino rete"
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Impossibile montare il volume all'istanza %s"
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, fuzzy, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "istanza %s: creazione snapshot in corso"
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4053,7 +4054,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr ""
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -4983,6 +4984,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5204,7 +5209,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr ""
@@ -5221,7 +5226,7 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7356,19 +7361,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8092,117 +8097,117 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1371
+#: nova/virt/xenapi/vmops.py:1373
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9790,3 +9795,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index 9022e9389..86b07b66f 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-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2011-08-23 11:22+0000\n"
"Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
"Language-Team: \n"
@@ -160,7 +160,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr ""
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr ""
@@ -2861,10 +2861,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr "シングルトンをインスタンス化しようとしました。"
-
#: nova/cloudpipe/pipelib.py:43
#, fuzzy
msgid "Instance type for vpn instances"
@@ -2990,117 +2986,117 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, fuzzy, python-format
msgid "snapshot for %s"
msgstr "VM %s に対するスナップショットを開始します。"
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, fuzzy, python-format
msgid "Going to try to live migrate instance to %s"
msgstr "%s を停止しようとしています"
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr "Create Security Group: セキュリティグループ %s を作成します。"
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
#, fuzzy
msgid "Security group is still in use"
msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr "Delete security group: セキュリティグループ %s を削除します。"
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr "Authorize security group ingress: セキュリティグループ許可 %s"
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
@@ -3256,364 +3252,369 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
#, fuzzy
msgid "Rebuilding instance"
msgstr "Rebooting instance: インスタンス %s を再起動します。"
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
#, fuzzy
msgid "Rebooting instance"
msgstr "Rebooting instance: インスタンス %s を再起動します。"
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "インスタンス %s は実行中です。"
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
#, fuzzy
msgid "instance snapshotting"
msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, fuzzy, python-format
msgid "injecting file to %(path)s"
msgstr "ファイルパス '%s' を埋め込んでいます"
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
#, fuzzy
msgid "Unrescuing"
msgstr "Unrescuing: インスタンス %s をアンレスキューします。"
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "retrieving diagnostics: インスタンス %s の診断情報を取得します。"
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
#, fuzzy
msgid "Reset network"
msgstr "ネットワークホストの設定をします。"
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
#, fuzzy
msgid "Inject network info"
msgstr "ネットワークホストの設定をします。"
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
#, fuzzy
msgid "Get console output"
msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
#, fuzzy
msgid "Getting vnc console"
msgstr "コンソールを追加しています"
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "ボリュームを未知のインスタンス %s からデタッチします。"
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, fuzzy, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "インスタンス %s: 起動しました。"
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4068,7 +4069,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr "インスタンス %(instance_id)s にアドレス %(public_ip)s を割り当て"
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -4998,6 +4999,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr "シングルトンをインスタンス化しようとしました。"
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5219,7 +5224,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr "インスタンス %s は実行中です。"
@@ -5236,7 +5241,7 @@ msgstr "インスタンス %s を終了した後です。"
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7373,19 +7378,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8117,119 +8122,119 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr "カーネル/RAMディスクファイルが削除されました"
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
#, fuzzy
msgid "Destroying VM"
msgstr "xvp を再起動しています"
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
#, fuzzy
msgid "Injecting network info to xenstore"
msgstr "ネットワークホストの設定をします。"
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, 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:1371
+#: nova/virt/xenapi/vmops.py:1373
#, 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:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9817,3 +9822,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+
diff --git a/nova/locale/ko/LC_MESSAGES/nova.po b/nova/locale/ko/LC_MESSAGES/nova.po
index 9fec08d3c..8fac4380f 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-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2011-12-16 04:42+0000\n"
"Last-Translator: Zhongyue Luo <lzyeval@gmail.com>\n"
"Language-Team: Korean <ko@li.org>\n"
@@ -160,7 +160,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr ""
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr ""
@@ -2851,10 +2851,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr ""
-
#: nova/cloudpipe/pipelib.py:43
msgid "Instance type for vpn instances"
msgstr ""
@@ -2974,116 +2970,116 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, python-format
msgid "snapshot for %s"
msgstr ""
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, python-format
msgid "Going to try to live migrate instance to %s"
msgstr ""
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr ""
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
msgid "Security group is still in use"
msgstr ""
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr ""
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr ""
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr ""
@@ -3239,358 +3235,363 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
#, fuzzy
msgid "Rebuilding instance"
msgstr "인스턴스 %s를 재부팅합니다"
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
#, fuzzy
msgid "Rebooting instance"
msgstr "인스턴스 %s를 재부팅합니다"
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
#, fuzzy
msgid "instance snapshotting"
msgstr "인스턴스 %s: 스냅샷 저장중"
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, fuzzy, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "인스턴스 %s: 스냅샷 저장중"
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4044,7 +4045,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr ""
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -4971,6 +4972,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5192,7 +5197,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr ""
@@ -5209,7 +5214,7 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7336,19 +7341,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8070,117 +8075,117 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1371
+#: nova/virt/xenapi/vmops.py:1373
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9767,3 +9772,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+
diff --git a/nova/locale/nb/LC_MESSAGES/nova.po b/nova/locale/nb/LC_MESSAGES/nova.po
index 185dc6bdb..bc6f77ad3 100644
--- a/nova/locale/nb/LC_MESSAGES/nova.po
+++ b/nova/locale/nb/LC_MESSAGES/nova.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Nova\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2012-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2012-09-13 10:30+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: nb <LL@li.org>\n"
@@ -161,7 +161,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr ""
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr ""
@@ -2851,10 +2851,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr ""
-
#: nova/cloudpipe/pipelib.py:43
msgid "Instance type for vpn instances"
msgstr ""
@@ -2974,116 +2970,116 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, python-format
msgid "snapshot for %s"
msgstr ""
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, python-format
msgid "Going to try to live migrate instance to %s"
msgstr ""
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr ""
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
msgid "Security group is still in use"
msgstr ""
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr ""
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr ""
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr ""
@@ -3239,353 +3235,358 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
msgid "Rebuilding instance"
msgstr ""
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr ""
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
msgid "Detaching volume from unknown instance"
msgstr ""
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4039,7 +4040,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr ""
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -4966,6 +4967,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5187,7 +5192,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr ""
@@ -5204,7 +5209,7 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7325,19 +7330,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8058,117 +8063,117 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1371
+#: nova/virt/xenapi/vmops.py:1373
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9747,3 +9752,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index 337898e7d..896b48354 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: 2012-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -155,7 +155,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr ""
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr ""
@@ -2845,10 +2845,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr ""
-
#: nova/cloudpipe/pipelib.py:43
msgid "Instance type for vpn instances"
msgstr ""
@@ -2968,116 +2964,116 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, python-format
msgid "snapshot for %s"
msgstr ""
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, python-format
msgid "Going to try to live migrate instance to %s"
msgstr ""
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr ""
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
msgid "Security group is still in use"
msgstr ""
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr ""
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr ""
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr ""
@@ -3233,353 +3229,358 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
msgid "Rebuilding instance"
msgstr ""
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr ""
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
msgid "Detaching volume from unknown instance"
msgstr ""
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4033,7 +4034,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr ""
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -4960,6 +4961,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5181,7 +5186,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr ""
@@ -5198,7 +5203,7 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7319,19 +7324,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8052,117 +8057,117 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1371
+#: nova/virt/xenapi/vmops.py:1373
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index 182f81d27..bcfb01298 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-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2012-05-04 19:25+0000\n"
"Last-Translator: Júlio Cezar Santos Pires <Unknown>\n"
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -160,7 +160,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr ""
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr ""
@@ -2863,10 +2863,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr "Tentativa de instanciar singleton"
-
#: nova/cloudpipe/pipelib.py:43
#, fuzzy
msgid "Instance type for vpn instances"
@@ -2991,117 +2987,117 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, python-format
msgid "snapshot for %s"
msgstr ""
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, fuzzy, python-format
msgid "Going to try to live migrate instance to %s"
msgstr "Começando a terminar instâncias"
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr "Criar Grupo de Segurança %s"
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
#, fuzzy
msgid "Security group is still in use"
msgstr "Revogado entrada do grupo de segurança %s"
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr "Excluir grupo de segurança %s"
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr "Autorizada entrada do grupo de segurança %s"
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr "Revogado entrada do grupo de segurança %s"
@@ -3257,364 +3253,369 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
#, fuzzy
msgid "Rebuilding instance"
msgstr "Reconstruindo instância %s"
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
#, fuzzy
msgid "Rebooting instance"
msgstr "Reiniciando a instância %s"
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Reconstruindo instância %s"
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
#, fuzzy
msgid "instance snapshotting"
msgstr "instância %s: fazendo um snapshot"
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr "Removendo imagem %s"
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
#, fuzzy
msgid "error setting admin password"
msgstr "Configurar senha do administrador"
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
#, fuzzy
msgid "Unrescuing"
msgstr "instância %s: desfazendo o resgate"
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "instância %s: recuperando os diagnósticos"
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
#, fuzzy
msgid "Reset network"
msgstr "instância %s: reset da rede"
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
#, fuzzy
msgid "Get console output"
msgstr "Obter saída do console para instância %s"
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
#, fuzzy
msgid "Getting vnc console"
msgstr "Adicionando console"
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Desconectando volume da instância desconhecida %s"
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, fuzzy, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, fuzzy, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "A instância %(instance_id)s não está executando."
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "Instância %s não encontrada"
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4069,7 +4070,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr "Volume não encontrada para a instância %(instance_id)s."
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -4999,6 +5000,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr "Tentativa de instanciar singleton"
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5220,7 +5225,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr ""
@@ -5237,7 +5242,7 @@ msgstr ""
msgid "Internal error"
msgstr "Erro interno"
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7375,19 +7380,19 @@ msgstr "Obtendo o tamanho da imagem para a imagem %s"
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8120,117 +8125,117 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, fuzzy, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr "Volume não encontrada para a instância %(instance_id)s."
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, 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:1371
+#: nova/virt/xenapi/vmops.py:1373
#, 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:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9821,3 +9826,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index 088978d45..d98319d2e 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-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2012-03-25 09:34+0000\n"
"Last-Translator: Eugene Marshal <Unknown>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -165,7 +165,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr "Том %(volume_id)s никуда не присоединён"
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr ""
@@ -2912,10 +2912,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr ""
-
#: nova/cloudpipe/pipelib.py:43
#, fuzzy
msgid "Instance type for vpn instances"
@@ -3047,16 +3043,16 @@ msgstr "Поиск по: %s"
msgid "Image type not recognized %s"
msgstr "Тип образа не распознан %s"
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, fuzzy, python-format
msgid "snapshot for %s"
msgstr "Запуск снимка для ВМ %s"
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
@@ -3065,47 +3061,47 @@ msgstr ""
"Устаревший тип копии %(current_instance_type_name)s, новый тип копии "
"%(new_instance_type_name)s"
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, fuzzy, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr "Превышена квота для %(pid)s, попытка выполнить %(min_count)s копий"
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, fuzzy, python-format
msgid "Going to try to live migrate instance to %s"
msgstr "Будет выполнения попытка завершить работу %s"
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr "Группа безопасности %s не может быть пустой."
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, fuzzy, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -3114,55 +3110,55 @@ msgstr ""
"Значение (%s) для параметра GroupName недопустимо. Длина превышает "
"максимально допустимое значение 255."
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr "Создать группу безопасности %s"
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr "Группа безопасности %s уже существует"
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
#, fuzzy
msgid "Security group is still in use"
msgstr "Группа безопасности (%s) не найдена"
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr "Удалить группу безопасности %s"
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr "Правило (%s) не найдено"
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
#, fuzzy
msgid "Quota exceeded, too many security group rules."
msgstr "Добавление правила группы безопасности: %r"
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr ""
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr ""
@@ -3323,23 +3319,28 @@ msgstr "Пропуск DiskNotFound: %s"
msgid "terminating bdm %s"
msgstr "завершение работы bdm %s"
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr "%s. Установка состояния копии vm_state на ERROR"
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
#, fuzzy
msgid "Rebuilding instance"
msgstr "Обновление сборки %s"
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
#, fuzzy
msgid "Rebooting instance"
msgstr "Перезагрузка копии %s"
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, fuzzy, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -3348,17 +3349,17 @@ msgstr ""
"попытка перезагрузки не выполняемой копии: %(instance_uuid)s (состояние: "
"%(state)s ожидалось: %(running)s)"
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Обновление сборки %s"
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
#, fuzzy
msgid "instance snapshotting"
msgstr "копия %s: выполнение снимка"
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, fuzzy, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -3367,192 +3368,192 @@ msgstr ""
"попытка создания снимка не выполняемой копии: %(instance_uuid)s "
"(состояние: %(state)s ожидалось: %(running)s)"
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr "Найдено %(num_images)d образов (ротация: %(rotation)d)"
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr "Удаление образа %s"
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr "Невозможно назначить пароль администратора. Копия %s не выполняется"
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
#, fuzzy
msgid "Root password set"
msgstr "Копия %s: Назначение административного пароля"
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr "set_admin_password не реализован в этой драйвере."
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, fuzzy, python-format
msgid "set_admin_password failed: %s"
msgstr "set_admin_password не реализован в этой драйвере."
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
#, fuzzy
msgid "error setting admin password"
msgstr "Ошибка назначения пароля администратора"
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr "назначение совпадает с источником!"
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "копия %s: принятие диагностики"
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
#, fuzzy
msgid "Reset network"
msgstr "Восстановление сети"
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
#, fuzzy
msgid "Inject network info"
msgstr "установка сетевого узла"
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
#, fuzzy
msgid "Get console output"
msgstr "Получить консольный вывод для копии %s"
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
#, fuzzy
msgid "Getting vnc console"
msgstr "копия %s: получение консоли vnc"
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Отсоединение тома от неизвестной копии %s"
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
#, fuzzy
msgid "_post_live_migration() is started.."
msgstr "Запущено post_live_migration().."
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
@@ -3561,16 +3562,16 @@ msgstr ""
"отсутствует домен с соответствующим именем.\" Эта ошибка может быть "
"безопасно пропущена."
-#: nova/compute/manager.py:2268
+#: nova/compute/manager.py:2280
#, fuzzy
msgid "Post operation of migration started"
msgstr "Запущено post_live_migration().."
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
@@ -3579,59 +3580,59 @@ msgstr ""
"Найдены %(migration_count)d неподтверждённых перемещений, старше "
"%(confirm_window)d секунд"
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, fuzzy, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr "Завершение работы ВМ для копии %(instance_uuid)s"
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, fuzzy, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "Копия %(instance_id)s не найдена"
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
#, fuzzy
msgid "In ERROR state"
msgstr "Ошибка БД: %s"
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr "Обновление временных данных использования полосы пропускания"
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr "Обновление состояния узла"
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -3640,62 +3641,62 @@ msgstr ""
"Найдено %(num_db_instances)s в базе данных и %(num_vm_instances)s в "
"гипервизоре."
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "копия не включена"
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr "FLAGS.reclaim_instance_interval <= 0, пропуск..."
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4157,7 +4158,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr "Присвоить адрес %(public_ip)s копии %(instance_id)s"
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr "Этот драйвер поддерживает только записи типа 'a'."
@@ -5111,6 +5112,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5333,7 +5338,7 @@ msgstr "test_snapshot_detail: resp_dict=%s"
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr "Выполняемые копии: %s"
@@ -5350,7 +5355,7 @@ msgstr "После завершения работы копий: %s"
msgid "Internal error"
msgstr "Внутренняя ошибка"
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr "После принудительного завершения работы копий: %s"
@@ -7527,14 +7532,14 @@ msgstr "Получение размера образа для образа %s"
msgid "Got image size of %(size)s for the image %(image)s"
msgstr "Принят размер образа %(size)s для образа %(image)s"
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, 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/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, fuzzy, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -7543,7 +7548,7 @@ msgstr ""
"НЕ РЕАЛИЗОВАНО: Вызов %(method)s не поддерживается агентом. VM "
"id=%(instance_uuid)s; args=%(args)r"
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, fuzzy, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr "Вызов %(method)s возвратил ошибку: %(e)s."
@@ -8299,127 +8304,127 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr "Ошибка перемещения vhd на новый узел"
-#: nova/virt/xenapi/vmops.py:650
-#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:654
+#, fuzzy, python-format
+msgid "Resizing down VDI %(vdi_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:776
+#: nova/virt/xenapi/vmops.py:778
#, 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:781
+#: nova/virt/xenapi/vmops.py:783
#, fuzzy
msgid "Resize complete"
msgstr "Изменение размера копии %s завершено"
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
#, fuzzy
msgid "Unable to find root VBD/VDI for VM"
msgstr "Ошибка поиска vbd для vdi %s"
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, fuzzy, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr "Не найден том для копии %(instance_id)s."
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
#, fuzzy
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
"Копия %(instance_uuid)s использует RAW или VHD, пропуск ядра и удаление "
"ramdisk"
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr "копия содержит ядро или ramdisk, но не оба"
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr "файлы ядра/ramdisk удалены"
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
#, fuzzy
msgid "Destroying VM"
msgstr "Выполнение перезагрузки xvp"
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr "ВМ не предоставлена, пропуск выполнения ликвидации..."
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr "Копия в состоянии режима восстановления: %s"
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
#, fuzzy
msgid "VM is not present, skipping power off..."
msgstr "ВМ не предоставлена, пропуск выполнения ликвидации..."
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
#, fuzzy
msgid "Automatically hard rebooting"
msgstr "Автоматическая безотказная перезагрузка %d"
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr "Невозможно получить сведения о пропускной способности."
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
#, fuzzy
msgid "Injecting network info to xenstore"
msgstr "установка сетевого узла"
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
#, fuzzy
msgid "Creating vifs"
msgstr "Создание изображения"
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, fuzzy, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr "Создание VIF для ВМ %(vm_ref)s, сеть %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1371
+#: nova/virt/xenapi/vmops.py:1373
#, 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:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
#, fuzzy
msgid "Migrate Send failed"
msgstr "Ошибка создания"
diff --git a/nova/locale/tl/LC_MESSAGES/nova.po b/nova/locale/tl/LC_MESSAGES/nova.po
index 327f346ee..39943e76e 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-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2011-08-23 11:21+0000\n"
"Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
"Language-Team: Tagalog <tl@li.org>\n"
@@ -155,7 +155,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr ""
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr ""
@@ -2845,10 +2845,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr ""
-
#: nova/cloudpipe/pipelib.py:43
msgid "Instance type for vpn instances"
msgstr ""
@@ -2968,116 +2964,116 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, python-format
msgid "snapshot for %s"
msgstr ""
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, python-format
msgid "Going to try to live migrate instance to %s"
msgstr ""
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr ""
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
msgid "Security group is still in use"
msgstr ""
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr ""
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr ""
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr ""
@@ -3233,353 +3229,358 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
msgid "Rebuilding instance"
msgstr ""
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr ""
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
msgid "Detaching volume from unknown instance"
msgstr ""
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4033,7 +4034,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr ""
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -4960,6 +4961,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5181,7 +5186,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr ""
@@ -5198,7 +5203,7 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7319,19 +7324,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8052,117 +8057,117 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1371
+#: nova/virt/xenapi/vmops.py:1373
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9742,3 +9747,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+
diff --git a/nova/locale/tr/LC_MESSAGES/nova.po b/nova/locale/tr/LC_MESSAGES/nova.po
index fd1ef2b30..5955adcb2 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-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2011-12-14 18:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Turkish <tr@li.org>\n"
@@ -155,7 +155,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr ""
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr ""
@@ -2845,10 +2845,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr ""
-
#: nova/cloudpipe/pipelib.py:43
msgid "Instance type for vpn instances"
msgstr ""
@@ -2968,116 +2964,116 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, python-format
msgid "snapshot for %s"
msgstr ""
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, python-format
msgid "Going to try to live migrate instance to %s"
msgstr ""
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr ""
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
msgid "Security group is still in use"
msgstr ""
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr ""
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr ""
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr ""
@@ -3233,353 +3229,358 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
msgid "Rebuilding instance"
msgstr ""
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr ""
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
msgid "Detaching volume from unknown instance"
msgstr ""
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4033,7 +4034,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr ""
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -4960,6 +4961,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5181,7 +5186,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr ""
@@ -5198,7 +5203,7 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7319,19 +7324,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8052,117 +8057,117 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1371
+#: nova/virt/xenapi/vmops.py:1373
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9741,3 +9746,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+
diff --git a/nova/locale/uk/LC_MESSAGES/nova.po b/nova/locale/uk/LC_MESSAGES/nova.po
index 19e096b89..ad6636a61 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-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2011-08-23 11:21+0000\n"
"Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
"Language-Team: Ukrainian <uk@li.org>\n"
@@ -156,7 +156,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr ""
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr ""
@@ -2847,10 +2847,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr ""
-
#: nova/cloudpipe/pipelib.py:43
msgid "Instance type for vpn instances"
msgstr ""
@@ -2970,116 +2966,116 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, python-format
msgid "snapshot for %s"
msgstr ""
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, python-format
msgid "Going to try to live migrate instance to %s"
msgstr ""
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr ""
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
msgid "Security group is still in use"
msgstr ""
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr "Вилучити групу безпеки %s"
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr ""
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr ""
@@ -3235,353 +3231,358 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
msgid "Rebuilding instance"
msgstr ""
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr ""
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
msgid "Detaching volume from unknown instance"
msgstr ""
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4035,7 +4036,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr ""
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -4962,6 +4963,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5183,7 +5188,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr ""
@@ -5200,7 +5205,7 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7321,19 +7326,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8054,117 +8059,117 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1371
+#: nova/virt/xenapi/vmops.py:1373
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9744,3 +9749,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index 653d9e43d..4bef3018b 100644
--- a/nova/locale/zh_CN/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_CN/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2012-05-07 06:51+0000\n"
"Last-Translator: Edward <Unknown>\n"
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
@@ -160,7 +160,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr "卷 %(volume_id)s 没有附加任何东西"
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr "密钥对数据无效"
@@ -2888,10 +2888,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr "试图实例化单例"
-
#: nova/cloudpipe/pipelib.py:43
#, fuzzy
msgid "Instance type for vpn instances"
@@ -3021,118 +3017,118 @@ msgstr "搜索条件: %s"
msgid "Image type not recognized %s"
msgstr "无法识别镜像类型 %s"
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, fuzzy, python-format
msgid "snapshot for %s"
msgstr "开始为虚拟机 %s 快照"
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr "flavor_id为空。假定在迁移。"
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr "旧的实例类型 %(current_instance_type_name)s,新的实例类型 %(new_instance_type_name)s"
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, fuzzy, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr "%(pid)s 已经超过配额,试图运行 %(min_count)s 个实例"
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, fuzzy, python-format
msgid "Going to try to live migrate instance to %s"
msgstr "准备尝试终止实例 %s"
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr "密钥对名称长度必须在1到255个字符之间"
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr "安全组 %s 既不是字符串也不是unicode"
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr "安全组 %s 不能为空。"
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, fuzzy, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr "参数GroupName的值 (%s) 无效。长度超过了上限255。"
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr "安全组 %s 不能比255个字符更长。"
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr "创建安全组 %s"
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr "安全组 %s 已经存在"
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
#, fuzzy
msgid "Security group is still in use"
msgstr "安全组id应该是整数"
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr "删除安全组 %s"
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr "没有找到规则 (%s)"
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
#, fuzzy
msgid "Quota exceeded, too many security group rules."
msgstr "添加安全组规则:%r"
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr "授权 %s 安全组入口权限"
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr "撤销 %s 安全组入口权限"
@@ -3293,86 +3289,91 @@ msgstr "忽略异常 DiskNotFound: %s"
msgid "terminating bdm %s"
msgstr "终止bdm %s"
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr "%s。把实例的 vm_state设置为ERROR"
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
#, fuzzy
msgid "Rebuilding instance"
msgstr "正在重新创建实例 %s"
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
#, fuzzy
msgid "Rebooting instance"
msgstr "正在重启虚拟机 %s"
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, fuzzy, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr "试图重启一个没有运行的实例:%(instance_uuid)s (状态:%(state)s 预计:%(running)s)"
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "无法重新创建实例 [%(instance_uuid)s]: %(exc)s"
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
#, fuzzy
msgid "instance snapshotting"
msgstr "实例 %s: 快照中"
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, fuzzy, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr "试图为一个没有运行的实例快照:%(instance_uuid)s (状态:%(state)s 预计:%(running)s)"
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr "找到 %(num_images)d 个镜像 (rotation: %(rotation)d)"
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr "轮换出%d个备份"
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr "正在删除镜像 %s"
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr "设置管理员密码失败。实例 %s 没有运行"
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
#, fuzzy
msgid "Root password set"
msgstr "实例 %s:Root密码已设置"
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr "该驱动不能执行set_admin_password。"
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, fuzzy, python-format
msgid "set_admin_password failed: %s"
msgstr "该驱动不能执行set_admin_password。"
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
#, fuzzy
msgid "error setting admin password"
msgstr "设置管理员密码出错"
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, fuzzy, python-format
msgid ""
"trying to inject a file into a non-running (state: "
@@ -3381,136 +3382,136 @@ msgstr ""
"试图把一个文件注入到没有运行的实例:%(instance_uuid)s (状态: %(current_power_state)s 预计: "
"%(expected_state)s)"
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, fuzzy, python-format
msgid "injecting file to %(path)s"
msgstr "注入文件路径:'%s'"
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
#, fuzzy
msgid "Unrescuing"
msgstr "实例 %s:取消救援"
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr "目标与来源一样。"
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
#, fuzzy
msgid "Pausing"
msgstr "正在更新。"
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "实例 %s :获取诊断"
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
#, fuzzy
msgid "Reset network"
msgstr "重置网络"
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
#, fuzzy
msgid "Inject network info"
msgstr "实例 %s:注入网络信息"
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr "将注入的network_info:|%s|"
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
#, fuzzy
msgid "Get console output"
msgstr "获取实例 %s 控制台输出"
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
#, fuzzy
msgid "Getting vnc console"
msgstr "实例 %s:正在获得VNC控制台"
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr "卷 %(volume_id)s 正在 %(mountpoint)s 上启动"
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, fuzzy, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr "卷 %(volume_id)s 正在 %(mountpoint)s 上启动"
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr "卷 %(volume_id)s 从挂载点 %(mp)s 分离"
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "从未知实例%s中分离卷"
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, fuzzy, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr "实例没有卷。"
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr "预在线迁移在%(dest)s失败"
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
#, fuzzy
msgid "_post_live_migration() is started.."
msgstr "post_live_migration()已经启动。"
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr "没有找到floating_ip"
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr "没有找到floating_ip"
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
@@ -3519,12 +3520,12 @@ msgstr ""
"在线迁移:意外的错误:无法继承浮动ip。\n"
"%(e)s"
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr "把实例迁移到 %(dest)s 成功完成。"
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
@@ -3532,137 +3533,137 @@ msgstr ""
"你会看到错误“libvirt: QEMU error: Domain not found: no domain with matching "
"name。”这个错误可以放心的忽略。"
-#: nova/compute/manager.py:2268
+#: nova/compute/manager.py:2280
#, fuzzy
msgid "Post operation of migration started"
msgstr "迁移后操作启动"
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr "发现 %(migration_count)d 个超过 %(confirm_window)d 秒未经确认的迁移"
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, fuzzy, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr "为实例 %(instance_uuid)s 关闭虚拟机"
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, fuzzy, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "没有找到实例 %(instance_id)s"
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
#, fuzzy
msgid "In ERROR state"
msgstr "节点处于未知的错误状态。"
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr "更新带宽使用缓存"
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr "更新主机状态"
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr "在数据库中找到 %(num_db_instances)s个实例,在虚拟机管理程序找到 %(num_vm_instances)s 个实例。"
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "实例未启动"
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr "FLAGS.reclaim_instance_interval <= 0,跳过..."
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr "回收删除的实例"
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, fuzzy, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr "检测标签名为 '%(name_label)s' 的实例,这些实例被标识为DELETED却仍然存在于主机上。"
-#: nova/compute/manager.py:2763
+#: nova/compute/manager.py:2775
#, fuzzy, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr "销毁标签名为 '%(name_label)s' 的实例,这些实例被标识为DELETED却仍然存在于主机上。"
-#: nova/compute/manager.py:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr "无法识别的FLAGS.running_deleted_instance_action的取值 '%(action)s'"
@@ -4127,7 +4128,7 @@ msgstr "参数:%s"
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr "把地址 %(public_ip)s 关联到实例 %(instance_id)s"
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr "驱动仅支持入口类型 'a'。"
@@ -5069,6 +5070,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr "试图实例化单例"
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5293,7 +5298,7 @@ msgstr "test_snapshot_detail: resp_dict=%s"
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr "正在运行的实例:%s"
@@ -5310,7 +5315,7 @@ msgstr "终止实例之后:%s"
msgid "Internal error"
msgstr "内部错误"
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr "强制杀死实例后:%s"
@@ -7507,19 +7512,19 @@ msgstr "正在获取镜像 %s 的大小"
msgid "Got image size of %(size)s for the image %(image)s"
msgstr "获得大小为 %(size)s 的镜像目的为了 %(image)s"
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, 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/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, fuzzy, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr "没有执行:代理不支持 %(method)s 的调用。虚拟机id=%(instance_uuid)s; args=%(args)r"
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, fuzzy, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr "对 %(method)s 的调用返回错误:%(e)s。"
@@ -8259,126 +8264,126 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr "将 vhd 转移到新主机失败"
-#: nova/virt/xenapi/vmops.py:650
-#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:654
+#, fuzzy, python-format
+msgid "Resizing down VDI %(vdi_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:776
+#: nova/virt/xenapi/vmops.py:778
#, 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:781
+#: nova/virt/xenapi/vmops.py:783
#, fuzzy
msgid "Resize complete"
msgstr "调整实例 %s 的大小完毕"
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
#, fuzzy
msgid "Unable to find root VBD/VDI for VM"
msgstr "无法为VDI %s 找到VBD"
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, fuzzy, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr "没有为实例 %(instance_id)s 找到卷。"
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
#, fuzzy
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr "实例 %(instance_uuid)s 使用RAW或者VHD,跳过内核和内存盘的删除"
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr "实例拥有内核或者内存盘,但不是二者均有"
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr "内核/内存盘文件移除了"
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
#, fuzzy
msgid "Destroying VM"
msgstr "重启xvp"
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr "虚拟机不存在,跳过销毁..."
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr "实例已处于救援模式:%s"
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
#, fuzzy
msgid "VM is not present, skipping power off..."
msgstr "虚拟机不存在,跳过销毁..."
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, 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:1155
+#: nova/virt/xenapi/vmops.py:1157
#, fuzzy
msgid "Automatically hard rebooting"
msgstr "自动冷重启 %d"
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr "无法得到带宽信息"
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
#, fuzzy
msgid "Injecting network info to xenstore"
msgstr "为虚拟机注入网络信息到xs:|%s|"
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
#, fuzzy
msgid "Creating vifs"
msgstr "正在创建镜像"
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, fuzzy, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr "正在为虚拟机 %(vm_ref)s,网络 %(network_ref)s 创建VIF。"
-#: nova/virt/xenapi/vmops.py:1371
+#: nova/virt/xenapi/vmops.py:1373
#, 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:1395
+#: nova/virt/xenapi/vmops.py:1397
#, fuzzy
msgid "Injecting hostname to xenstore"
msgstr "为虚拟机注入hostname到xs:|%s|"
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
#, fuzzy
msgid "Migrate Send failed"
msgstr "创建失败"
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index fa82e818d..bf9547047 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-09-22 00:02+0000\n"
+"POT-Creation-Date: 2012-09-25 00:02+0000\n"
"PO-Revision-Date: 2012-03-07 02:00+0000\n"
"Last-Translator: Charles Hsu <charles0126+openstack@gmail.com>\n"
"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
@@ -160,7 +160,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
msgstr ""
#: nova/exception.py:238 nova/api/ec2/cloud.py:388 nova/api/ec2/cloud.py:413
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2129
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2128
msgid "Keypair data is invalid"
msgstr "無效的Keypair"
@@ -2852,10 +2852,6 @@ msgstr ""
msgid "No image_name was specified in request."
msgstr ""
-#: nova/auth/fakeldap.py:34
-msgid "Attempted to instantiate singleton"
-msgstr ""
-
#: nova/cloudpipe/pipelib.py:43
msgid "Instance type for vpn instances"
msgstr ""
@@ -2975,116 +2971,116 @@ msgstr ""
msgid "Image type not recognized %s"
msgstr ""
-#: nova/compute/api.py:1278
+#: nova/compute/api.py:1277
#, python-format
msgid "snapshot for %s"
msgstr ""
-#: nova/compute/api.py:1569
+#: nova/compute/api.py:1568
msgid "flavor_id is None. Assuming migration."
msgstr ""
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1577
#, python-format
msgid ""
"Old instance type %(current_instance_type_name)s, new instance type "
"%(new_instance_type_name)s"
msgstr ""
-#: nova/compute/api.py:1620
+#: nova/compute/api.py:1619
#, python-format
msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
msgstr ""
-#: nova/compute/api.py:1792
+#: nova/compute/api.py:1791
msgid "Locking"
msgstr ""
-#: nova/compute/api.py:1800
+#: nova/compute/api.py:1799
msgid "Unlocking"
msgstr ""
-#: nova/compute/api.py:1868
+#: nova/compute/api.py:1867
msgid "Volume must be attached in order to detach."
msgstr ""
-#: nova/compute/api.py:1953
+#: nova/compute/api.py:1952
#, python-format
msgid "Going to try to live migrate instance to %s"
msgstr ""
-#: nova/compute/api.py:2102
+#: nova/compute/api.py:2101
msgid "Keypair name contains unsafe characters"
msgstr ""
-#: nova/compute/api.py:2106
+#: nova/compute/api.py:2105
msgid "Keypair name must be between 1 and 255 characters long"
msgstr ""
-#: nova/compute/api.py:2207
+#: nova/compute/api.py:2206
#, python-format
msgid "Security group %s is not a string or unicode"
msgstr ""
-#: nova/compute/api.py:2210
+#: nova/compute/api.py:2209
#, python-format
msgid "Security group %s cannot be empty."
msgstr ""
-#: nova/compute/api.py:2218
+#: nova/compute/api.py:2217
#, python-format
msgid ""
"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
"limited to '%(allowed)'."
msgstr ""
-#: nova/compute/api.py:2224
+#: nova/compute/api.py:2223
#, python-format
msgid "Security group %s should not be greater than 255 characters."
msgstr ""
-#: nova/compute/api.py:2244
+#: nova/compute/api.py:2243
msgid "Quota exceeded, too many security groups."
msgstr ""
-#: nova/compute/api.py:2247
+#: nova/compute/api.py:2246
#, python-format
msgid "Create Security Group %s"
msgstr ""
-#: nova/compute/api.py:2254
+#: nova/compute/api.py:2253
#, python-format
msgid "Security group %s already exists"
msgstr ""
-#: nova/compute/api.py:2319
+#: nova/compute/api.py:2318
msgid "Security group is still in use"
msgstr ""
-#: nova/compute/api.py:2327
+#: nova/compute/api.py:2326
msgid "Failed to update usages deallocating security group"
msgstr ""
-#: nova/compute/api.py:2330
+#: nova/compute/api.py:2329
#, python-format
msgid "Delete security group %s"
msgstr ""
-#: nova/compute/api.py:2587
+#: nova/compute/api.py:2586
#, python-format
msgid "Rule (%s) not found"
msgstr ""
-#: nova/compute/api.py:2596
+#: nova/compute/api.py:2595
msgid "Quota exceeded, too many security group rules."
msgstr ""
-#: nova/compute/api.py:2599
+#: nova/compute/api.py:2598
#, python-format
msgid "Authorize security group ingress %s"
msgstr ""
-#: nova/compute/api.py:2610
+#: nova/compute/api.py:2609
#, python-format
msgid "Revoke security group ingress %s"
msgstr ""
@@ -3240,354 +3236,359 @@ msgstr ""
msgid "terminating bdm %s"
msgstr ""
-#: nova/compute/manager.py:921 nova/compute/manager.py:1671
-#: nova/compute/manager.py:2802
+#: nova/compute/manager.py:901
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:933 nova/compute/manager.py:1683
+#: nova/compute/manager.py:2814
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
-#: nova/compute/manager.py:1003
+#: nova/compute/manager.py:1015
msgid "Rebuilding instance"
msgstr ""
-#: nova/compute/manager.py:1079
+#: nova/compute/manager.py:1091
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1091
+#: nova/compute/manager.py:1103
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1105
+#: nova/compute/manager.py:1117
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "無法掛載Volume 到虛擬機器 %s"
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1154
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1148
+#: nova/compute/manager.py:1160
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1213
+#: nova/compute/manager.py:1225
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1219
+#: nova/compute/manager.py:1231
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1224
+#: nova/compute/manager.py:1236
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1267
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1262
+#: nova/compute/manager.py:1274
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1272
+#: nova/compute/manager.py:1284
msgid "set_admin_password is not implemented by this driver."
msgstr ""
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1300
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1296
+#: nova/compute/manager.py:1308
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1311
+#: nova/compute/manager.py:1323
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1315
+#: nova/compute/manager.py:1327
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1340
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:1355
+#: nova/compute/manager.py:1367
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:1376
+#: nova/compute/manager.py:1388
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1528
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:1534
+#: nova/compute/manager.py:1546
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:1724
+#: nova/compute/manager.py:1736
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:1741
+#: nova/compute/manager.py:1753
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:1779
+#: nova/compute/manager.py:1791
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:1809
+#: nova/compute/manager.py:1821
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:1825
+#: nova/compute/manager.py:1837
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1842
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:1833
+#: nova/compute/manager.py:1845
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:1850
+#: nova/compute/manager.py:1862
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:1875
+#: nova/compute/manager.py:1887
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:1903
+#: nova/compute/manager.py:1915
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1945
+#: nova/compute/manager.py:1957
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1954
+#: nova/compute/manager.py:1966
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1981
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:2010
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2002
+#: nova/compute/manager.py:2014
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "無法掛載Volume 到虛擬機器 %s"
-#: nova/compute/manager.py:2015
+#: nova/compute/manager.py:2027
#, fuzzy, python-format
msgid "Faild to detach volume %(volume_id)s from %(mp)s"
msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2108
+#: nova/compute/manager.py:2120
msgid "Instance has no volume."
msgstr ""
-#: nova/compute/manager.py:2161
+#: nova/compute/manager.py:2173
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:2187
+#: nova/compute/manager.py:2199
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:2216
+#: nova/compute/manager.py:2228
msgid "No floating_ip found"
msgstr ""
-#: nova/compute/manager.py:2224
+#: nova/compute/manager.py:2236
msgid "No floating_ip found."
msgstr ""
-#: nova/compute/manager.py:2226
+#: nova/compute/manager.py:2238
#, python-format
msgid ""
"Live migration: Unexpected error: cannot inherit floating ip.\n"
"%(e)s"
msgstr ""
-#: nova/compute/manager.py:2252
+#: nova/compute/manager.py:2264
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:2254
+#: nova/compute/manager.py:2266
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:2268
+#: nova/compute/manager.py:2280
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2411
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2437
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:2430
+#: nova/compute/manager.py:2442
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2451
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2458
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:2450
+#: nova/compute/manager.py:2462
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2469
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
msgstr ""
-#: nova/compute/manager.py:2465
+#: nova/compute/manager.py:2477
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:2482
+#: nova/compute/manager.py:2494
#, 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:2500
+#: nova/compute/manager.py:2512
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:2524
+#: nova/compute/manager.py:2536
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2562
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:2577
+#: nova/compute/manager.py:2589
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:2583 nova/compute/manager.py:2621
+#: nova/compute/manager.py:2595 nova/compute/manager.py:2633
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:2608
+#: nova/compute/manager.py:2620
#, 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:2645
+#: nova/compute/manager.py:2657
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2657 nova/compute/manager.py:2668
-#: nova/compute/manager.py:2682
+#: nova/compute/manager.py:2669 nova/compute/manager.py:2680
+#: nova/compute/manager.py:2694
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:2662
+#: nova/compute/manager.py:2674
msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2687
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:2691
+#: nova/compute/manager.py:2703
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:2699
+#: nova/compute/manager.py:2711
msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2722
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:2756
+#: nova/compute/manager.py:2768
#, 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:2763
+#: nova/compute/manager.py:2775
#, 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:2770
+#: nova/compute/manager.py:2782
#, python-format
msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
msgstr ""
@@ -4041,7 +4042,7 @@ msgstr ""
msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
msgstr ""
-#: nova/network/ldapdns.py:318
+#: nova/network/ldapdns.py:317
msgid "This driver only supports type 'a' entries."
msgstr ""
@@ -4969,6 +4970,10 @@ msgstr ""
msgid "TCP: trust state of %(host)s:%(level)s(%(trust)s)"
msgstr ""
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
#: nova/tests/fake_utils.py:72
#, python-format
msgid "Faking execution of cmd (subprocess): %s"
@@ -5190,7 +5195,7 @@ msgstr ""
#: nova/tests/compute/test_compute.py:595
#: nova/tests/compute/test_compute.py:628
#: nova/tests/compute/test_compute.py:653
-#: nova/tests/compute/test_compute.py:2231
+#: nova/tests/compute/test_compute.py:2243
#, python-format
msgid "Running instances: %s"
msgstr ""
@@ -5207,7 +5212,7 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:2242
+#: nova/tests/compute/test_compute.py:2254
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
@@ -7330,19 +7335,19 @@ msgstr ""
msgid "Got image size of %(size)s for the image %(image)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/agent.py:62 nova/virt/xenapi/vmops.py:1434
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1436
+#: nova/virt/xenapi/agent.py:66 nova/virt/xenapi/vmops.py:1438
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/agent.py:71 nova/virt/xenapi/vmops.py:1443
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -8063,117 +8068,117 @@ msgstr ""
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:654
#, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:778
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:781
+#: nova/virt/xenapi/vmops.py:783
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:825
+#: nova/virt/xenapi/vmops.py:827
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:908
+#: nova/virt/xenapi/vmops.py:910
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:935
+#: nova/virt/xenapi/vmops.py:937
#, python-format
msgid "Destroying VDIs for Instance %(instance_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:963
+#: nova/virt/xenapi/vmops.py:965
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:970
+#: nova/virt/xenapi/vmops.py:972
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:977
+#: nova/virt/xenapi/vmops.py:979
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1003
+#: nova/virt/xenapi/vmops.py:1005
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1029
+#: nova/virt/xenapi/vmops.py:1031
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1082
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1115
+#: nova/virt/xenapi/vmops.py:1117
msgid "VM is not present, skipping power off..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1153
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1155
+#: nova/virt/xenapi/vmops.py:1157
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1215
+#: nova/virt/xenapi/vmops.py:1217
msgid "Could not get bandwidth info."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1257
+#: nova/virt/xenapi/vmops.py:1259
msgid "Fetching VM ref while BUILDING failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1342
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1359
+#: nova/virt/xenapi/vmops.py:1361
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1368
+#: nova/virt/xenapi/vmops.py:1370
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1371
+#: nova/virt/xenapi/vmops.py:1373
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1395
+#: nova/virt/xenapi/vmops.py:1397
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1493
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1525
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1571
+#: nova/virt/xenapi/vmops.py:1573
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1607
+#: nova/virt/xenapi/vmops.py:1609
msgid "Migrate Send failed"
msgstr ""
@@ -9760,3 +9765,6 @@ msgid ""
"gone: %(exc)s"
msgstr ""
+#~ msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#~ msgstr ""
+