Binary files /tmp/S9PI9SNO1O/language-pack-fil-base-14.04+20140223/data/extra.tar and /tmp/Ref_2yVU9i/language-pack-fil-base-14.04+20140320/data/extra.tar differ
diff -Nru language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/apparmorapplet.po language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/apparmorapplet.po
--- language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/apparmorapplet.po	2014-02-24 08:27:31.000000000 +0000
+++ language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/apparmorapplet.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-# Filipino translation for apparmor
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the apparmor package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: apparmor\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-02-06 14:27-0800\n"
-"PO-Revision-Date: 2011-04-04 05:39+0000\n"
-"Last-Translator: J. Austin Rodriguez <zeroseven0183@gmail.com>\n"
-"Language-Team: Filipino <fil@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 13:31+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: src/apparmor-applet.c:244
-msgid ""
-"AppArmorApplet is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version."
-msgstr ""
-"Ang AppArmorApplet ay isang free software; maaari mong ipamigay ito at/o "
-"baguhin \n"
-"sa ilalim ng mga termino ng GNU General Public License na inilathala ng \n"
-"Free Software Foundation; alinmang bersyon 2 ng Lisensiya, o \n"
-"(sa iyong opsyon) anumang mas bagong bersyon."
-
-#: src/preferences_dialog.c:31
-msgid "AppArmor Desktop Preferences"
-msgstr "Mga Kagustuhan sa AppArmor Desktop"
-
-#: src/preferences_dialog.c:46
-msgid "Profile Generation"
-msgstr "Paglikha ng Profile"
-
-#: src/preferences_dialog.c:54
-msgid "Path"
-msgstr "Pagdaraanan"
-
-#: src/preferences_dialog.c:76
-msgid "YAST"
-msgstr "YAST"
-
-#: src/preferences_dialog.c:77
-msgid "genprof"
-msgstr "genprof"
-
-#: src/reject_list.c:58
-msgid "AppArmor Rejections"
-msgstr "Mga Itinanggi ng AppArmor"
diff -Nru language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/apt.po language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/apt.po
--- language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/apt.po	2014-02-24 08:27:30.000000000 +0000
+++ language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/apt.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,1426 +0,0 @@
-# Filipino translation for apt
-# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
-# This file is distributed under the same license as the apt package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-15 19:05+0000\n"
-"PO-Revision-Date: 2007-04-01 03:59+0000\n"
-"Last-Translator: Marlon Janssen Arao <Unknown>\n"
-"Language-Team: Filipino <fil@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2013-12-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: cmdline/apt-cache.cc:141
-#, c-format
-msgid "Package %s version %s has an unmet dep:\n"
-msgstr ""
-"Package %s bersyon %s ay may hindi naabot na kailangan:\n"
-"\n"
-
-#: cmdline/apt-cache.cc:245
-msgid "Total package names: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:286
-msgid "Total package structures: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:285
-msgid "  Normal packages: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:286
-msgid "  Pure virtual packages: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:287
-msgid "  Single virtual packages: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:288
-msgid "  Mixed virtual packages: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:289
-msgid "  Missing: "
-msgstr "  Nawawala: "
-
-#: cmdline/apt-cache.cc:291
-msgid "Total distinct versions: "
-msgstr "Kabuuang dami ng mga natatanging bersyon: "
-
-#: cmdline/apt-cache.cc:293
-msgid "Total distinct descriptions: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:295
-msgid "Total dependencies: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:298
-msgid "Total ver/file relations: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:300
-msgid "Total Desc/File relations: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:302
-msgid "Total Provides mappings: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:314
-msgid "Total globbed strings: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:328
-msgid "Total dependency version space: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:333
-msgid "Total slack space: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:341
-msgid "Total space accounted for: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
-#, c-format
-msgid "Package file %s is out of sync."
-msgstr ""
-
-#: cmdline/apt-cache.cc:1453
-msgid "No packages found"
-msgstr "Walang mga package na mahanap"
-
-#: cmdline/apt-cache.cc:1221
-msgid "You must give at least one search pattern"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1353
-msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr ""
-
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
-#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021
-#: cmdline/apt-cache.cc:1425 cmdline/apt-cache.cc:1577
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Hindi mahanap ang package %s"
-
-#: cmdline/apt-cache.cc:1530
-msgid "Package files:"
-msgstr "Mga package file:"
-
-#: cmdline/apt-cache.cc:1537 cmdline/apt-cache.cc:1624
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1551
-msgid "Pinned packages:"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1604
-msgid "(not found)"
-msgstr "(hindi nahanap)"
-
-#. Installed version
-#: cmdline/apt-cache.cc:1584
-msgid "  Installed: "
-msgstr "  Nailagay: "
-
-#. Candidate Version
-#: cmdline/apt-cache.cc:1591
-msgid "  Candidate: "
-msgstr "  Kandidato: "
-
-#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
-msgid "(none)"
-msgstr "(wala)"
-
-#: cmdline/apt-cache.cc:1601
-msgid "  Package pin: "
-msgstr ""
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc:1610
-msgid "  Version table:"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1720 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:588
-#: cmdline/apt-get.cc:2723 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s compiled on %s %s\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1682
-msgid ""
-"Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-"\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-"\n"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
-"Options:\n"
-"  -h   This help text.\n"
-"  -p=? The package cache.\n"
-"  -s=? The source cache.\n"
-"  -q   Disable progress indicator.\n"
-"  -i   Show only important deps for the unmet command.\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:77
-msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:92
-msgid "Please insert a Disc in the drive and press enter"
-msgstr "Maaari bang lagyan ng Disc sa drive at pindutin ang enter"
-
-#: cmdline/apt-cdrom.cc:127
-#, c-format
-msgid "Failed to mount '%s' to '%s'"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:162
-msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "Ulitin ang proseso para sa lahat ng mga CD sa iyong kumpol."
-
-#: cmdline/apt-config.cc:41
-msgid "Arguments not in pairs"
-msgstr ""
-
-#: cmdline/apt-config.cc:76
-msgid ""
-"Usage: apt-config [options] command\n"
-"\n"
-"apt-config is a simple tool to read the APT config file\n"
-"\n"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\n"
-"\n"
-"Options:\n"
-"  -h   This help text.\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:98
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s ay hindi tamang DEB package."
-
-#: cmdline/apt-extracttemplates.cc:232
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:267
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Hindi makasulat sa %s"
-
-#: cmdline/apt-extracttemplates.cc:310
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Hindi makuha ang bersyon ng debconf. Ang debconf ba ay nakalagay?"
-
-#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:346
-msgid "Package extension list is too long"
-msgstr "Ang listahan ng package extension ay masyadong mahaba"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:188
-#: ftparchive/apt-ftparchive.cc:211 ftparchive/apt-ftparchive.cc:261
-#: ftparchive/apt-ftparchive.cc:275 ftparchive/apt-ftparchive.cc:297
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Nakamali sa pagpro-proseso ng direktoryong %s"
-
-#: ftparchive/apt-ftparchive.cc:259
-msgid "Source extension list is too long"
-msgstr "Ang listahan ng source extension ay masyadong mahaba"
-
-#: ftparchive/apt-ftparchive.cc:376
-msgid "Error writing header to contents file"
-msgstr "Nagkamali sa pagsulat ng pang-ulo sa mga laman ng file"
-
-#: ftparchive/apt-ftparchive.cc:406
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Nagkamali sa pagpro-proseso ng mga lamang %s"
-
-#: ftparchive/apt-ftparchive.cc:594
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:800
-msgid "No selections matched"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:878
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "May ibang mga file na nawawala sa grupo ng package file `%s'"
-
-#: ftparchive/cachedb.cc:43
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Ang DB ay sira, binago ang pangalan sa %s.old"
-
-#: ftparchive/cachedb.cc:61
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Luma ang DB, sinusubukanng mag-upgrade %s"
-
-#: ftparchive/cachedb.cc:72
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-
-#: ftparchive/cachedb.cc:77
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Hindi mabuksa ang DB file %s: %s"
-
-#: ftparchive/cachedb.cc:123
-#, c-format
-msgid "Failed to stat %s"
-msgstr ""
-
-#: ftparchive/cachedb.cc:238
-msgid "Archive has no control record"
-msgstr ""
-
-#: ftparchive/cachedb.cc:444
-msgid "Unable to get a cursor"
-msgstr "Hindi makakuha ng cursor"
-
-#: ftparchive/writer.cc:73
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr ""
-"W: Hindi mabasa ang direktoryo %s\n"
-"\n"
-
-#: ftparchive/writer.cc:78
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:134
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:136
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:143
-msgid "E: Errors apply to file "
-msgstr ""
-
-#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
-#, c-format
-msgid "Failed to resolve %s"
-msgstr ""
-
-#: ftparchive/writer.cc:174
-msgid "Tree walking failed"
-msgstr ""
-
-#: ftparchive/writer.cc:201
-#, c-format
-msgid "Failed to open %s"
-msgstr ""
-
-#: ftparchive/writer.cc:260
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr ""
-
-#: ftparchive/writer.cc:268
-#, c-format
-msgid "Failed to readlink %s"
-msgstr ""
-
-#: ftparchive/writer.cc:272
-#, c-format
-msgid "Failed to unlink %s"
-msgstr ""
-
-#: ftparchive/writer.cc:279
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr ""
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr ""
-
-#: ftparchive/writer.cc:392
-msgid "Archive had no package field"
-msgstr ""
-
-#: ftparchive/writer.cc:400 ftparchive/writer.cc:687
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr ""
-
-#: ftparchive/writer.cc:463 ftparchive/writer.cc:790
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:697
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr ""
-
-#: ftparchive/writer.cc:701
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr ""
-
-#: ftparchive/contents.cc:362 ftparchive/contents.cc:393
-msgid "realloc - Failed to allocate memory"
-msgstr ""
-
-#: ftparchive/override.cc:34 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
-msgstr ""
-
-#: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr ""
-
-#: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr ""
-
-#: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr ""
-
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr ""
-
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr ""
-
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr ""
-
-#: ftparchive/multicompress.cc:170
-msgid "Failed to create IPC pipe to subprocess"
-msgstr ""
-
-#: ftparchive/multicompress.cc:196
-msgid "Failed to create FILE*"
-msgstr ""
-
-#: ftparchive/multicompress.cc:199
-msgid "Failed to fork"
-msgstr ""
-
-#: ftparchive/multicompress.cc:213
-msgid "Compress child"
-msgstr ""
-
-#: ftparchive/multicompress.cc:236
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr ""
-
-#: ftparchive/multicompress.cc:404
-msgid "IO to subprocess/file failed"
-msgstr ""
-
-#: ftparchive/multicompress.cc:456
-msgid "Failed to read while computing MD5"
-msgstr ""
-
-#: ftparchive/multicompress.cc:473
-#, c-format
-msgid "Problem unlinking %s"
-msgstr ""
-
-#: ftparchive/multicompress.cc:488
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:127
-msgid "Y"
-msgstr ""
-
-#: cmdline/apt-get.cc:140
-msgid "N"
-msgstr ""
-
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1756
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:244
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: cmdline/apt-get.cc:334
-#, c-format
-msgid "but %s is installed"
-msgstr ""
-
-#: cmdline/apt-get.cc:336
-#, c-format
-msgid "but %s is to be installed"
-msgstr ""
-
-#: cmdline/apt-get.cc:343
-msgid "but it is not installable"
-msgstr ""
-
-#: cmdline/apt-get.cc:345
-msgid "but it is a virtual package"
-msgstr ""
-
-#: cmdline/apt-get.cc:348
-msgid "but it is not installed"
-msgstr ""
-
-#: cmdline/apt-get.cc:348
-msgid "but it is not going to be installed"
-msgstr ""
-
-#: cmdline/apt-get.cc:353
-msgid " or"
-msgstr ""
-
-#: cmdline/apt-get.cc:382
-msgid "The following NEW packages will be installed:"
-msgstr ""
-
-#: cmdline/apt-get.cc:408
-msgid "The following packages will be REMOVED:"
-msgstr ""
-
-#: cmdline/apt-get.cc:430
-msgid "The following packages have been kept back:"
-msgstr ""
-
-#: cmdline/apt-get.cc:451
-msgid "The following packages will be upgraded:"
-msgstr ""
-
-#: cmdline/apt-get.cc:472
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: cmdline/apt-get.cc:492
-msgid "The following held packages will be changed:"
-msgstr ""
-
-#: cmdline/apt-get.cc:545
-#, c-format
-msgid "%s (due to %s) "
-msgstr ""
-
-#: cmdline/apt-get.cc:553
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-
-#: cmdline/apt-get.cc:584
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr ""
-
-#: cmdline/apt-get.cc:588
-#, c-format
-msgid "%lu reinstalled, "
-msgstr ""
-
-#: cmdline/apt-get.cc:590
-#, c-format
-msgid "%lu downgraded, "
-msgstr ""
-
-#: cmdline/apt-get.cc:592
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:596
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:628
-#, c-format
-msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:634
-#, c-format
-msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1126
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1138
-msgid " [Installed]"
-msgstr ""
-
-#: cmdline/apt-get.cc:671
-msgid " [Not candidate version]"
-msgstr ""
-
-#: cmdline/apt-get.cc:1143
-msgid "You should explicitly select one to install."
-msgstr ""
-
-#: cmdline/apt-get.cc:1148
-#, c-format
-msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1167
-msgid "However the following packages replace it:"
-msgstr ""
-
-#: cmdline/apt-get.cc:706
-#, c-format
-msgid "Package '%s' has no installation candidate"
-msgstr ""
-
-#: cmdline/apt-get.cc:717
-#, c-format
-msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:748
-#, c-format
-msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1097
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:782
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1190
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1198
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1798
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:844
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:849
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1115
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:669
-msgid "Correcting dependencies..."
-msgstr ""
-
-#: cmdline/apt-get.cc:672
-msgid " failed."
-msgstr ""
-
-#: cmdline/apt-get.cc:675
-msgid "Unable to correct dependencies"
-msgstr ""
-
-#: cmdline/apt-get.cc:678
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: cmdline/apt-get.cc:680
-msgid " Done"
-msgstr ""
-
-#: cmdline/apt-get.cc:986
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: cmdline/apt-get.cc:687
-msgid "Unmet dependencies. Try using -f."
-msgstr ""
-
-#: cmdline/apt-get.cc:712
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
-
-#: cmdline/apt-get.cc:716
-msgid "Authentication warning overridden.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:723
-msgid "Install these packages without verification [y/N]? "
-msgstr ""
-
-#: cmdline/apt-get.cc:725
-msgid "Some packages could not be authenticated"
-msgstr ""
-
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: cmdline/apt-get.cc:775
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-
-#: cmdline/apt-get.cc:784
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-
-#: cmdline/apt-get.cc:795
-msgid "Internal error, Ordering didn't finish"
-msgstr ""
-
-#: cmdline/apt-get.cc:836
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-
-#: cmdline/apt-get.cc:841
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:844
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:849
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:852
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2303
-#: cmdline/apt-get.cc:2306
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:880
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr ""
-
-#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-
-#: cmdline/apt-get.cc:898
-msgid "Yes, do as I say!"
-msgstr ""
-
-#: cmdline/apt-get.cc:900
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
-msgid "Abort."
-msgstr ""
-
-#: cmdline/apt-get.cc:921
-msgid "Do you want to continue [Y/n]? "
-msgstr ""
-
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2359
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1011
-msgid "Some files failed to download"
-msgstr ""
-
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2368
-msgid "Download complete and in download only mode"
-msgstr ""
-
-#: cmdline/apt-get.cc:1018
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-
-#: cmdline/apt-get.cc:1022
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-
-#: cmdline/apt-get.cc:1027
-msgid "Unable to correct missing packages."
-msgstr ""
-
-#: cmdline/apt-get.cc:1028
-msgid "Aborting install."
-msgstr ""
-
-#: cmdline/apt-get.cc:1363
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
-msgstr ""
-
-#: cmdline/apt-get.cc:1335
-#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1367
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
-
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1405
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1421
-msgid "The update command takes no arguments"
-msgstr ""
-
-#: cmdline/apt-get.cc:1490
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: cmdline/apt-get.cc:1547
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#. 
-#. if (Packages == 1)
-#. {
-#. c1out << endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << endl;
-#. }
-#. 
-#: cmdline/apt-get.cc:1550 cmdline/apt-get.cc:1841
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1554
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
-
-#: cmdline/apt-get.cc:1754
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cmdline/apt-get.cc:1758
-#, c-format
-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cmdline/apt-get.cc:1542
-msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
-
-#: cmdline/apt-get.cc:1573
-msgid "Internal error, AllUpgrade broke stuff"
-msgstr ""
-
-#: cmdline/apt-get.cc:1878
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1814
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-
-#: cmdline/apt-get.cc:1826
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-
-#: cmdline/apt-get.cc:1844
-msgid "Broken packages"
-msgstr ""
-
-#: cmdline/apt-get.cc:1873
-msgid "The following extra packages will be installed:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1962
-msgid "Suggested packages:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1963
-msgid "Recommended packages:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1743 cmdline/apt-get.cc:1779
-#, c-format
-msgid "Couldn't find package %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2082
-#, c-format
-msgid "%s set to automatically installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:105
-msgid ""
-"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
-"instead."
-msgstr ""
-
-#: cmdline/apt-get.cc:1992
-msgid "Calculating upgrade... "
-msgstr ""
-
-#: cmdline/apt-get.cc:1995
-msgid "Failed"
-msgstr ""
-
-#: cmdline/apt-get.cc:2000
-msgid "Done"
-msgstr ""
-
-#: cmdline/apt-get.cc:2067 cmdline/apt-get.cc:2075
-msgid "Internal error, problem resolver broke stuff"
-msgstr ""
-
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2099 cmdline/apt-get.cc:2132
-msgid "Unable to lock the download directory"
-msgstr ""
-
-#: cmdline/apt-get.cc:2294
-#, c-format
-msgid "Downloading %s %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2175
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-
-#: cmdline/apt-get.cc:2205 cmdline/apt-get.cc:2482
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2221
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2443
-#, c-format
-msgid ""
-"Please use:\n"
-"bzr branch %s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2281
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2316
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2322
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2325
-#, c-format
-msgid "Need to get %sB of source archives.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2331
-#, c-format
-msgid "Fetch source %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2364
-msgid "Failed to fetch some archives."
-msgstr ""
-
-#: cmdline/apt-get.cc:2393
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2405
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2406
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2423
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2443
-msgid "Child process failed"
-msgstr ""
-
-#: cmdline/apt-get.cc:2459
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-
-#: cmdline/apt-get.cc:2721
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) "
-"APT::Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc:2487
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2507
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2888
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-
-#: cmdline/apt-get.cc:2559
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-
-#: cmdline/apt-get.cc:2648
-#, c-format
-msgid ""
-"Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-
-#: cmdline/apt-get.cc:2971
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-
-#: cmdline/apt-get.cc:2977
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-
-#: cmdline/apt-get.cc:2675
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2691
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
-
-#: cmdline/apt-get.cc:2696
-msgid "Failed to process build dependencies"
-msgstr ""
-
-#: cmdline/apt-get.cc:2977 cmdline/apt-get.cc:2989
-#, c-format
-msgid "Changelog for %s (%s)"
-msgstr ""
-
-#: cmdline/apt-get.cc:2728
-msgid "Supported modules:"
-msgstr ""
-
-#: cmdline/apt-get.cc:3289
-msgid ""
-"Usage: apt-get [options] command\n"
-"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get is a simple command line interface for downloading and\n"
-"installing packages. The most frequently used commands are update\n"
-"and install.\n"
-"\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -d  Download only - do NOT install or unpack archives\n"
-"  -s  No-act. Perform ordering simulation\n"
-"  -y  Assume Yes to all queries and do not prompt\n"
-"  -f  Attempt to correct a system with broken dependencies in place\n"
-"  -m  Attempt to continue if archives are unlocatable\n"
-"  -u  Show a list of upgraded packages as well\n"
-"  -b  Build the source package after fetching it\n"
-"  -V  Show verbose version numbers\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
-"pages for more information and options.\n"
-"                       This APT has Super Cow Powers.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2936
-msgid ""
-"NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\n"
-"      Keep also in mind that locking is deactivated,\n"
-"      so don't depend on the relevance to the real current situation!"
-msgstr ""
-
-#: cmdline/acqprogress.cc:55
-msgid "Hit "
-msgstr ""
-
-#: cmdline/acqprogress.cc:79
-msgid "Get:"
-msgstr ""
-
-#: cmdline/acqprogress.cc:110
-msgid "Ign "
-msgstr ""
-
-#: cmdline/acqprogress.cc:114
-msgid "Err "
-msgstr ""
-
-#: cmdline/acqprogress.cc:135
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: cmdline/acqprogress.cc:225
-#, c-format
-msgid " [Working]"
-msgstr ""
-
-#: cmdline/acqprogress.cc:271
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#: cmdline/apt-internal-solver.cc:34
-msgid ""
-"Usage: apt-internal-resolver\n"
-"\n"
-"apt-internal-resolver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"apt.conf(5) manual pages for more information and options.\n"
-"                       This APT has Super Cow Powers.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc:46
-#, c-format
-msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc:52
-#, c-format
-msgid "%s was already set to manually installed.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc:54
-#, c-format
-msgid "%s was already set to automatically installed.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc:169
-#, c-format
-msgid "%s was already set on hold.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc:171
-#, c-format
-msgid "%s was already not hold.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
-#, c-format
-msgid "%s set on hold.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
-#, c-format
-msgid "Canceled hold on %s.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc:220
-msgid "Executing dpkg failed. Are you root?"
-msgstr ""
-
-#: cmdline/apt-mark.cc:268
-msgid ""
-"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-"\n"
-"apt-mark is a simple command line interface for marking packages\n"
-"as manual or automatical installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-
-#: cmdline/apt-sortpkgs.cc:86
-msgid "Unknown package record!"
-msgstr ""
-
-#: cmdline/apt-sortpkgs.cc:150
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: dselect/install:32
-msgid "Bad default setting!"
-msgstr ""
-
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
-#: dselect/install:105 dselect/update:45
-msgid "Press enter to continue."
-msgstr ""
-
-#: dselect/install:91
-msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr ""
-
-#: dselect/install:101
-msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
-
-#: dselect/install:102
-msgid "will be configured. This may result in duplicate errors"
-msgstr ""
-
-#: dselect/install:103
-msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr ""
-
-#: dselect/install:104
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
-msgstr ""
-
-#: dselect/update:30
-msgid "Merging available information"
-msgstr ""
diff -Nru language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/command-not-found.po language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/command-not-found.po
--- language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/command-not-found.po	2014-02-24 08:27:31.000000000 +0000
+++ language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/command-not-found.po	2014-03-24 09:48:15.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: command-not-found\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-02-17 17:49+0000\n"
+"POT-Creation-Date: 2014-02-23 14:37+0000\n"
 "PO-Revision-Date: 2009-05-26 06:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Filipino <fil@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:34+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:57+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../CommandNotFound/CommandNotFound.py:148
 #, python-format
diff -Nru language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/example-content.po language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/example-content.po
--- language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/example-content.po	2014-02-24 08:27:31.000000000 +0000
+++ language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/example-content.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-# Filipino translation for example-content
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the example-content package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: example-content\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-01-30 12:22+0000\n"
-"PO-Revision-Date: 2010-04-07 09:14+0000\n"
-"Last-Translator: jdetras <Unknown>\n"
-"Language-Team: Filipino <fil@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 13:08+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: ../data/examples.desktop.in.h:1
-msgid "Examples"
-msgstr "Mga halimbawa"
-
-#: ../data/examples.desktop.in.h:2
-msgid "Example content for Ubuntu"
-msgstr "Halimbawang laman para sa Ubuntu"
diff -Nru language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/human-theme.po language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/human-theme.po
--- language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/human-theme.po	2014-02-24 08:27:31.000000000 +0000
+++ language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/human-theme.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Filipino translation for human-theme
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the human-theme package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: human-theme\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-06-23 11:36+0000\n"
-"PO-Revision-Date: 2010-04-07 09:14+0000\n"
-"Last-Translator: jdetras <Unknown>\n"
-"Language-Team: Filipino <fil@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 13:14+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: ../index.theme.in.h:1
-msgid "Ubuntu default theme"
-msgstr "Pangunahing tema ng Ubuntu"
-
-#: ../Human-Clearlooks/index.theme.in.h:1
-msgid "Human-Clearlooks"
-msgstr "Tao-MalinisNaItsura"
-
-#: ../DarkRoom/index.theme.in.h:1
-msgid "DarkRoom"
-msgstr "Madilim na Kwarto"
diff -Nru language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/language-selector.po language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/language-selector.po
--- language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/language-selector.po	2014-02-24 08:27:31.000000000 +0000
+++ language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/language-selector.po	2014-03-24 09:48:15.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: language-selector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-13 22:52+0000\n"
+"POT-Creation-Date: 2014-03-19 01:18+0000\n"
 "PO-Revision-Date: 2013-06-10 05:27+0000\n"
 "Last-Translator: Ron Philip Gutierrez <iamronipe@gmail.com>\n"
 "Language-Team: Filipino <fil@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:15+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:34+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: fil\n"
 
 #. Hack for Chinese langpack split
@@ -86,12 +86,12 @@
 msgstr ""
 
 #: ../LanguageSelector/gtk/GtkLanguageSelector.py:504
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:708
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:709
 msgid "Software database is broken"
 msgstr "May sira ang software database"
 
 #: ../LanguageSelector/gtk/GtkLanguageSelector.py:505
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:709
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:710
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -112,8 +112,8 @@
 msgstr ""
 
 #: ../LanguageSelector/gtk/GtkLanguageSelector.py:571
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:606
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:610
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:607
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:611
 msgid "Could not install the full language support"
 msgstr "Hindi ma-install ng buo ang wika"
 
@@ -125,15 +125,15 @@
 "Sources\")."
 msgstr ""
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:607
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:608
 msgid "Failed to authorize to install packages."
 msgstr ""
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:665
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:666
 msgid "The language support is not installed completely"
 msgstr "Ang wika ay hind completong na-install"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:666
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:667
 msgid ""
 "Some translations or writing aids available for your chosen languages are "
 "not installed yet. Do you want to install them now?"
@@ -141,19 +141,19 @@
 "May ilang pagsasalin o mga gabay ng pagsusulat para sa'yong napiling wika ay "
 "hindi pa naka-install. Gusto mo bang i-install ngayon?"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:669
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:670
 msgid "_Remind Me Later"
 msgstr "_Paalalahan mo Ako sa ibang panahon"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:670
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:671
 msgid "_Install"
 msgstr ""
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:673
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:674
 msgid "Details"
 msgstr "Mga Detalye"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:933
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:934
 #, python-format
 msgid ""
 "Failed to apply the '%s' format\n"
diff -Nru language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/newt.po language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/newt.po
--- language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/newt.po	2014-02-24 08:27:31.000000000 +0000
+++ language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/newt.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-# Filipino translation for newt
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the newt package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: newt\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2006-09-14 16:03+0200\n"
-"PO-Revision-Date: 2010-10-09 05:21+0000\n"
-"Last-Translator: HarveyCabaguio <Unknown>\n"
-"Language-Team: Filipino <fil@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 12:04+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: ../dialogboxes.c:43 ../dialogboxes.c:48 ../dialogboxes.c:493
-msgid "Ok"
-msgstr "Ok"
-
-#: ../dialogboxes.c:51
-msgid "Cancel"
-msgstr "Huwag ituloy"
-
-#: ../dialogboxes.c:498
-msgid "Yes"
-msgstr "Oo"
-
-#: ../dialogboxes.c:500
-msgid "No"
-msgstr "Hindi"
diff -Nru language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/nova.po language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/nova.po
--- language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/nova.po	2014-02-24 08:27:32.000000000 +0000
+++ language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/nova.po	2014-03-24 09:48:16.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2014-01-05 06:08+0000\n"
+"POT-Creation-Date: 2014-02-27 06:16+0000\n"
 "PO-Revision-Date: 2012-07-20 04:42+0000\n"
 "Last-Translator: Tom Fifield <tom@openstack.org>\n"
 "Language-Team: Filipino "
@@ -15,21 +15,21 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:31+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:08+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Generated-By: Babel 1.3\n"
 
-#: nova/block_device.py:503 nova/virt/hyperv/basevolumeutils.py:92
+#: nova/block_device.py:496 nova/virt/hyperv/basevolumeutils.py:92
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/context.py:66
+#: nova/context.py:64
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: nova/context.py:111
+#: nova/context.py:109
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -110,11 +110,9 @@
 msgid "Virtual Interface creation failed"
 msgstr "Bigo sa paglikha ng Virtual interface"
 
-#: nova/exception.py:157
-msgid "5 attempts to create virtual interfacewith unique mac address failed"
+#: nova/exception.py:155
+msgid "Creation of virtual interface with unique mac address failed"
 msgstr ""
-"Bigo ang 5 pagtatangka upang lumikha ng virtual interface kasama ng unique "
-"mac address"
 
 #: nova/exception.py:162
 #, python-format
@@ -201,233 +199,241 @@
 msgid "Attribute not supported: %(attr)s"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:253
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Volume %(volume_id)s ay hindi naka-attach sa anumang bagay"
 
-#: nova/exception.py:261
+#: nova/exception.py:257
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:268 nova/tests/compute/test_keypairs.py:125
-msgid "Keypair data is invalid"
-msgstr "Ang Keypair data ay hindi wasto"
+#: nova/exception.py:266
+#, python-format
+msgid "Keypair data is invalid: %(reason)s"
+msgstr ""
 
-#: nova/exception.py:272
+#: nova/exception.py:268
 msgid "The request is invalid."
 msgstr "Ang kahilingan ay hindi wasto."
 
-#: nova/exception.py:276
-msgid "Invalid input received"
-msgstr "Hindi wastong input ang natanggap"
+#: nova/exception.py:274
+#, python-format
+msgid "Invalid input received: %(reason)s"
+msgstr ""
 
-#: nova/exception.py:281
-msgid "Invalid volume"
+#: nova/exception.py:279
+#, python-format
+msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:283
 msgid "Invalid volume access mode"
 msgstr ""
 
-#: nova/exception.py:289 nova/api/openstack/compute/servers.py:1397
-#: nova/api/openstack/compute/contrib/admin_actions.py:276
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:253
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
-msgid "Invalid metadata"
+#: nova/exception.py:287
+#, python-format
+msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:293
-msgid "Invalid metadata size"
+#: nova/exception.py:291
+#, python-format
+msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:298
+#: nova/exception.py:290
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:294
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:298
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:302
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:314 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:306 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:314
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:318
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:323
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:335 nova/openstack/common/db/sqlalchemy/utils.py:58
+#: nova/exception.py:327 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:331
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while "
 "the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:344
+#: nova/exception.py:336
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:340
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:344
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:348
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:360
-msgid "Failed to suspend instance"
+#: nova/exception.py:358
+#, python-format
+msgid "Failed to suspend instance: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:362
 #, python-format
-msgid "Failed to resume instance: %(reason)s."
+msgid "Failed to resume instance: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:366
 #, python-format
-msgid "Failed to power on instance: %(reason)s."
+msgid "Failed to power on instance: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:372
+#: nova/exception.py:370
 #, python-format
-msgid "Failed to power off instance: %(reason)s."
+msgid "Failed to power off instance: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:376
-msgid "Failed to reboot instance"
+#: nova/exception.py:374
+#, python-format
+msgid "Failed to reboot instance: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:380
-msgid "Failed to terminate instance"
+#: nova/exception.py:378
+#, python-format
+msgid "Failed to terminate instance: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:384
-msgid "Failed to deploy instance"
+#: nova/exception.py:382
+#, python-format
+msgid "Failed to deploy instance: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:388
-msgid "Failed to launch instances"
+#: nova/exception.py:386
+#, python-format
+msgid "Failed to launch instances: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:392
+#: nova/exception.py:384
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:396
+#: nova/exception.py:388
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:398
 #, python-format
 msgid "Connection to the hypervisor is broken on host: %(host)s"
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:392
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:406
 #, python-format
 msgid "Compute service of %(host)s is still in use."
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:401
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:421
+#: nova/exception.py:405
 msgid ""
 "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:410
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:415
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:419
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:424
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:444
-msgid "Unacceptable CPU info"
+#: nova/exception.py:442
+#, python-format
+msgid "Unacceptable CPU info: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:432
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:452
+#: nova/exception.py:436
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN tag "
 "is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:442
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with the "
@@ -435,92 +441,101 @@
 "associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:449
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:469
+#: nova/exception.py:453
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:473
+#: nova/exception.py:457
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:477
+#: nova/exception.py:461
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:481
+#: nova/exception.py:465
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:469
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:473
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:494
+#: nova/exception.py:478
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:483
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:487
 #, python-format
 msgid ""
 "Agent-build with hypervisor %(hypervisor)s os %(os)s architecture "
 "%(architecture)s exists."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:493
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:511
+#, python-format
+msgid "No volume Block Device Mapping with id %(volume_id)s."
+msgstr ""
+
+#: nova/exception.py:498
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:502
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:506
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:510
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:514
 #, python-format
 msgid "Requested image %(image)s has automatic disk resize disabled."
 msgstr ""
 
-#: nova/exception.py:535
+#: nova/exception.py:519
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:540
+#: nova/exception.py:541
+msgid "The current driver does not support preserving ephemeral partitions."
+msgstr ""
+
+#: nova/exception.py:524
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids "
@@ -528,1100 +543,1120 @@
 "ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:547
+#: nova/exception.py:531
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:551
+#: nova/exception.py:535
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:555
+#: nova/exception.py:539
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:559
+#: nova/exception.py:543
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:563
+#: nova/exception.py:547
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:551
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:555
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:559
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:563
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:567
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:571
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:575
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:602
 msgid "No more available networks."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:606
 #, python-format
 msgid ""
 "Either network uuid %(network_uuid)s is not present or is not assigned to "
 "the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:584
 msgid ""
 "More than one possible network found. Specify network ID(s) to select which "
 "one(s) to connect to,"
 msgstr ""
 
-#: nova/exception.py:609
+#: nova/exception.py:589
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:613
+#: nova/exception.py:593
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:597
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:601
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:605
 #, python-format
 msgid "Fixed ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:609
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:633
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:637
+#: nova/exception.py:617
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:621
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:646
+#: nova/exception.py:626
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:650
+#: nova/exception.py:630
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network (%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:655
+#: nova/exception.py:635
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance %(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:640
 #, python-format
 msgid ""
 "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:645
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:650
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:654
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:658
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:683
+#: nova/exception.py:663
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:687
+#: nova/exception.py:667
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:691
+#: nova/exception.py:671
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:695
+#: nova/exception.py:675
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:699
+#: nova/exception.py:679
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:703
+#: nova/exception.py:683
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:688
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:694
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:698
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:702
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:707
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:732 nova/api/openstack/compute/contrib/floating_ips.py:98
+#: nova/exception.py:712 nova/api/openstack/compute/contrib/floating_ips.py:98
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/exception.py:737
+#: nova/exception.py:717
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:741
+#: nova/exception.py:721
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:725
 #, python-format
 msgid "Service with host %(host)s binary %(binary)s exists."
 msgstr ""
 
-#: nova/exception.py:749
+#: nova/exception.py:729
 #, python-format
 msgid "Service with host %(host)s topic %(topic)s exists."
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:733
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:737
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:741
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:745
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:769
+#: nova/exception.py:749
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:754
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:778
+#: nova/exception.py:758
 #, python-format
 msgid "Quota exists for project %(project_id)s, resource %(resource)s"
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:763
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:787
+#: nova/exception.py:767
 #, python-format
 msgid ""
 "Quota for user %(user_id)s in project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:772
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:796
+#: nova/exception.py:776
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:800
+#: nova/exception.py:780
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:804
+#: nova/exception.py:784
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:808
+#: nova/exception.py:788
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:792
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:801
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:826
+#: nova/exception.py:806
 #, python-format
 msgid ""
 "Security group %(security_group_name)s already exists for project "
 "%(project_id)s."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:811
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:816
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:821
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:825
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:851
+#: nova/exception.py:831
 #, python-format
 msgid "Rule already exists in group: %(rule)s"
 msgstr ""
 
-#: nova/exception.py:855
+#: nova/exception.py:835
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:840
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:864
+#: nova/exception.py:844
 #, python-format
 msgid ""
 "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:849
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:853
 #, python-format
 msgid ""
 "Console pool with host %(host)s, console_type %(console_type)s and "
 "compute_host %(compute_host)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:859
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s on "
 "proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:865
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:869
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:878
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:882
 #, python-format
 msgid "Unavailable console type %(console_type)s."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:913
+#, python-format
+msgid "The console port range %(min_port)d-%(max_port)d is exhausted."
+msgstr ""
+
+#: nova/exception.py:895
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:922
 #, python-format
 msgid "Flavor with name %(flavor_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:899
 #, python-format
 msgid ""
 "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:919
+#: nova/exception.py:904
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:923
+#: nova/exception.py:908
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:927
+#: nova/exception.py:912
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:931
+#: nova/exception.py:916
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:935
+#: nova/exception.py:920
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:939
+#: nova/exception.py:924
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:943
+#: nova/exception.py:928
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:947
+#: nova/exception.py:932
 msgid "Cannot update cells configuration file."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:936
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:940
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:959
+#: nova/exception.py:971
 #, python-format
 msgid "Flavor %(flavor_id)s has no extra specs with key %(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:976
 #, python-format
 msgid ""
 "Metric %(name)s could not be found on the compute host node "
 "%(host)s.%(node)s."
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:949
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:973
+#: nova/exception.py:953
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:957
 #, python-format
 msgid ""
 "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:982
+#: nova/exception.py:962
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:986
+#: nova/exception.py:966
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:990
+#: nova/exception.py:970
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:994
+#: nova/exception.py:974
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:998
+#: nova/exception.py:978
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:1003 nova/tests/compute/test_keypairs.py:146
+#: nova/exception.py:983 nova/tests/compute/test_keypairs.py:124
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:1007
+#: nova/exception.py:987
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1011
+#: nova/exception.py:1023
 #, python-format
 msgid "Flavor with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1015
+#: nova/exception.py:1027
 #, python-format
 msgid "Flavor with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:999
 #, python-format
 msgid ""
 "Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1004
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1008
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1032
-msgid "Migration error"
+#: nova/exception.py:1044
+#, python-format
+msgid "Migration error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1036
-msgid "Migration pre-check error"
+#: nova/exception.py:1048
+#, python-format
+msgid "Migration pre-check error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1020
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1026
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:1050
+#: nova/exception.py:1030
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1034
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1038
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1042
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1078
 msgid "Flavor's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1082
 msgid "Flavor's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:1074
+#: nova/exception.py:1054
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1058
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1083
-msgid "Quota exceeded"
+#: nova/exception.py:1095
+#, python-format
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1070
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used %(used)d "
 "of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1095
+#: nova/exception.py:1075
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1099
+#: nova/exception.py:1079
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1103
+#: nova/exception.py:1083
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1107
+#: nova/exception.py:1087
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1111
+#: nova/exception.py:1091
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1115
+#: nova/exception.py:1095
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1119 nova/tests/compute/test_keypairs.py:157
+#: nova/exception.py:1099 nova/tests/compute/test_keypairs.py:135
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1124
+#: nova/exception.py:1104
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1108
 msgid "Maximum number of ports exceeded"
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1112
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:1137
+#: nova/exception.py:1117
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1141
+#: nova/exception.py:1121
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1145
+#: nova/exception.py:1125
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1149
+#: nova/exception.py:1129
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1134
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1158
+#: nova/exception.py:1170
 msgid "Unable to create flavor"
 msgstr ""
 
-#: nova/exception.py:1162
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1148
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1172
+#: nova/exception.py:1152
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1178
+#: nova/exception.py:1158
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1182
+#: nova/exception.py:1162
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1167
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1171
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1175
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1180
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1204
+#: nova/exception.py:1184
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1208
+#: nova/exception.py:1188
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1192
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1216
+#: nova/exception.py:1196
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1200
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1224
+#: nova/exception.py:1204
 #, python-format
 msgid "Invalid value for Config Drive option: %(option)s"
 msgstr ""
 
-#: nova/exception.py:1228
+#: nova/exception.py:1208
 #, python-format
 msgid ""
 "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1213
 #, python-format
 msgid ""
 "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1238
+#: nova/exception.py:1218
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1242
+#: nova/exception.py:1222
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1246
+#: nova/exception.py:1226
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes once "
 "base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1252
+#: nova/exception.py:1232
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1268
 #, python-format
 msgid ""
 "Unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1265
+#: nova/exception.py:1241
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/exception.py:1270
+#: nova/exception.py:1246
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1274
+#: nova/exception.py:1286
 #, python-format
 msgid ""
 "Unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1279
+#: nova/exception.py:1255
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1283
+#: nova/exception.py:1259
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1287
-msgid "Instance recreate is not implemented by this virt driver."
+#: nova/exception.py:1299
+msgid "Instance recreate is not supported."
 msgstr ""
 
-#: nova/exception.py:1291
+#: nova/exception.py:1267
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1296
+#: nova/exception.py:1272
 #, python-format
 msgid ""
 "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1301
+#: nova/exception.py:1277
 #, python-format
 msgid ""
 "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1306
+#: nova/exception.py:1282
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt driver"
 msgstr ""
 
-#: nova/exception.py:1311
+#: nova/exception.py:1287
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1315
+#: nova/exception.py:1291
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1319
+#: nova/exception.py:1295
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1324
+#: nova/exception.py:1300
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1329
+#: nova/exception.py:1305
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1335
+#: nova/exception.py:1311
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1339
+#: nova/exception.py:1315
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1343
+#: nova/exception.py:1319
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1347
+#: nova/exception.py:1323
 #, python-format
 msgid "Object action %(action)s failed because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1351
+#: nova/exception.py:1327
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1355
+#: nova/exception.py:1331
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1359
+#: nova/exception.py:1335
 #, python-format
 msgid ""
 "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1364
+#: nova/exception.py:1340
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1368
+#: nova/exception.py:1344
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1372
+#: nova/exception.py:1348
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1376
+#: nova/exception.py:1352
 #, python-format
 msgid ""
 "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1381
+#: nova/exception.py:1357
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1386
+#: nova/exception.py:1362
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
 
-#: nova/exception.py:1390
+#: nova/exception.py:1366
 #, python-format
 msgid "Number of retries to plugin (%(num_retries)d) exceeded."
 msgstr ""
 
-#: nova/exception.py:1394
+#: nova/exception.py:1370
 #, python-format
 msgid "There was an error with the download module %(module)s. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1399
+#: nova/exception.py:1375
 #, python-format
 msgid ""
 "The metadata for this location will not work with this module %(module)s.  "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1404
+#: nova/exception.py:1380
 #, python-format
 msgid "The method %(method_name)s is not implemented."
 msgstr ""
 
-#: nova/exception.py:1408
+#: nova/exception.py:1384
 #, python-format
 msgid "The module %(module)s is misconfigured: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:1412
+#: nova/exception.py:1424
 #, python-format
 msgid "Error when creating resource monitor: %(monitor)s"
 msgstr ""
 
-#: nova/exception.py:1416
+#: nova/exception.py:1388
 #, python-format
 msgid "The PCI address %(address)s has an incorrect format."
 msgstr ""
 
-#: nova/exception.py:1420
+#: nova/exception.py:1392
 #, python-format
 msgid "PCI device %(id)s not found"
 msgstr ""
 
-#: nova/exception.py:1424
+#: nova/exception.py:1396
 #, python-format
 msgid "PCI Device %(node_id)s:%(address)s not found."
 msgstr ""
 
-#: nova/exception.py:1428
+#: nova/exception.py:1440
 #, python-format
 msgid ""
 "PCI device %(compute_node_id)s:%(address)s is %(status)s instead of "
 "%(hopestatus)s"
 msgstr ""
 
-#: nova/exception.py:1434
+#: nova/exception.py:1446
 #, python-format
 msgid ""
 "PCI device %(compute_node_id)s:%(address)s is owned by %(owner)s instead of "
 "%(hopeowner)s"
 msgstr ""
 
-#: nova/exception.py:1440
+#: nova/exception.py:1452
 #, python-format
 msgid "PCI device request (%requests)s failed"
 msgstr ""
 
-#: nova/exception.py:1445
+#: nova/exception.py:1457
 #, python-format
 msgid ""
 "Attempt to consume PCI device %(compute_node_id)s:%(address)s from empty pool"
 msgstr ""
 
-#: nova/exception.py:1451
+#: nova/exception.py:1423
 #, python-format
 msgid "Invalid PCI alias definition: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1455
+#: nova/exception.py:1427
 #, python-format
 msgid "PCI alias %(alias)s is not defined"
 msgstr ""
 
-#: nova/exception.py:1460
+#: nova/exception.py:1432
 #, python-format
 msgid "Not enough parameters: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1465
+#: nova/exception.py:1437
 #, python-format
 msgid "Invalid PCI devices Whitelist config %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1469
+#: nova/exception.py:1441
 #, python-format
 msgid "Cannot change %(node_id)s to %(new_node_id)s"
 msgstr ""
 
-#: nova/exception.py:1479
+#: nova/exception.py:1451
 #, python-format
 msgid ""
 "Failed to prepare PCI device %(id)s for instance %(instance_uuid)s: "
 "%(reason)s"
 msgstr ""
 
-#: nova/exception.py:1484
+#: nova/exception.py:1456
 #, python-format
 msgid "Failed to detach PCI device %(dev)s: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1488
+#: nova/exception.py:1460
 #, python-format
 msgid "%(type)s hypervisor does not support PCI devices"
 msgstr ""
 
-#: nova/exception.py:1492
+#: nova/exception.py:1504
 #, python-format
 msgid "Key manager error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1496
+#: nova/exception.py:1508
 #, python-format
 msgid "Provided video model (%(model)s) is not supported."
 msgstr ""
 
+#: nova/exception.py:1512
+#, python-format
+msgid "The provided RNG device path: (%(path)s) is not present on the host."
+msgstr ""
+
+#: nova/exception.py:1517
+#, python-format
+msgid ""
+"The requested amount of video memory %(req_vram)d is higherthan the maximum "
+"allowed by flavor %(max_vram)d."
+msgstr ""
+
 #: nova/filters.py:70
 #, python-format
 msgid "Starting with %d host(s)"
@@ -1637,7 +1672,7 @@
 msgid "Filter %s returned 0 hosts"
 msgstr ""
 
-#: nova/filters.py:86
+#: nova/filters.py:83
 #, python-format
 msgid "Filter %(cls_name)s returned %(obj_len)d host(s)"
 msgstr ""
@@ -1668,218 +1703,229 @@
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:1274
+#: nova/quota.py:1256
 #, python-format
 msgid "Created reservations %s"
 msgstr ""
 
-#: nova/quota.py:1297
+#: nova/quota.py:1279
 #, python-format
 msgid "Failed to commit reservations %s"
 msgstr ""
 
-#: nova/quota.py:1299
+#: nova/quota.py:1281
 #, python-format
 msgid "Committed reservations %s"
 msgstr ""
 
-#: nova/quota.py:1320
+#: nova/quota.py:1302
 #, python-format
 msgid "Failed to roll back reservations %s"
 msgstr ""
 
-#: nova/quota.py:1323
+#: nova/quota.py:1305
 #, python-format
 msgid "Rolled back reservations %s"
 msgstr ""
 
-#: nova/service.py:169
+#: nova/service.py:151
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:188 nova/openstack/common/rpc/service.py:49
+#: nova/service.py:201
 #, python-format
-msgid "Creating Consumer connection for Service %s"
+msgid "Creating RPC server for service %s"
 msgstr ""
 
-#: nova/service.py:206
+#: nova/service.py:188
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:273
+#: nova/service.py:285
 #, python-format
 msgid "Listening on %(host)s:%(port)s for debug connection"
 msgstr ""
 
-#: nova/service.py:280
+#: nova/service.py:292
 msgid ""
 "WARNING: Using the remote debug option changes how Nova uses the eventlet "
 "library to support async IO. This could result in failures that do not occur "
 "under normal operation. Use at your own risk."
 msgstr ""
 
-#: nova/service.py:301
+#: nova/service.py:268
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:323
+#: nova/service.py:290
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:425
+#: nova/service.py:360
+#, python-format
+msgid ""
+"%(worker_name)s value of %(workers)s is invalid, must be greater than 0"
+msgstr ""
+
+#: nova/service.py:392
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:159
+#: nova/utils.py:161
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:365
+#: nova/utils.py:376
 #, python-format
 msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:381
+#: nova/utils.py:392
 #, python-format
 msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:384
+#: nova/utils.py:395
 #, python-format
 msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:399
+#: nova/utils.py:410
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:402
+#: nova/utils.py:413
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:423
+#: nova/utils.py:452
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:468
+#: nova/utils.py:604
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:497
+#: nova/utils.py:633
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:670 nova/openstack/common/fileutils.py:63
+#: nova/utils.py:829 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:784 nova/virt/configdrive.py:178
+#: nova/utils.py:951 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:953
+#: nova/utils.py:1120
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:957
+#: nova/utils.py:1124
 #, python-format
 msgid "%(name)s has a minimum character requirement of %(min_length)s."
 msgstr ""
 
-#: nova/utils.py:962
+#: nova/utils.py:1129
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/utils.py:972
+#: nova/utils.py:1139
 #, python-format
 msgid "%(value_name)s must be an integer"
 msgstr ""
 
-#: nova/utils.py:978
+#: nova/utils.py:1145
 #, python-format
 msgid "%(value_name)s must be >= %(min_value)d"
 msgstr ""
 
-#: nova/utils.py:984
+#: nova/utils.py:1151
 #, python-format
 msgid "%(value_name)s must be <= %(max_value)d"
 msgstr ""
 
-#: nova/version.py:67
+#: nova/version.py:65
 #, python-format
 msgid "Failed to load %(cfgfile)s: %(ex)s"
 msgstr ""
 
-#: nova/wsgi.py:128
+#: nova/wsgi.py:132
+#, python-format
+msgid "Could not bind to %(host)s:%(port)s"
+msgstr ""
+
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:143 nova/openstack/common/sslutils.py:52
+#: nova/wsgi.py:140 nova/openstack/common/sslutils.py:52
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:147 nova/openstack/common/sslutils.py:55
+#: nova/wsgi.py:144 nova/openstack/common/sslutils.py:55
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:151 nova/openstack/common/sslutils.py:58
+#: nova/wsgi.py:148 nova/openstack/common/sslutils.py:58
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:155 nova/openstack/common/sslutils.py:61
+#: nova/wsgi.py:152 nova/openstack/common/sslutils.py:61
 msgid ""
 "When running server in SSL mode, you must specify both a cert_file and "
 "key_file option value in your configuration file"
 msgstr ""
 
-#: nova/wsgi.py:186
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:213
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:232
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:301
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:490
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
 
-#: nova/api/auth.py:73
+#: nova/api/auth.py:71
 msgid "ratelimit_v3 is removed from v3 api."
 msgstr ""
 
-#: nova/api/auth.py:134
+#: nova/api/auth.py:117
 msgid "Invalid service catalog json."
 msgstr ""
 
-#: nova/api/auth.py:157
+#: nova/api/auth.py:140
 msgid "Sourcing roles from deprecated X-Role HTTP header"
 msgstr ""
 
@@ -1888,90 +1934,90 @@
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:134
+#: nova/api/validator.py:132
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:90
+#: nova/api/ec2/__init__.py:89
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:161
+#: nova/api/ec2/__init__.py:160
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:169
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and "
 "will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:189
+#: nova/api/ec2/__init__.py:188
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:194
+#: nova/api/ec2/__init__.py:193
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:230 nova/api/ec2/__init__.py:246
+#: nova/api/ec2/__init__.py:229 nova/api/ec2/__init__.py:245
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:245
+#: nova/api/ec2/__init__.py:244
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306
+#: nova/api/ec2/__init__.py:305
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:326
+#: nova/api/ec2/__init__.py:325
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:328
+#: nova/api/ec2/__init__.py:327
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:403
 #, python-format
 msgid ""
 "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:496
+#: nova/api/ec2/__init__.py:495
 #, python-format
 msgid "Unexpected %(ex_name)s raised: %(ex_str)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:498
+#: nova/api/ec2/__init__.py:497
 #, python-format
 msgid "Unexpected %(ex_name)s raised"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:502
+#: nova/api/ec2/__init__.py:501
 #, python-format
 msgid "%(ex_name)s raised: %(ex_str)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
+#: nova/api/ec2/__init__.py:503
 #, python-format
 msgid "%(ex_name)s raised"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:527
+#: nova/api/ec2/__init__.py:526
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:529
+#: nova/api/ec2/__init__.py:526
 msgid "Unknown error occurred."
 msgstr ""
 
@@ -1981,220 +2027,225 @@
 "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:394
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:419
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:435
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:447
+#: nova/api/ec2/cloud.py:455
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:468
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:602 nova/api/ec2/cloud.py:726
+#: nova/api/ec2/cloud.py:610 nova/api/ec2/cloud.py:734
 msgid "need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:607
+#: nova/api/ec2/cloud.py:615
 msgid "can't build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:615
+#: nova/api/ec2/cloud.py:623
 #, python-format
 msgid "Invalid IP protocol %(protocol)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:646 nova/api/ec2/cloud.py:679
+#: nova/api/ec2/cloud.py:654 nova/api/ec2/cloud.py:687
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:754
+#: nova/api/ec2/cloud.py:762
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:825
+#: nova/api/ec2/cloud.py:833
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:829 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:837 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:865
+#: nova/api/ec2/cloud.py:873
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:894 nova/api/openstack/compute/contrib/volumes.py:490
+#: nova/api/ec2/cloud.py:902 nova/api/openstack/compute/contrib/volumes.py:490
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1055
+#: nova/api/ec2/cloud.py:1062
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1221
+#: nova/api/ec2/cloud.py:1222
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1227
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1232
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1242
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1250
 #: nova/api/openstack/compute/contrib/floating_ips.py:249
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1262
+#: nova/api/ec2/cloud.py:1263
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/openstack/compute/servers.py:883
+#: nova/api/openstack/compute/plugins/v3/multiple_create.py:64
+msgid "min_count must be <= max_count"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1300
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1388
+#: nova/api/ec2/cloud.py:1381
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1399
+#: nova/api/ec2/cloud.py:1392
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1409
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1419
+#: nova/api/ec2/cloud.py:1412
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1503
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1526
+#: nova/api/ec2/cloud.py:1519
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1539
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1600
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1610
+#: nova/api/ec2/cloud.py:1603
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1606
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1615
+#: nova/api/ec2/cloud.py:1608
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1628
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1654
+#: nova/api/ec2/cloud.py:1650
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not have a "
 "volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1685
+#: nova/api/ec2/cloud.py:1681
 #, python-format
 msgid "Couldn't stop instance within %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1704
+#: nova/api/ec2/cloud.py:1700
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1729 nova/api/ec2/cloud.py:1778
+#: nova/api/ec2/cloud.py:1725 nova/api/ec2/cloud.py:1774
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1733 nova/api/ec2/cloud.py:1782
+#: nova/api/ec2/cloud.py:1729 nova/api/ec2/cloud.py:1778
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1738 nova/api/ec2/cloud.py:1787
-#: nova/api/ec2/cloud.py:1844
+#: nova/api/ec2/cloud.py:1734 nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1840
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1742 nova/api/ec2/cloud.py:1791
+#: nova/api/ec2/cloud.py:1738 nova/api/ec2/cloud.py:1787
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1748 nova/api/ec2/cloud.py:1799
+#: nova/api/ec2/cloud.py:1744 nova/api/ec2/cloud.py:1795
 msgid "Expecting tagSet to be key/value pairs"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1755
+#: nova/api/ec2/cloud.py:1751
 msgid "Expecting both key and value to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1804
+#: nova/api/ec2/cloud.py:1800
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1878
+#: nova/api/ec2/cloud.py:1874
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/ec2utils.py:257
+#: nova/api/ec2/ec2utils.py:256
 msgid ""
 "Request must include either Timestamp or Expires, but cannot contain both"
 msgstr ""
 
-#: nova/api/ec2/ec2utils.py:275
+#: nova/api/ec2/ec2utils.py:274
 msgid "Timestamp is invalid."
 msgstr ""
 
@@ -2203,24 +2254,24 @@
 msgid "EC2 error response: %(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/metadata/base.py:393
+#: nova/api/metadata/base.py:379
 #, python-format
 msgid "future versions %s hidden in version list"
 msgstr ""
 
-#: nova/api/metadata/handler.py:110
+#: nova/api/metadata/handler.py:111
 msgid ""
 "X-Instance-ID present in request headers. The "
 "'service_neutron_metadata_proxy' option must be enabled to process this "
 "header."
 msgstr ""
 
-#: nova/api/metadata/handler.py:136 nova/api/metadata/handler.py:143
+#: nova/api/metadata/handler.py:137 nova/api/metadata/handler.py:144
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:138 nova/api/metadata/handler.py:194
+#: nova/api/metadata/handler.py:139 nova/api/metadata/handler.py:190
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -2228,19 +2279,19 @@
 msgid "X-Instance-ID header is missing from request."
 msgstr ""
 
-#: nova/api/metadata/handler.py:158
+#: nova/api/metadata/handler.py:156
 msgid "X-Tenant-ID header is missing from request."
 msgstr ""
 
-#: nova/api/metadata/handler.py:160
+#: nova/api/metadata/handler.py:158
 msgid "Multiple X-Instance-ID headers found within request."
 msgstr ""
 
-#: nova/api/metadata/handler.py:162
+#: nova/api/metadata/handler.py:160
 msgid "Multiple X-Tenant-ID headers found within request."
 msgstr ""
 
-#: nova/api/metadata/handler.py:176
+#: nova/api/metadata/handler.py:172
 #, python-format
 msgid ""
 "X-Instance-ID-Signature: %(signature)s does not match the expected value: "
@@ -2248,16 +2299,16 @@
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:185
+#: nova/api/metadata/handler.py:181
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:192 nova/api/metadata/handler.py:199
+#: nova/api/metadata/handler.py:188 nova/api/metadata/handler.py:195
 #, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:203
+#: nova/api/metadata/handler.py:201
 #, python-format
 msgid ""
 "Tenant_id %(tenant_id)s does not match tenant_id of instance %(instance_id)s."
@@ -2275,234 +2326,242 @@
 msgid "failed to load json"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:85
+#: nova/api/openstack/__init__.py:83
 #, python-format
 msgid "Caught error: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:94
+#: nova/api/openstack/__init__.py:92
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187
+#: nova/api/openstack/__init__.py:185
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:198 nova/api/openstack/__init__.py:361
+#: nova/api/openstack/__init__.py:202
 #, python-format
-msgid "Extended resource: %s"
+msgid "Extending resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:233 nova/api/openstack/__init__.py:408
+#: nova/api/openstack/__init__.py:231 nova/api/openstack/__init__.py:406
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:238 nova/api/openstack/__init__.py:413
+#: nova/api/openstack/__init__.py:242
 #, python-format
-msgid "Extension %(ext_name)s extending resource: %(collection)s"
+msgid "Extension %(ext_name)s extended resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:281
-#: nova/api/openstack/compute/plugins/v3/servers.py:349
+#: nova/api/openstack/__init__.py:279
+#: nova/api/openstack/compute/plugins/v3/servers.py:354
 #, python-format
 msgid "Not loading %s because it is in the blacklist"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:286
-#: nova/api/openstack/compute/plugins/v3/servers.py:354
+#: nova/api/openstack/__init__.py:284
+#: nova/api/openstack/compute/plugins/v3/servers.py:359
 #, python-format
 msgid "Not loading %s because it is not in the whitelist"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:295
 #, python-format
 msgid "v3 API Extension Blacklist: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:299
+#: nova/api/openstack/__init__.py:297
 #, python-format
 msgid "v3 API Extension Whitelist: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:306
+#: nova/api/openstack/__init__.py:304
 #, python-format
 msgid "Extensions in both blacklist and whitelist: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:330
+#: nova/api/openstack/__init__.py:328
 #, python-format
 msgid "Missing core API extensions: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:358
+#: nova/api/openstack/__init__.py:356
 #, python-format
 msgid "Running _register_resources on %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:400
+#: nova/api/openstack/__init__.py:196 nova/api/openstack/__init__.py:359
+#, python-format
+msgid "Extended resource: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:398
 #, python-format
 msgid "Running _register_controllers on %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:123
+#: nova/api/openstack/__init__.py:236 nova/api/openstack/__init__.py:411
+#, python-format
+msgid "Extension %(ext_name)s extending resource: %(collection)s"
+msgstr ""
+
+#: nova/api/openstack/common.py:119
 #, python-format
 msgid ""
 "status is UNKNOWN from vm_state=%(vm_state)s task_state=%(task_state)s. Bad "
 "upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:173
+#: nova/api/openstack/common.py:166
 #, python-format
 msgid "%s param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:169
 #, python-format
 msgid "%s param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:201
+#: nova/api/openstack/common.py:194
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:207
+#: nova/api/openstack/common.py:200
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:211
+#: nova/api/openstack/common.py:204
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215
+#: nova/api/openstack/common.py:208
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:250 nova/api/openstack/compute/flavors.py:148
-#: nova/api/openstack/compute/servers.py:590
-#: nova/api/openstack/compute/plugins/v3/flavors.py:156
-#: nova/api/openstack/compute/plugins/v3/servers.py:587
+#: nova/api/openstack/common.py:243 nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/plugins/v3/servers.py:561
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:290
+#: nova/api/openstack/common.py:283
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:298
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:313
+#: nova/api/openstack/common.py:306
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:316
+#: nova/api/openstack/common.py:309
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:319
+#: nova/api/openstack/common.py:312
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:382
+#: nova/api/openstack/common.py:375
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:385
+#: nova/api/openstack/common.py:378
 #, python-format
 msgid "Cannot '%s' an instance which has never been active"
 msgstr ""
 
-#: nova/api/openstack/common.py:388
+#: nova/api/openstack/common.py:381
 #, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:468
+#: nova/api/openstack/common.py:461
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:470
+#: nova/api/openstack/common.py:463
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:199
+#: nova/api/openstack/extensions.py:198
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:238
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:239
 #: nova/api/openstack/compute/plugins/__init__.py:49
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:241
 #: nova/api/openstack/compute/plugins/__init__.py:51
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:243
+#: nova/api/openstack/extensions.py:242
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:245
+#: nova/api/openstack/extensions.py:244
 #: nova/api/openstack/compute/plugins/__init__.py:54
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:259
+#: nova/api/openstack/extensions.py:258
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:268
+#: nova/api/openstack/extensions.py:267
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:280
+#: nova/api/openstack/extensions.py:279
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:351
+#: nova/api/openstack/extensions.py:350
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:374
+#: nova/api/openstack/extensions.py:373
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:492
+#: nova/api/openstack/extensions.py:486
 msgid "Unexpected exception in API method"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:493
+#: nova/api/openstack/extensions.py:487
 #, python-format
 msgid ""
 "Unexpected API Error. Please report this at http://bugs.launchpad.net/nova/ "
@@ -2510,94 +2569,94 @@
 "%s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:240 nova/api/openstack/wsgi.py:658
+#: nova/api/openstack/wsgi.py:222 nova/api/openstack/wsgi.py:640
 msgid "cannot understand JSON"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:663
+#: nova/api/openstack/wsgi.py:645
 msgid "too many body keys"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:707
+#: nova/api/openstack/wsgi.py:689
 #, python-format
 msgid "Exception handling resource: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:711
+#: nova/api/openstack/wsgi.py:693
 #, python-format
 msgid "Fault thrown: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:714
+#: nova/api/openstack/wsgi.py:696
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:828
+#: nova/api/openstack/wsgi.py:810
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:943
+#: nova/api/openstack/wsgi.py:930
 #, python-format
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:946 nova/api/openstack/wsgi.py:969
+#: nova/api/openstack/wsgi.py:933 nova/api/openstack/wsgi.py:953
 #: nova/api/openstack/compute/server_metadata.py:59
 #: nova/api/openstack/compute/server_metadata.py:77
 #: nova/api/openstack/compute/server_metadata.py:102
 #: nova/api/openstack/compute/server_metadata.py:127
-#: nova/api/openstack/compute/contrib/admin_actions.py:245
-#: nova/api/openstack/compute/contrib/evacuate.py:48
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:222
-#: nova/api/openstack/compute/plugins/v3/evacuate.py:50
+#: nova/api/openstack/compute/contrib/admin_actions.py:224
+#: nova/api/openstack/compute/contrib/evacuate.py:49
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:217
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:51
 #: nova/api/openstack/compute/plugins/v3/server_metadata.py:87
 #: nova/api/openstack/compute/plugins/v3/server_metadata.py:104
 #: nova/api/openstack/compute/plugins/v3/server_metadata.py:128
 msgid "Malformed request body"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:950
+#: nova/api/openstack/wsgi.py:937
 #, python-format
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:954
+#: nova/api/openstack/wsgi.py:941
 #, python-format
 msgid "Calling method %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:966
+#: nova/api/openstack/wsgi.py:950
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:978
+#: nova/api/openstack/wsgi.py:962
 #, python-format
 msgid ""
 "Malformed request URL: URL's project_id '%(project_id)s' doesn't match "
 "Context's project_id '%(context_project_id)s'"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1217
+#: nova/api/openstack/wsgi.py:1202
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:278
+#: nova/api/openstack/xmlutil.py:271
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:436
+#: nova/api/openstack/xmlutil.py:420
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:759
+#: nova/api/openstack/xmlutil.py:743
 #, python-format
 msgid ""
 "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:879
+#: nova/api/openstack/xmlutil.py:863
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2606,7 +2665,7 @@
 msgstr ""
 
 #: nova/api/openstack/compute/flavors.py:109
-#: nova/api/openstack/compute/plugins/v3/flavors.py:116
+#: nova/api/openstack/compute/plugins/v3/flavors.py:117
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
@@ -2633,16 +2692,16 @@
 
 #: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:81
-#: nova/api/openstack/compute/contrib/flavorextraspecs.py:87
-#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:97
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:86
+#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:90
 #: nova/api/openstack/compute/plugins/v3/server_metadata.py:108
 msgid "Request body and URI mismatch"
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:85
-#: nova/api/openstack/compute/contrib/flavorextraspecs.py:90
-#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:100
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:89
+#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:93
 #: nova/api/openstack/compute/plugins/v3/server_metadata.py:112
 msgid "Request body contains too many items"
 msgstr ""
@@ -2666,6 +2725,7 @@
 msgstr ""
 
 #: nova/api/openstack/compute/limits.py:164
+#: nova/api/openstack/compute/plugins/v3/limits.py:147
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
@@ -2673,6 +2733,7 @@
 msgstr ""
 
 #: nova/api/openstack/compute/limits.py:292
+#: nova/api/openstack/compute/plugins/v3/limits.py:274
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2692,378 +2753,399 @@
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
-#: nova/api/openstack/compute/contrib/cells.py:405
-#: nova/api/openstack/compute/plugins/v3/cells.py:413
+#: nova/api/openstack/compute/servers.py:81
+msgid ""
+"XML support has been deprecated and will be removed in the Juno release."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:534
+#: nova/api/openstack/compute/contrib/cells.py:401
+#: nova/api/openstack/compute/plugins/v3/cells.py:409
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
-#: nova/api/openstack/compute/plugins/v3/servers.py:539
+#: nova/api/openstack/compute/servers.py:553
+#: nova/api/openstack/compute/plugins/v3/servers.py:544
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
-#: nova/api/openstack/compute/plugins/v3/servers.py:590
+#: nova/api/openstack/compute/servers.py:573
+#: nova/api/openstack/compute/plugins/v3/servers.py:564
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:611
-#: nova/api/openstack/compute/servers.py:757
-#: nova/api/openstack/compute/servers.py:1061
-#: nova/api/openstack/compute/servers.py:1174
-#: nova/api/openstack/compute/servers.py:1349
-#: nova/api/openstack/compute/plugins/v3/servers.py:608
-#: nova/api/openstack/compute/plugins/v3/servers.py:723
-#: nova/api/openstack/compute/plugins/v3/servers.py:929
-#: nova/api/openstack/compute/plugins/v3/servers.py:1041
-#: nova/api/openstack/compute/plugins/v3/servers.py:1163
+#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:737
+#: nova/api/openstack/compute/servers.py:1038
+#: nova/api/openstack/compute/servers.py:1143
+#: nova/api/openstack/compute/servers.py:1320
+#: nova/api/openstack/compute/plugins/v3/servers.py:582
+#: nova/api/openstack/compute/plugins/v3/servers.py:707
+#: nova/api/openstack/compute/plugins/v3/servers.py:934
+#: nova/api/openstack/compute/plugins/v3/servers.py:1039
+#: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
+#: nova/api/openstack/compute/servers.py:622
+#: nova/api/openstack/compute/plugins/v3/personalities.py:88
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:645
+#: nova/api/openstack/compute/servers.py:625
+#: nova/api/openstack/compute/plugins/v3/personalities.py:91
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:648
+#: nova/api/openstack/compute/servers.py:628
+#: nova/api/openstack/compute/plugins/v3/personalities.py:94
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:663
+#: nova/api/openstack/compute/servers.py:676
 msgid "Unknown argument : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:666
-#: nova/api/openstack/compute/plugins/v3/servers.py:653
+#: nova/api/openstack/compute/servers.py:646
+#: nova/api/openstack/compute/plugins/v3/servers.py:627
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:676
-#: nova/api/openstack/compute/plugins/v3/servers.py:669
+#: nova/api/openstack/compute/servers.py:656
+#: nova/api/openstack/compute/plugins/v3/servers.py:643
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:686
-#: nova/api/openstack/compute/plugins/v3/servers.py:642
+#: nova/api/openstack/compute/servers.py:666
+#: nova/api/openstack/compute/plugins/v3/servers.py:616
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:699
-#: nova/api/openstack/compute/plugins/v3/servers.py:684
+#: nova/api/openstack/compute/servers.py:679
+#: nova/api/openstack/compute/plugins/v3/servers.py:658
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:705
-#: nova/api/openstack/compute/plugins/v3/servers.py:690
+#: nova/api/openstack/compute/servers.py:685
+#: nova/api/openstack/compute/plugins/v3/servers.py:664
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:708
-#: nova/api/openstack/compute/servers.py:809
-#: nova/api/openstack/compute/plugins/v3/servers.py:693
+#: nova/api/openstack/compute/servers.py:688
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/plugins/v3/servers.py:667
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:734
+#: nova/api/openstack/compute/servers.py:714
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:719
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:744
+#: nova/api/openstack/compute/servers.py:724
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:773
-#: nova/api/openstack/compute/plugins/v3/servers.py:739
+#: nova/api/openstack/compute/servers.py:753
+#: nova/api/openstack/compute/plugins/v3/servers.py:723
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:805
+#: nova/api/openstack/compute/servers.py:932
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:865
+#: nova/api/openstack/compute/servers.py:845
 msgid ""
 "Using different block_device_mapping syntaxes is not allowed in the same "
 "request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:903
-#: nova/api/openstack/compute/plugins/v3/multiple_create.py:66
-msgid "min_count must be <= max_count"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:950
-#: nova/api/openstack/compute/plugins/v3/servers.py:815
+#: nova/api/openstack/compute/servers.py:929
+#: nova/api/openstack/compute/plugins/v3/servers.py:808
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/plugins/v3/servers.py:821
+#: nova/api/openstack/compute/servers.py:935
+#: nova/api/openstack/compute/plugins/v3/servers.py:814
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:959
-#: nova/api/openstack/compute/plugins/v3/servers.py:824
+#: nova/api/openstack/compute/servers.py:938
+#: nova/api/openstack/compute/plugins/v3/servers.py:817
 msgid "Invalid config_drive provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1023
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1050
+#: nova/api/openstack/compute/servers.py:1027
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1076
-#: nova/api/openstack/compute/servers.py:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:944
-#: nova/api/openstack/compute/plugins/v3/servers.py:960
+#: nova/api/openstack/compute/servers.py:1053
+#: nova/api/openstack/compute/servers.py:1070
+#: nova/api/openstack/compute/plugins/v3/servers.py:949
+#: nova/api/openstack/compute/plugins/v3/servers.py:966
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1096
-#: nova/api/openstack/compute/plugins/v3/servers.py:963
+#: nova/api/openstack/compute/servers.py:1073
+#: nova/api/openstack/compute/plugins/v3/servers.py:969
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
-#: nova/api/openstack/compute/plugins/v3/servers.py:977
+#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/plugins/v3/servers.py:662
 msgid "Argument 'type' for reboot must be a string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/plugins/v3/servers.py:983
+#: nova/api/openstack/compute/servers.py:1089
+#: nova/api/openstack/compute/plugins/v3/servers.py:985
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1120
-#: nova/api/openstack/compute/plugins/v3/servers.py:987
+#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/plugins/v3/servers.py:989
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1146
-#: nova/api/openstack/compute/plugins/v3/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1115
+#: nova/api/openstack/compute/plugins/v3/servers.py:1011
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1149
-#: nova/api/openstack/compute/plugins/v3/servers.py:1016
+#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/plugins/v3/servers.py:1014
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1155
-#: nova/api/openstack/compute/plugins/v3/servers.py:1022
+#: nova/api/openstack/compute/servers.py:1124
+#: nova/api/openstack/compute/plugins/v3/servers.py:1020
 msgid ""
 "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
-#: nova/api/openstack/compute/plugins/v3/servers.py:1026
+#: nova/api/openstack/compute/servers.py:1128
+#: nova/api/openstack/compute/plugins/v3/servers.py:1024
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
-#: nova/api/openstack/compute/plugins/v3/servers.py:1030
+#: nova/api/openstack/compute/servers.py:1132
+#: nova/api/openstack/compute/plugins/v3/servers.py:1028
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1184
+#: nova/api/openstack/compute/servers.py:1153
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1193
+#: nova/api/openstack/compute/servers.py:1162
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1193
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1237
+#: nova/api/openstack/compute/servers.py:1206
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1245
-#: nova/api/openstack/compute/plugins/v3/admin_password.py:78
+#: nova/api/openstack/compute/servers.py:1216
+#: nova/api/openstack/compute/plugins/v3/admin_password.py:76
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1254
+#: nova/api/openstack/compute/servers.py:1225
+#: nova/api/openstack/compute/plugins/v3/servers.py:1087
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1267
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1270
+#: nova/api/openstack/compute/servers.py:1241
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1288
+#: nova/api/openstack/compute/servers.py:1259
 #: nova/api/openstack/compute/contrib/aggregates.py:160
+#: nova/api/openstack/compute/contrib/coverage_ext.py:286
 #: nova/api/openstack/compute/contrib/flavormanage.py:59
 #: nova/api/openstack/compute/contrib/keypairs.py:89
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:46
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:80
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:118
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:199
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:45
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:79
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:117
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:198
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:91
-#: nova/api/openstack/compute/plugins/v3/servers.py:1117
+#: nova/api/openstack/compute/plugins/v3/servers.py:1124
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1294
+#: nova/api/openstack/compute/servers.py:1265
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1355
-#: nova/api/openstack/compute/plugins/v3/servers.py:1169
+#: nova/api/openstack/compute/servers.py:1326
+#: nova/api/openstack/compute/plugins/v3/servers.py:1189
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1359
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1458
+#: nova/exception.py:281 nova/api/openstack/compute/servers.py:1368
+#: nova/api/openstack/compute/contrib/admin_actions.py:255
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:248
+#: nova/api/openstack/compute/plugins/v3/servers.py:1231
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1427
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1484
-#: nova/api/openstack/compute/plugins/v3/servers.py:1367
+#: nova/api/openstack/compute/servers.py:1453
+#: nova/api/openstack/compute/plugins/v3/servers.py:1388
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:63
-#: nova/api/openstack/compute/contrib/admin_actions.py:84
-#: nova/api/openstack/compute/contrib/admin_actions.py:105
-#: nova/api/openstack/compute/contrib/admin_actions.py:126
-#: nova/api/openstack/compute/contrib/admin_actions.py:166
-#: nova/api/openstack/compute/contrib/admin_actions.py:184
-#: nova/api/openstack/compute/contrib/admin_actions.py:202
-#: nova/api/openstack/compute/contrib/admin_actions.py:220
-#: nova/api/openstack/compute/contrib/admin_actions.py:375
+#: nova/api/openstack/compute/contrib/admin_actions.py:60
+#: nova/api/openstack/compute/contrib/admin_actions.py:79
+#: nova/api/openstack/compute/contrib/admin_actions.py:98
+#: nova/api/openstack/compute/contrib/admin_actions.py:117
+#: nova/api/openstack/compute/contrib/admin_actions.py:149
+#: nova/api/openstack/compute/contrib/admin_actions.py:165
+#: nova/api/openstack/compute/contrib/admin_actions.py:181
+#: nova/api/openstack/compute/contrib/admin_actions.py:199
+#: nova/api/openstack/compute/contrib/admin_actions.py:337
 #: nova/api/openstack/compute/contrib/multinic.py:42
 #: nova/api/openstack/compute/contrib/rescue.py:43
 #: nova/api/openstack/compute/contrib/shelve.py:43
-#: nova/api/openstack/compute/plugins/v3/rescue.py:47
+#: nova/api/openstack/compute/plugins/v3/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:66
+#: nova/api/openstack/compute/contrib/admin_actions.py:65
+msgid "Virt driver does not implement pause function."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:63
 #, python-format
 msgid "Compute.api::pause %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:87
+#: nova/api/openstack/compute/contrib/admin_actions.py:89
+msgid "Virt driver does not implement unpause function."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:82
 #, python-format
 msgid "Compute.api::unpause %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:108
+#: nova/api/openstack/compute/contrib/admin_actions.py:101
 #, python-format
 msgid "compute.api::suspend %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:129
+#: nova/api/openstack/compute/contrib/admin_actions.py:120
 #, python-format
 msgid "compute.api::resume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:153
+#: nova/api/openstack/compute/contrib/admin_actions.py:136
 #, python-format
 msgid "Error in migrate %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:171
+#: nova/api/openstack/compute/contrib/admin_actions.py:152
 #, python-format
 msgid "Compute.api::reset_network %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:189
+#: nova/api/openstack/compute/contrib/admin_actions.py:168
 #, python-format
 msgid "Compute.api::inject_network_info %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:205
+#: nova/api/openstack/compute/contrib/admin_actions.py:184
 #, python-format
 msgid "Compute.api::lock %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:223
+#: nova/api/openstack/compute/contrib/admin_actions.py:202
 #, python-format
 msgid "Compute.api::unlock %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:253
+#: nova/api/openstack/compute/contrib/admin_actions.py:232
 #, python-format
 msgid "createBackup entity requires %s attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:257
+#: nova/api/openstack/compute/contrib/admin_actions.py:236
 msgid "Malformed createBackup entity"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:263
+#: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:266
+#: nova/api/openstack/compute/contrib/admin_actions.py:245
 msgid ""
 "createBackup attribute 'rotation' must be greater than or equal to zero"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:282
+#: nova/api/openstack/compute/contrib/admin_actions.py:261
 #: nova/api/openstack/compute/contrib/console_output.py:46
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:48
 #: nova/api/openstack/compute/contrib/server_start_stop.py:42
 msgid "Instance not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:312
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:290
+#: nova/api/openstack/compute/contrib/admin_actions.py:291
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:285
 msgid ""
 "host, block_migration and disk_over_commit must be specified for live "
 "migration."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:344
+#: nova/api/openstack/compute/contrib/admin_actions.py:306
 #, python-format
 msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:347
+#: nova/api/openstack/compute/contrib/admin_actions.py:309
 #, python-format
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:365
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:333
+#: nova/api/openstack/compute/contrib/admin_actions.py:327
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:320
 #, python-format
 msgid "Desired state must be specified.  Valid states are: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:378
+#: nova/api/openstack/compute/contrib/admin_actions.py:340
 #, python-format
 msgid "Compute.api::resetState %s"
 msgstr ""
@@ -3096,8 +3178,8 @@
 
 #: nova/api/openstack/compute/contrib/aggregates.py:189
 #: nova/api/openstack/compute/contrib/aggregates.py:193
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:183
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:187
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:182
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:186
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
@@ -3149,7 +3231,7 @@
 msgid "Must specify address in the form of xx:xx:xx:xx:xx:xx"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:227
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3173,24 +3255,24 @@
 msgid "Cell type must be 'parent' or 'child'"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cells.py:341
-#: nova/api/openstack/compute/contrib/cells.py:364
-#: nova/api/openstack/compute/plugins/v3/cells.py:346
-#: nova/api/openstack/compute/plugins/v3/cells.py:370
+#: nova/api/openstack/compute/contrib/cells.py:338
+#: nova/api/openstack/compute/contrib/cells.py:361
+#: nova/api/openstack/compute/plugins/v3/cells.py:343
+#: nova/api/openstack/compute/plugins/v3/cells.py:367
 msgid "No cell information in request"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cells.py:346
-#: nova/api/openstack/compute/plugins/v3/cells.py:351
+#: nova/api/openstack/compute/contrib/cells.py:343
+#: nova/api/openstack/compute/plugins/v3/cells.py:348
 msgid "No cell name in request"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cells.py:398
-#: nova/api/openstack/compute/plugins/v3/cells.py:406
+#: nova/api/openstack/compute/contrib/cells.py:405
+#: nova/api/openstack/compute/plugins/v3/cells.py:314
 msgid "Only 'updated_since', 'project_id' and 'deleted' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:61
+#: nova/api/openstack/compute/contrib/certificates.py:63
 #: nova/api/openstack/compute/plugins/v3/certificates.py:66
 msgid "Only root certificate can be retrieved."
 msgstr ""
@@ -3219,8 +3301,8 @@
 msgid "Unable to get console"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/console_output.py:74
-#: nova/api/openstack/compute/plugins/v3/console_output.py:73
+#: nova/api/openstack/compute/contrib/console_output.py:72
+#: nova/api/openstack/compute/plugins/v3/console_output.py:55
 msgid "Unable to get console log, functionality not implemented"
 msgstr ""
 
@@ -3228,28 +3310,38 @@
 msgid "Instance not yet ready"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/consoles.py:54
-#: nova/api/openstack/compute/plugins/v3/remote_consoles.py:57
+#: nova/api/openstack/compute/contrib/consoles.py:52
+#: nova/api/openstack/compute/plugins/v3/remote_consoles.py:59
 msgid "Unable to get vnc console, functionality not implemented"
 msgstr ""
 
+#: nova/api/openstack/compute/contrib/consoles.py:76
+#: nova/api/openstack/compute/plugins/v3/remote_consoles.py:89
+msgid "Unable to get spice console, functionality not implemented"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/consoles.py:101
+#: nova/api/openstack/compute/plugins/v3/remote_consoles.py:122
+msgid "Unable to get rdp console, functionality not implemented"
+msgstr ""
+
 #: nova/api/openstack/compute/contrib/disk_config.py:44
 #: nova/api/openstack/compute/plugins/v3/disk_config.py:45
 #, python-format
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:56
+#: nova/api/openstack/compute/contrib/evacuate.py:69
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:64
-#: nova/api/openstack/compute/plugins/v3/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:61
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:63
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:74
-#: nova/api/openstack/compute/plugins/v3/evacuate.py:76
+#: nova/api/openstack/compute/contrib/evacuate.py:75
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:77
 #, python-format
 msgid "Compute host %s not found."
 msgstr ""
@@ -3264,21 +3356,22 @@
 msgid "Fixed IP %s not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavor_access.py:96
+#: nova/api/openstack/compute/contrib/flavor_access.py:77
+#: nova/api/openstack/compute/contrib/flavor_access.py:101
 msgid "Flavor not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavor_access.py:101
-#: nova/api/openstack/compute/plugins/v3/flavor_access.py:101
+#: nova/api/openstack/compute/contrib/flavor_access.py:106
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:104
 msgid "Access list not available for public flavors."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavor_access.py:113
+#: nova/api/openstack/compute/contrib/flavor_access.py:118
 msgid "No request body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextraspecs.py:57
-#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:59
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:56
+#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:58
 msgid "No Request Body"
 msgstr ""
 
@@ -3308,7 +3401,7 @@
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:217
 #: nova/api/openstack/compute/contrib/floating_ips.py:282
-#: nova/api/openstack/compute/contrib/security_groups.py:461
+#: nova/api/openstack/compute/contrib/security_groups.py:458
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3356,7 +3449,7 @@
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:147
-#: nova/cmd/manage.py:416
+#: nova/cmd/manage.py:415
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3426,22 +3519,22 @@
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hypervisors.py:187
-#: nova/api/openstack/compute/contrib/hypervisors.py:199
-#: nova/api/openstack/compute/plugins/v3/hypervisors.py:188
-#: nova/api/openstack/compute/plugins/v3/hypervisors.py:201
-#: nova/api/openstack/compute/plugins/v3/hypervisors.py:238
+#: nova/api/openstack/compute/contrib/hypervisors.py:184
+#: nova/api/openstack/compute/contrib/hypervisors.py:195
+#: nova/api/openstack/compute/plugins/v3/hypervisors.py:185
+#: nova/api/openstack/compute/plugins/v3/hypervisors.py:197
+#: nova/api/openstack/compute/plugins/v3/hypervisors.py:234
 #, python-format
 msgid "Hypervisor with ID '%s' could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hypervisors.py:207
-#: nova/api/openstack/compute/plugins/v3/hypervisors.py:209
+#: nova/api/openstack/compute/contrib/hypervisors.py:203
+#: nova/api/openstack/compute/plugins/v3/hypervisors.py:205
 msgid "Virt driver does not implement uptime function."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hypervisors.py:223
-#: nova/api/openstack/compute/contrib/hypervisors.py:233
+#: nova/api/openstack/compute/contrib/hypervisors.py:219
+#: nova/api/openstack/compute/contrib/hypervisors.py:229
 #, python-format
 msgid "No hypervisor matching '%s' could be found."
 msgstr ""
@@ -3470,23 +3563,23 @@
 msgid "Unable to find address %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks_associate.py:36
+#: nova/api/openstack/compute/contrib/networks_associate.py:24
 #, python-format
 msgid "Disassociating host with network with id %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks_associate.py:40
+#: nova/api/openstack/compute/contrib/networks_associate.py:28
+#: nova/api/openstack/compute/contrib/networks_associate.py:39
 #: nova/api/openstack/compute/contrib/networks_associate.py:51
-#: nova/api/openstack/compute/contrib/networks_associate.py:63
 #: nova/api/openstack/compute/contrib/os_networks.py:80
 #: nova/api/openstack/compute/contrib/os_networks.py:90
 #: nova/api/openstack/compute/contrib/os_networks.py:100
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:112
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:134
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:114
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:136
 msgid "Network not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks_associate.py:47
+#: nova/api/openstack/compute/contrib/networks_associate.py:35
 #, python-format
 msgid "Disassociating project with network with id %s"
 msgstr ""
@@ -3497,13 +3590,13 @@
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/os_networks.py:86
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:108
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:110
 #, python-format
 msgid "Showing network with id %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/os_networks.py:96
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:126
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:128
 #, python-format
 msgid "Deleting network with id %s"
 msgstr ""
@@ -3540,31 +3633,35 @@
 "Cannot associate network %(network)s with project %(project)s: %(message)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:123
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:83
+msgid "Failed to get default networks"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:125
 msgid "Failed to update usages deallocating network."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:153
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:155
 msgid "No CIDR requested"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:159
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:161
 msgid "Requested network does not contain enough (2+) usable hosts"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:163
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:165
 msgid "CIDR is malformed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:166
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:168
 msgid "Address could not be converted."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:174
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:176
 msgid "Quota exceeded, too many networks."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:185
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:187
 msgid "Create networks failed"
 msgstr ""
 
@@ -3572,50 +3669,50 @@
 msgid "quota_class_set not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:74
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:88
-#: nova/cmd/manage.py:253
+#: nova/api/openstack/compute/contrib/quotas.py:73
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:83
+#: nova/cmd/manage.py:252
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:78
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:92
-#: nova/cmd/manage.py:257
+#: nova/api/openstack/compute/contrib/quotas.py:76
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:60
+#: nova/cmd/manage.py:256
 #, python-format
-msgid "Quota limit must greater than %s."
+msgid "Quota limit must be greater than %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:81
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:95
-#: nova/cmd/manage.py:260
+#: nova/api/openstack/compute/contrib/quotas.py:79
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:63
+#: nova/cmd/manage.py:259
 #, python-format
-msgid "Quota limit must less than %s."
+msgid "Quota limit must be less than %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:142
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:153
+#: nova/api/openstack/compute/contrib/quotas.py:140
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:118
 msgid "quota_set not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:162
+#: nova/api/openstack/compute/contrib/quotas.py:158
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:165
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:174
+#: nova/api/openstack/compute/contrib/quotas.py:161
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:186
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:203
+#: nova/api/openstack/compute/contrib/quotas.py:182
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:190
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:191
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:208
+#: nova/api/openstack/compute/contrib/quotas.py:189
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:173
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are less than already used and reserved "
@@ -3628,7 +3725,7 @@
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:375
+#: nova/api/openstack/compute/contrib/security_groups.py:372
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3645,32 +3742,39 @@
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:383
+#: nova/api/openstack/compute/contrib/security_groups.py:380
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:464
+#: nova/api/openstack/compute/contrib/security_groups.py:461
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:468
+#: nova/api/openstack/compute/contrib/security_groups.py:465
 msgid "Security group name cannot be empty"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/server_start_stop.py:50
-#: nova/api/openstack/compute/plugins/v3/servers.py:1338
+#: nova/api/openstack/compute/plugins/v3/servers.py:1359
 msgid "start instance"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/server_start_stop.py:62
-#: nova/api/openstack/compute/plugins/v3/servers.py:1351
+#: nova/api/openstack/compute/plugins/v3/servers.py:1372
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:177
-#: nova/api/openstack/compute/plugins/v3/services.py:159
-msgid "Disabled reason contains invalid characters or is too long"
+#: nova/api/openstack/compute/contrib/services.py:146
+#: nova/api/openstack/compute/plugins/v3/services.py:99
+#, python-format
+msgid "Service %s not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:193
+msgid ""
+"The string containing the reason for disabling the service contains invalid "
+"characters or is too long."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/services.py:184
@@ -3740,65 +3844,57 @@
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/access_ips.py:165
+#: nova/api/openstack/compute/plugins/v3/servers.py:690
 msgid "access_ip_v4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/access_ips.py:170
+#: nova/api/openstack/compute/plugins/v3/servers.py:695
 msgid "access_ip_v6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:230
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:225
 #, python-format
 msgid "create_backup entity requires %s attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:234
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:229
 msgid "Malformed create_backup entity"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:240
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:235
 msgid "create_backup attribute 'rotation' must be an integer"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:243
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:238
 msgid ""
 "create_backup attribute 'rotation' must be greater than or equal to zero"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/admin_password.py:60
-msgid "No admin_password was specified"
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:49
+msgid "Could not find host to be set in request body"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/admin_password.py:64
-msgid "Invalid admin password"
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:53
+msgid "The value of host must be a string"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/agents.py:109
-#: nova/api/openstack/compute/plugins/v3/agents.py:160
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:86
+#: nova/api/openstack/compute/plugins/v3/agents.py:108
+#: nova/api/openstack/compute/plugins/v3/agents.py:152
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:85
 #, python-format
 msgid "Could not find %s parameter in the request"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:50
-msgid "Could not find host to be set in request body"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:54
-msgid "The value of host must be a string"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:122
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:121
 msgid "Request body is empty"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:125
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:124
 #, python-format
 msgid "Invalid key %s in request body."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:202
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:201
 msgid "Invalid request format for metadata"
 msgstr ""
 
@@ -3812,25 +3908,6 @@
 msgid "Cell %s doesn't exist."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/console_output.py:52
-msgid "get_console_output malformed or missing from request body"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/evacuate.py:58
-msgid "host and on_shared_storage must be specified."
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/extended_volumes.py:147
-#: nova/api/openstack/compute/plugins/v3/extended_volumes.py:189
-#: nova/api/openstack/compute/plugins/v3/hosts.py:143
-msgid "The request body invalid"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/extended_volumes.py:152
-#: nova/api/openstack/compute/plugins/v3/extended_volumes.py:193
-msgid "Could not find volume_id from requestparameter"
-msgstr ""
-
 #: nova/api/openstack/compute/plugins/v3/extended_volumes.py:196
 #, python-format
 msgid "Detach volume %(volume_id)s from instance %(server_id)s"
@@ -3847,36 +3924,32 @@
 msgid "Filter out extension %s from discover list"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/flavor_access.py:164
-#: nova/api/openstack/compute/plugins/v3/flavor_access.py:192
-msgid "Invalid request"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/flavor_access.py:171
-#: nova/api/openstack/compute/plugins/v3/flavor_access.py:199
-msgid "tenant_id is required"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/flavors.py:140
+#: nova/api/openstack/compute/plugins/v3/flavors.py:141
 #, python-format
 msgid "Invalid min_ram filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/flavors.py:147
+#: nova/api/openstack/compute/plugins/v3/flavors.py:148
 #, python-format
 msgid "Invalid min_disk filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:79
+#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:76
 msgid "No or bad extra_specs provided"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:84
-#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:106
+#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:72
+#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:93
 msgid "Concurrent transaction has been committed, try again"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/hypervisors.py:222
+#: nova/api/openstack/compute/plugins/v3/extended_volumes.py:147
+#: nova/api/openstack/compute/plugins/v3/extended_volumes.py:189
+#: nova/api/openstack/compute/plugins/v3/hosts.py:143
+msgid "The request body invalid"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/hypervisors.py:218
 msgid "Need parameter 'query' to specify which hypervisor to filter on"
 msgstr ""
 
@@ -3885,293 +3958,257 @@
 msgid "Action %s not found"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/multinic.py:53
-msgid "Missing 'network_id' argument for add_fixed_ip"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/multinic.py:69
-msgid "Missing 'address' argument for remove_fixed_ip"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:189
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:176
 #, python-format
 msgid "Force update quotas: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:367
+#: nova/api/openstack/compute/plugins/v3/servers.py:372
 #, python-format
 msgid ""
 "extension %(ext_alias)s detected by servers extension for function %(func)s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:374
+#: nova/api/openstack/compute/plugins/v3/servers.py:379
 #, python-format
 msgid "extension %(ext_alias)s is missing %(func)s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:395
+#: nova/api/openstack/compute/plugins/v3/servers.py:400
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:408
-msgid "Did not find any server create xml deserializer extensions"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/servers.py:420
+#: nova/api/openstack/compute/plugins/v3/servers.py:425
 msgid "Did not find any server rebuild extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:433
-msgid "Did not find any server rebuild xml deserializer extensions"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/servers.py:445
-msgid "Did not find any server resize extensions"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/servers.py:458
-msgid "Did not find any server resize xml deserializer extensions"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/servers.py:470
+#: nova/api/openstack/compute/plugins/v3/servers.py:475
 msgid "Did not find any server update extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:517
+#: nova/api/openstack/compute/plugins/v3/servers.py:522
 msgid "Invalid changes_since value"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:629
+#: nova/api/openstack/compute/plugins/v3/servers.py:603
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:650
+#: nova/api/openstack/compute/plugins/v3/servers.py:624
 msgid "Unknown argument: port"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:658
+#: nova/api/openstack/compute/plugins/v3/servers.py:632
 #, python-format
 msgid ""
 "Specified Fixed IP '%(addr)s' cannot be used with port '%(port)s': port "
 "already has a Fixed IP allocated."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:732
-#: nova/api/openstack/compute/plugins/v3/servers.py:904
+#: nova/api/openstack/compute/plugins/v3/servers.py:418
+#: nova/api/openstack/compute/plugins/v3/servers.py:588
 msgid "The request body is invalid"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:790
-#: nova/api/openstack/compute/plugins/v3/servers.py:818
+#: nova/api/openstack/compute/plugins/v3/servers.py:782
+#: nova/api/openstack/compute/plugins/v3/servers.py:811
 msgid "Invalid flavor_ref provided."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:866
+#: nova/api/openstack/compute/plugins/v3/servers.py:857
 #, python-format
 msgid "Running _create_extension_point for %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:872
+#: nova/api/openstack/compute/plugins/v3/servers.py:863
 #, python-format
 msgid "Running _rebuild_extension_point for %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:878
+#: nova/api/openstack/compute/plugins/v3/servers.py:869
 #, python-format
 msgid "Running _resize_extension_point for %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:884
+#: nova/api/openstack/compute/plugins/v3/servers.py:875
 #, python-format
 msgid "Running _update_extension_point for %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:915
+#: nova/api/openstack/compute/plugins/v3/servers.py:921
 msgid "host_id cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1053
+#: nova/api/openstack/compute/plugins/v3/servers.py:1051
 msgid "Invalid image_ref provided."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1072
+#: nova/api/openstack/compute/plugins/v3/servers.py:1070
 msgid "Missing image_ref attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1079
+#: nova/api/openstack/compute/plugins/v3/servers.py:1077
 msgid "Missing flavor_ref attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1094
+#: nova/api/openstack/compute/plugins/v3/servers.py:1101
 msgid "Resize request has invalid 'flavor_ref' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1097
+#: nova/api/openstack/compute/plugins/v3/servers.py:1104
 msgid "Resize requests require 'flavor_ref' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1123
+#: nova/api/openstack/compute/plugins/v3/servers.py:1130
 msgid "Could not parse image_ref from request."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1202
+#: nova/api/openstack/compute/plugins/v3/servers.py:1222
 msgid "create_image entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1269
+#: nova/api/openstack/compute/plugins/v3/servers.py:954
 msgid "Invalid admin_password"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1285
-#, python-format
-msgid "Running create xml deserialize ep for %s"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/servers.py:1300
-#: nova/api/openstack/compute/plugins/v3/servers.py:1314
-#, python-format
-msgid "Running rebuild xml deserialize ep for %s"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py:228
-#, python-format
-msgid "Start time is invalid format, valid formats are %s"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py:233
-#, python-format
-msgid "Stop time is invalid format, valid formats are %s"
+#: nova/api/openstack/compute/contrib/services.py:177
+#: nova/api/openstack/compute/plugins/v3/services.py:159
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/views/servers.py:189
+#: nova/api/openstack/compute/views/servers.py:186
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/api/validation/validators.py:63
+#: nova/api/validation/validators.py:61
 #, python-format
 msgid ""
 "Invalid input for field/attribute %(path)s. Value: %(value)s. %(message)s"
 msgstr ""
 
-#: nova/cells/messaging.py:210
+#: nova/cells/manager.py:77
+msgid ""
+"The cells feature of Nova is considered experimental by the OpenStack "
+"project because it receives much less testing than the rest of Nova. This "
+"may change in the future, but current deployers should be aware that the use "
+"of it in production right now may be risky."
+msgstr ""
+
+#: nova/cells/messaging.py:209
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:371 nova/cells/messaging.py:379
+#: nova/cells/messaging.py:370 nova/cells/messaging.py:378
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:391
+#: nova/cells/messaging.py:390
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:415
+#: nova/cells/messaging.py:414
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:442
+#: nova/cells/messaging.py:441
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:521
+#: nova/cells/messaging.py:520
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:540
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:559
+#: nova/cells/messaging.py:558
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:674
+#: nova/cells/messaging.py:673
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:704
+#: nova/cells/messaging.py:703
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:714
+#: nova/cells/messaging.py:713
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1023
+#: nova/cells/messaging.py:966
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1059
+#: nova/cells/messaging.py:1010
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:1074
+#: nova/cells/messaging.py:1025
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:1088
+#: nova/cells/messaging.py:1039
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1109
+#: nova/cells/messaging.py:1060
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1188
+#: nova/cells/messaging.py:1139
 #, python-format
 msgid "No match when trying to update BDM: %(bdm)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1372
+#: nova/cells/messaging.py:1323
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1392
+#: nova/cells/messaging.py:1343
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1664
+#: nova/cells/messaging.py:1615
 #, python-format
 msgid "No cell_name for %(method)s() from API"
 msgstr ""
 
-#: nova/cells/messaging.py:1681
+#: nova/cells/messaging.py:1632
 msgid "No cell_name for instance update from API"
 msgstr ""
 
-#: nova/cells/rpc_driver.py:205
+#: nova/openstack/common/rpc/common.py:289
 #, python-format
-msgid "Unable to handle transport URL scheme %s"
-msgstr ""
-
-#: nova/cells/rpc_driver.py:212
-msgid "Cannot comply with query string in transport URL"
+msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/cells/rpcapi.py:357
+#: nova/cells/rpcapi.py:350
 msgid "Failed to notify cells of BDM update/create."
 msgstr ""
 
-#: nova/cells/rpcapi.py:373
+#: nova/cells/rpcapi.py:366
 msgid "Failed to notify cells of BDM destroy."
 msgstr ""
 
@@ -4240,119 +4277,119 @@
 "%(cell)s has not been seen since %(last_seen)s and is being treated as mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:51
 msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:54
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:57
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:58
+#: nova/cloudpipe/pipelib.py:60
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:127
+#: nova/cloudpipe/pipelib.py:129
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:63 nova/cmd/all.py:69 nova/cmd/all.py:92
+#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
 #, python-format
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:198
+#: nova/cmd/baremetal_deploy_helper.py:181
 #, python-format
 msgid "parent device '%s' not found"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:202
+#: nova/cmd/baremetal_deploy_helper.py:185
 #, python-format
 msgid "root device '%s' not found"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:205
+#: nova/cmd/baremetal_deploy_helper.py:188
 #, python-format
 msgid "swap device '%s' not found"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:210
+#: nova/cmd/baremetal_deploy_helper.py:217
 #, python-format
 msgid "ephemeral device '%s' not found"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:218
+#: nova/cmd/baremetal_deploy_helper.py:197
 msgid "Failed to detect root device UUID."
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:237
+#: nova/cmd/baremetal_deploy_helper.py:215
 #, python-format
 msgid "Cmd     : %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:238
+#: nova/cmd/baremetal_deploy_helper.py:216
 #, python-format
 msgid "StdOut  : %r"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:239
+#: nova/cmd/baremetal_deploy_helper.py:217
 #, python-format
 msgid "StdErr  : %r"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:267
+#: nova/cmd/baremetal_deploy_helper.py:245
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:276
+#: nova/cmd/baremetal_deploy_helper.py:254
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:280
+#: nova/cmd/baremetal_deploy_helper.py:258
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:302
+#: nova/cmd/baremetal_deploy_helper.py:280
 #, python-format
 msgid "post: environ=%s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:321
+#: nova/cmd/baremetal_deploy_helper.py:299
 #, python-format
 msgid "Deploy agent error message: %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:344
+#: nova/cmd/baremetal_deploy_helper.py:321
 #, python-format
 msgid "request is queued: node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1331
+#: nova/cmd/baremetal_manage.py:159 nova/cmd/manage.py:1330
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1335
+#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1334
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:166 nova/cmd/manage.py:1337
+#: nova/cmd/baremetal_manage.py:165 nova/cmd/manage.py:1336
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:206 nova/cmd/manage.py:1382
+#: nova/cmd/baremetal_manage.py:205 nova/cmd/manage.py:1381
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/compute.py:50
+#: nova/cmd/compute.py:48
 #, python-format
 msgid "No db access allowed in nova-compute: %s"
 msgstr ""
@@ -4366,633 +4403,657 @@
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:211
+#: nova/cmd/manage.py:210
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:269
+#: nova/cmd/manage.py:268
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:275
+#: nova/cmd/manage.py:274
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:276
+#: nova/cmd/manage.py:275
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:277
+#: nova/cmd/manage.py:276
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:278
+#: nova/cmd/manage.py:277
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:321 nova/cmd/manage.py:396 nova/cmd/manage.py:721
-#: nova/cmd/manage.py:735 nova/cmd/manage.py:805
+#: nova/cmd/manage.py:320 nova/cmd/manage.py:395 nova/cmd/manage.py:720
+#: nova/cmd/manage.py:734 nova/cmd/manage.py:804
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:329
+#: nova/cmd/manage.py:328
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:331
+#: nova/cmd/manage.py:330
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:332 nova/cmd/manage.py:861
+#: nova/cmd/manage.py:331 nova/cmd/manage.py:860
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:344 nova/cmd/manage.py:368
+#: nova/cmd/manage.py:343 nova/cmd/manage.py:367
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:360
+#: nova/cmd/manage.py:359
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:423
+#: nova/cmd/manage.py:422
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce the "
 "number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:474
+#: nova/cmd/manage.py:473
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:536 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:535 nova/tests/test_nova_manage.py:213
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:537 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:536 nova/tests/test_nova_manage.py:214
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:538 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:537 nova/tests/test_nova_manage.py:215
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:539 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:538 nova/tests/test_nova_manage.py:216
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:540 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:539 nova/tests/test_nova_manage.py:217
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:541 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:540 nova/tests/test_nova_manage.py:218
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:542 nova/tests/test_nova_manage.py:219
+#: nova/cmd/manage.py:541 nova/tests/test_nova_manage.py:219
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:543 nova/cmd/manage.py:649
+#: nova/cmd/manage.py:542 nova/cmd/manage.py:648
 #: nova/tests/test_nova_manage.py:220
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:544 nova/tests/test_nova_manage.py:221
+#: nova/cmd/manage.py:543 nova/tests/test_nova_manage.py:221
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:551
+#: nova/cmd/manage.py:550
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:570
+#: nova/cmd/manage.py:569
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:575
+#: nova/cmd/manage.py:574
 msgid "UUID is required to delete Neutron Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:578
+#: nova/cmd/manage.py:577
 msgid "Deleting by fixed_range is not supported with the NeutronManager"
 msgstr ""
 
-#: nova/cmd/manage.py:641
+#: nova/cmd/manage.py:640
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:642
+#: nova/cmd/manage.py:641
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:643
+#: nova/cmd/manage.py:642
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:644
+#: nova/cmd/manage.py:643
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:645
+#: nova/cmd/manage.py:644
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:646
+#: nova/cmd/manage.py:645
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:647
+#: nova/cmd/manage.py:646
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:648
+#: nova/cmd/manage.py:647
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:650
+#: nova/cmd/manage.py:649
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:651 nova/cmd/manage.py:862
+#: nova/cmd/manage.py:650 nova/cmd/manage.py:861
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:652
+#: nova/cmd/manage.py:651
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:695
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:698
+#: nova/cmd/manage.py:697
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:699
+#: nova/cmd/manage.py:698
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:700
+#: nova/cmd/manage.py:699
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:701
+#: nova/cmd/manage.py:700
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:723
+#: nova/cmd/manage.py:722
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:737
+#: nova/cmd/manage.py:736
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:809
+#: nova/cmd/manage.py:808
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:810
+#: nova/cmd/manage.py:809
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:814
+#: nova/cmd/manage.py:813
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:815
+#: nova/cmd/manage.py:814
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:816
+#: nova/cmd/manage.py:815
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:817
+#: nova/cmd/manage.py:816
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:818
+#: nova/cmd/manage.py:817
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:901
+#: nova/cmd/manage.py:900
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:943
+#: nova/cmd/manage.py:942
 msgid "Must supply valid parameters to create flavor"
 msgstr ""
 
-#: nova/cmd/manage.py:947
+#: nova/cmd/manage.py:946
 msgid "Flavor exists."
 msgstr ""
 
-#: nova/cmd/manage.py:948
+#: nova/cmd/manage.py:947
 msgid "Please ensure flavor name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:950
+#: nova/cmd/manage.py:949
 msgid "Currently defined flavor names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:955
+#: nova/cmd/manage.py:954
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:958
+#: nova/cmd/manage.py:957
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:966
+#: nova/cmd/manage.py:965
 msgid "Valid flavor name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:969
+#: nova/cmd/manage.py:968
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:974
+#: nova/cmd/manage.py:973
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:1010
+#: nova/cmd/manage.py:1009
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1033
+#: nova/cmd/manage.py:1032
 #, python-format
 msgid "Key %(key)s on flavor %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1093
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1143
+#: nova/cmd/manage.py:1142
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1146
+#: nova/cmd/manage.py:1145
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1160
+#: nova/cmd/manage.py:1159
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1164
+#: nova/cmd/manage.py:1163
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1173
+#: nova/cmd/manage.py:1172
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:363
+#: nova/compute/api.py:349
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:370
+#: nova/compute/api.py:356
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:382
+#: nova/compute/api.py:368
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)d instances. "
 "%(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:386
+#: nova/compute/api.py:372
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run between %(min_count)d and "
 "%(max_count)d instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:407
+#: nova/compute/api.py:409
 msgid "Metadata type should be dict."
 msgstr ""
 
-#: nova/compute/api.py:413
+#: nova/compute/api.py:396
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata properties"
 msgstr ""
 
-#: nova/compute/api.py:425
+#: nova/compute/api.py:427
 #, python-format
 msgid "Metadata property key '%s' is not a string."
 msgstr ""
 
-#: nova/compute/api.py:428
+#: nova/compute/api.py:430
 #, python-format
 msgid "Metadata property value '%(v)s' for key '%(k)s' is not a string."
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:408
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:435
+#: nova/compute/api.py:412
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:438
+#: nova/compute/api.py:416
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:549
 msgid ""
 "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:641
+#: nova/compute/api.py:608
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:685
+#: nova/compute/api.py:651
 msgid "The requested availability zone is not available"
 msgstr ""
 
-#: nova/compute/api.py:786
+#: nova/compute/api.py:746
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:911
+#: nova/compute/api.py:938
 #, python-format
 msgid ""
 "max count reduced from %(max_count)d to %(max_net_count)d due to network "
 "port quota"
 msgstr ""
 
-#: nova/compute/api.py:960
+#: nova/compute/api.py:906
 #, python-format
 msgid "Image bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:999
+#: nova/compute/api.py:945
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1062
+#: nova/compute/api.py:1008
 msgid "More than one swap drive requested."
 msgstr ""
 
-#: nova/compute/api.py:1227
-#: nova/tests/api/openstack/compute/test_servers.py:3031
-#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2362
+#: nova/compute/api.py:1178
+#: nova/tests/api/openstack/compute/test_servers.py:2894
+#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2284
 msgid ""
 "Unable to launch multiple instances with a single configured port ID. Please "
 "launch your instance one by one with different ports."
 msgstr ""
 
-#: nova/compute/api.py:1330
+#: nova/compute/api.py:1282
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1447
+#: nova/compute/api.py:1380
+#, python-format
+msgid "Working on deleting snapshot %s from shelved instance..."
+msgstr ""
+
+#: nova/compute/api.py:1387
 #, python-format
+msgid "Failed to delete snapshot from shelved instance (%s)."
+msgstr ""
+
+#: nova/compute/api.py:1391
 msgid ""
-"Found an unconfirmed migration during delete, id: %(id)s, status: %(status)s"
+"Something wrong happened when trying to delete snapshot from shelved "
+"instance."
 msgstr ""
 
 #: nova/compute/api.py:1457
+msgid "Instance is already in deleting state, ignoring this request"
+msgstr ""
+
+#: nova/compute/api.py:1378
+#, python-format
+msgid ""
+"Found an unconfirmed migration during delete, id: %(id)s, status: %(status)s"
+msgstr ""
+
+#: nova/compute/api.py:1388
 msgid "Instance may have been confirmed during delete"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1405
 #, python-format
 msgid "Migration %s may have been confirmed during delete"
 msgstr ""
 
-#: nova/compute/api.py:1511
+#: nova/compute/api.py:1569
 #, python-format
 msgid "Flavor %d not found"
 msgstr ""
 
-#: nova/compute/api.py:1516
+#: nova/compute/api.py:1448
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1527
+#: nova/compute/api.py:1459
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1554 nova/compute/manager.py:1952
+#: nova/compute/manager.py:1742
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/api.py:1594
+#: nova/compute/api.py:1524
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1612
+#: nova/compute/api.py:1542
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1656
+#: nova/compute/api.py:1586
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1684
+#: nova/compute/api.py:1614
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1756
+#: nova/compute/api.py:1689
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1966
+#: nova/compute/api.py:1924
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2303
+#: nova/compute/api.py:2248
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2312
+#: nova/compute/api.py:2257
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2348
+#: nova/compute/api.py:2298
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2514
+#: nova/compute/api.py:2465
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2623
+#: nova/compute/api.py:2574
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2640
+#: nova/compute/api.py:2591
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2716
+#: nova/compute/api.py:2667
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2737
+#: nova/compute/api.py:2688
 msgid "Old volume is attached to a different instance."
 msgstr ""
 
-#: nova/compute/api.py:2740
+#: nova/compute/api.py:2691
 msgid "New volume must be detached in order to swap."
 msgstr ""
 
-#: nova/compute/api.py:2743
+#: nova/compute/api.py:2694
 msgid "New volume must be the same size or larger."
 msgstr ""
 
-#: nova/compute/api.py:2923
+#: nova/compute/api.py:2882
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2942
+#: nova/compute/api.py:2901
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2946
+#: nova/compute/api.py:2905
 #, python-format
 msgid ""
 "Instance compute service state on %s expected to be down, but it was up."
 msgstr ""
 
-#: nova/compute/api.py:3239
+#: nova/compute/api.py:3256
+msgid "This aggregate contains hosts in an existing availability zone"
+msgstr ""
+
+#: nova/compute/api.py:3321
 #, python-format
 msgid "Host already in availability zone %s"
 msgstr ""
 
-#: nova/compute/api.py:3315 nova/tests/compute/test_keypairs.py:137
+#: nova/compute/api.py:3235 nova/tests/compute/test_keypairs.py:115
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:3319 nova/tests/compute/test_keypairs.py:129
-#: nova/tests/compute/test_keypairs.py:133
+#: nova/compute/api.py:3239 nova/tests/compute/test_keypairs.py:107
+#: nova/tests/compute/test_keypairs.py:111
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:3409
+#: nova/compute/api.py:3316
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:3412
+#: nova/compute/api.py:3319
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:3420
+#: nova/compute/api.py:3327
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)s'."
 msgstr ""
 
-#: nova/compute/api.py:3426
+#: nova/compute/api.py:3333
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:3444
+#: nova/compute/api.py:3351
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:3447
+#: nova/compute/api.py:3354
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:3459
+#: nova/compute/api.py:3366
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:3472
+#: nova/compute/api.py:3379
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3534
+#: nova/compute/api.py:3439
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3539
+#: nova/compute/api.py:3444
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3547
+#: nova/compute/api.py:3452
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3550
+#: nova/compute/api.py:3455
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3627 nova/compute/api.py:3701
+#: nova/compute/api.py:3532 nova/compute/api.py:3606
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3643
+#: nova/compute/api.py:3548
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3646
+#: nova/compute/api.py:3551
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3655
+#: nova/compute/api.py:3560
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3708
+#: nova/compute/api.py:3613
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -5050,40 +5111,46 @@
 "%(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:101
+#: nova/compute/flavors.py:102
 msgid ""
 "Flavor names can only contain alphanumeric characters, periods, dashes, "
 "underscores and spaces."
 msgstr ""
 
-#: nova/compute/flavors.py:111
+#: nova/compute/flavors.py:104
 msgid "id cannot contain leading and/or trailing whitespace(s)"
 msgstr ""
 
-#: nova/compute/flavors.py:121
+#: nova/compute/flavors.py:122
 msgid ""
 "Flavor id can only contain letters from A-Z (both cases), periods, dashes, "
 "underscores and spaces."
 msgstr ""
 
-#: nova/compute/flavors.py:141
+#: nova/compute/flavors.py:144
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:151
+#: nova/compute/flavors.py:154
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:156
+#: nova/compute/flavors.py:159
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:167
+#: nova/compute/flavors.py:170
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
+#: nova/compute/flavors.py:318
+msgid ""
+"Key Names can only contain alphanumeric characters, periods, dashes, "
+"underscores, colons and spaces."
+msgstr ""
+
 #: nova/compute/manager.py:235
 #, python-format
 msgid "Task possibly preempted: %s"
@@ -5099,937 +5166,953 @@
 msgid "Error while trying to clean up image %s"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:459
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:483 nova/compute/manager.py:492
+#: nova/compute/manager.py:486 nova/compute/manager.py:495
 msgid ""
 "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:539
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our host "
 "(%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:555
+#: nova/compute/manager.py:561
 msgid ""
 "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:582
 msgid ""
 "Hypervisor driver does not support instance shared storage check, assuming "
 "it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:588
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:650
+#: nova/compute/manager.py:647
+#, python-format
+msgid "Instance is in %s state."
+msgstr ""
+
+#: nova/compute/manager.py:659
 msgid "Failed to complete a deletion"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:670
 msgid "Instance failed to spawn correctly, setting to ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:675
+#: nova/compute/manager.py:682
 #, python-format
 msgid "Instance in transitional state %s at start-up clearing task state"
 msgstr ""
 
-#: nova/compute/manager.py:702
+#: nova/compute/manager.py:690
+msgid ""
+"Service started deleting the instance during the previous run, but did not "
+"finish. Restarting the deletion now."
+msgstr ""
+
+#: nova/compute/manager.py:684
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:705
+#: nova/compute/manager.py:687
 msgid ""
 "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:716
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:722
+#: nova/compute/manager.py:704
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:733
+#: nova/compute/manager.py:715
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:738
+#: nova/compute/manager.py:720
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:747
+#: nova/compute/manager.py:729
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:751
+#: nova/compute/manager.py:733
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:767
+#: nova/compute/manager.py:749
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:780
+#: nova/compute/manager.py:762
 #, python-format
 msgid ""
 "Event %s arrived for non-existent instance. The instance was probably "
 "deleted."
 msgstr ""
 
-#: nova/compute/manager.py:783
+#: nova/compute/manager.py:765
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:800
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:906
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:961 nova/compute/manager.py:1680
+#: nova/compute/manager.py:947
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:985
+#: nova/compute/manager.py:970
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:1012 nova/compute/manager.py:1609
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:997 nova/compute/manager.py:1545
+#: nova/compute/manager.py:2917
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1058
+#: nova/compute/manager.py:1041
 msgid "Instance disappeared during build"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1047
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1090
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1118
+#: nova/compute/manager.py:1107
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1145 nova/compute/manager.py:3077
+#: nova/compute/manager.py:1134 nova/compute/manager.py:2976
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1158
+#: nova/compute/manager.py:1147
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1163
+#: nova/compute/manager.py:1152
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1169
+#: nova/compute/manager.py:1158
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1198
+#: nova/compute/manager.py:1187
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1208 nova/compute/manager.py:1587
+#: nova/compute/manager.py:1197
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1222
+#: nova/compute/manager.py:1211
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1226
+#: nova/compute/manager.py:1215
 #, python-format
 msgid ""
 "Treating negative config value (%(retries)s) for 'network_allocate_retries' "
 "as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1239
+#: nova/compute/manager.py:1229
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1247
+#: nova/compute/manager.py:1237
 #, python-format
 msgid "Instance failed network setup after %(attempts)d attempt(s)"
 msgstr ""
 
-#: nova/compute/manager.py:1251
+#: nova/compute/manager.py:1241
 #, python-format
 msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1437
+#: nova/compute/manager.py:1392
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1456 nova/compute/manager.py:1771
-#: nova/compute/manager.py:3548
+#: nova/compute/manager.py:1410 nova/compute/manager.py:3455
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1461
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1594
+#: nova/compute/manager.py:1616
 msgid "Instance disappeared before build."
 msgstr ""
 
-#: nova/compute/manager.py:1631
+#: nova/compute/manager.py:1577
 msgid "Instance disappeared during build."
 msgstr ""
 
-#: nova/compute/manager.py:1644
+#: nova/compute/manager.py:1667
 msgid "Unexpected build failure, not rescheduling build."
 msgstr ""
 
-#: nova/compute/manager.py:1709
+#: nova/compute/manager.py:1732
 msgid "Failed to allocate network(s)"
 msgstr ""
 
-#: nova/compute/manager.py:1714 nova/compute/manager.py:1748
+#: nova/compute/manager.py:1737 nova/compute/manager.py:1775
 msgid "Failed to allocate the network(s), not rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1799
 msgid "Failure prepping block device"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1801
 msgid "Failure prepping block device."
 msgstr ""
 
-#: nova/compute/manager.py:1780
+#: nova/compute/manager.py:1818
 msgid "Could not clean up failed build, not rescheduling"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1830
 msgid "Failed to deallocate networks"
 msgstr ""
 
-#: nova/compute/manager.py:1801
+#: nova/compute/manager.py:1841
 msgid "Failed to cleanup volumes for failed build, not rescheduling"
 msgstr ""
 
-#: nova/compute/manager.py:1832
+#: nova/compute/manager.py:1622
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1840
+#: nova/compute/manager.py:1630
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1886
+#: nova/compute/manager.py:1676
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1889
+#: nova/compute/manager.py:1679
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1898
+#: nova/compute/manager.py:1688
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1993 nova/compute/manager.py:3238
-#: nova/compute/manager.py:5111
+#: nova/compute/manager.py:2033
+msgid "Instance disappeared during terminate"
+msgstr ""
+
+#: nova/compute/manager.py:1786 nova/compute/manager.py:3146
+#: nova/compute/manager.py:4987
 msgid "Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:2136
+#: nova/compute/manager.py:1951
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:2149
+#: nova/compute/manager.py:1964
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:2153
+#: nova/compute/manager.py:1968
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:2157
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2168 nova/compute/manager.py:4302
+#: nova/compute/manager.py:1983 nova/compute/manager.py:4203
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:2246
+#: nova/compute/manager.py:2068
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2277
+#: nova/compute/manager.py:2099
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2118
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:2310
+#: nova/compute/manager.py:2135
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2346
+#: nova/compute/manager.py:2171
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2174
 #, python-format
 msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2362
+#: nova/compute/manager.py:2187
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:2404
+#: nova/compute/manager.py:2478
 #, python-format
 msgid "Instance not found, could not set state %s for instance."
 msgstr ""
 
-#: nova/compute/manager.py:2410
+#: nova/compute/manager.py:2484
 msgid "Instance being deleted, snapshot cannot continue"
 msgstr ""
 
-#: nova/compute/manager.py:2426
+#: nova/compute/manager.py:2304
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:2432
+#: nova/compute/manager.py:2215 nova/compute/manager.py:2310
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2334
 msgid "Instance disappeared during snapshot"
 msgstr ""
 
-#: nova/compute/manager.py:2460
-msgid "Image not found"
+#: nova/compute/manager.py:2536
+msgid "Image not found during snapshot"
 msgstr ""
 
-#: nova/compute/manager.py:2497
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2389
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2510
+#: nova/compute/manager.py:2394
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2538
+#: nova/compute/manager.py:2422
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2545
+#: nova/compute/manager.py:2429
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2552
+#: nova/compute/manager.py:2436
 msgid ""
 "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2567
+#: nova/compute/manager.py:2451
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2574
+#: nova/compute/manager.py:2458
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2587
+#: nova/compute/manager.py:2471
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2592
+#: nova/compute/manager.py:2476
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2610
+#: nova/compute/manager.py:2494
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2632
+#: nova/compute/manager.py:2516
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2539
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2659
+#: nova/compute/manager.py:2543
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2680
+#: nova/compute/manager.py:2564
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2706
+#: nova/compute/manager.py:2590
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2740
+#: nova/compute/manager.py:2626
 #, python-format
 msgid "Going to confirm migration %s"
 msgstr ""
 
-#: nova/compute/manager.py:2748
+#: nova/compute/manager.py:2632
 #, python-format
 msgid "Migration %s is not found during confirmation"
 msgstr ""
 
-#: nova/compute/manager.py:2753
+#: nova/compute/manager.py:2637
 #, python-format
 msgid "Migration %s is already confirmed"
 msgstr ""
 
-#: nova/compute/manager.py:2757
+#: nova/compute/manager.py:2641
 #, python-format
 msgid ""
 "Unexpected confirmation status '%(status)s' of migration %(id)s, exit "
 "confirmation process"
 msgstr ""
 
-#: nova/compute/manager.py:2770
+#: nova/compute/manager.py:2654
 msgid "Instance is not found during confirmation"
 msgstr ""
 
-#: nova/compute/manager.py:2819
+#: nova/compute/manager.py:2893
 #, python-format
 msgid "Resized/migrated instance is powered off. Setting vm_state to '%s'."
 msgstr ""
 
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2836
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2977
+#: nova/compute/manager.py:2874
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2983
+#: nova/compute/manager.py:2880
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2993
+#: nova/compute/manager.py:3067
 #, python-format
 msgid "Stashing vm_state: %s"
 msgstr ""
 
-#: nova/compute/manager.py:3001
+#: nova/compute/manager.py:2898
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:3244
+#: nova/compute/manager.py:3152
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:3308
+#: nova/compute/manager.py:3217
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:3325
+#: nova/compute/manager.py:3235
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:3365
+#: nova/compute/manager.py:3273
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:3394
+#: nova/compute/manager.py:3304
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:3566
+#: nova/compute/manager.py:3474
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:3571
+#: nova/compute/manager.py:3479
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:3574
+#: nova/compute/manager.py:3482
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:3594
+#: nova/compute/manager.py:3500
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:3623
+#: nova/compute/manager.py:3527
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3562
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3740
-#, python-format
-msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
+#: nova/compute/manager.py:3787
+msgid "Getting RDP console"
 msgstr ""
 
-#: nova/compute/manager.py:3750
+#: nova/compute/manager.py:3642
 #, python-format
-msgid ""
-"Failed to connect to volume %(volume_id)s while attaching at %(mountpoint)s"
+msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3771
+#: nova/compute/manager.py:3888
 #, python-format
-msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgid "Failed to attach %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3805
+#: nova/compute/manager.py:3706
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3816
+#: nova/compute/manager.py:3717
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3828
+#: nova/compute/manager.py:3728
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3852
+#: nova/compute/manager.py:3752
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3886
+#: nova/compute/manager.py:3807
 #, python-format
-msgid ""
-"Failed to connect to volume %(volume_id)s with volume at %(mountpoint)s"
+msgid "Failed to swap volume %(old_volume_id)s for %(new_volume_id)s"
 msgstr ""
 
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3786
 #, python-format
-msgid "Failed to swap volume %(old_volume_id)s for %(new_volume_id)s"
+msgid ""
+"Failed to connect to volume %(volume_id)s with volume at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3970
+#: nova/compute/manager.py:3871
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3993
+#: nova/compute/manager.py:3894
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:4006 nova/tests/compute/test_compute.py:9510
+#: nova/compute/manager.py:3907 nova/tests/compute/test_compute.py:9179
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:4148
+#: nova/compute/manager.py:4052
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:4177
+#: nova/compute/manager.py:4081
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:4245
+#: nova/compute/manager.py:4146
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:4247
+#: nova/compute/manager.py:4148
 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:4270
+#: nova/compute/manager.py:4171
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:4439
+#: nova/compute/manager.py:4339
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:4442
+#: nova/compute/manager.py:4567
 msgid "An error occurred"
 msgstr ""
 
-#: nova/compute/manager.py:4491
+#: nova/compute/manager.py:4391
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:4496
+#: nova/compute/manager.py:4396
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:4505
+#: nova/compute/manager.py:4405
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:4515
+#: nova/compute/manager.py:4414
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:4520
+#: nova/compute/manager.py:4419
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:4527
+#: nova/compute/manager.py:4426
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:4538
+#: nova/compute/manager.py:4437
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:4564
+#: nova/compute/manager.py:4463
 msgid "Periodic task failed to offload instance."
 msgstr ""
 
-#: nova/compute/manager.py:4584
+#: nova/compute/manager.py:4483
 #, 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:4604
+#: nova/compute/manager.py:4503
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4628
+#: nova/compute/manager.py:4527
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:4740
+#: nova/compute/manager.py:4781
+msgid "Bandwidth usage not supported by hypervisor."
+msgstr ""
+
+#: nova/compute/manager.py:4639
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:4768
+#: nova/compute/manager.py:4666
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on the "
 "hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:4775 nova/compute/manager.py:4836
+#: nova/compute/manager.py:4673 nova/compute/manager.py:4732
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:4797
+#: nova/compute/manager.py:4694
 msgid ""
 "Periodic sync_power_state task had an error while processing an instance."
 msgstr ""
 
-#: nova/compute/manager.py:4823
+#: nova/compute/manager.py:4719
 #, 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:4860
+#: nova/compute/manager.py:4756
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4872 nova/compute/manager.py:4881
-#: nova/compute/manager.py:4912
+#: nova/compute/manager.py:4768 nova/compute/manager.py:4777
+#: nova/compute/manager.py:4808
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4876
+#: nova/compute/manager.py:4772
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4892
+#: nova/compute/manager.py:4788
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4898
+#: nova/compute/manager.py:4794
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4904
+#: nova/compute/manager.py:4800
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4921
+#: nova/compute/manager.py:4817
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4929
+#: nova/compute/manager.py:4825
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4943
+#: nova/compute/manager.py:4839
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4950
+#: nova/compute/manager.py:4846
 #, python-format
 msgid "Periodic reclaim failed to delete instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:4975
+#: nova/compute/manager.py:4871
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4985 nova/compute/resource_tracker.py:399
+#: nova/compute/manager.py:4881 nova/compute/resource_tracker.py:371
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:5027
+#: nova/compute/manager.py:4921
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but still "
 "present on host."
 msgstr ""
 
-#: nova/compute/manager.py:5033
+#: nova/compute/manager.py:5174
 #, python-format
 msgid ""
 "Powering off instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:5042
+#: nova/compute/manager.py:5183
 msgid "set_bootable is not implemented for the current driver"
 msgstr ""
 
-#: nova/compute/manager.py:5047
+#: nova/compute/manager.py:5188
 msgid "Failed to power off instance"
 msgstr ""
 
-#: nova/compute/manager.py:5051
+#: nova/compute/manager.py:4927
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:5060
+#: nova/compute/manager.py:4936
 #, python-format
 msgid "Periodic cleanup failed to delete instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:5064
+#: nova/compute/manager.py:4940
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:5095
+#: nova/compute/manager.py:4971
 #, python-format
 msgid "Setting instance back to %(state)s after: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:5104
+#: nova/compute/manager.py:4980
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
 
-#: nova/compute/manager.py:5125
+#: nova/compute/manager.py:5265
 msgid "Hypervisor driver does not support add_aggregate_host"
 msgstr ""
 
-#: nova/compute/manager.py:5142
+#: nova/compute/manager.py:5282
 msgid "Hypervisor driver does not support remove_aggregate_host"
 msgstr ""
 
-#: nova/compute/manager.py:5186
+#: nova/compute/manager.py:5062
 msgid "Cleaning up deleted instances"
 msgstr ""
 
-#: nova/compute/manager.py:5195
+#: nova/compute/manager.py:5071
 #, python-format
 msgid "There are %d instances to clean"
 msgstr ""
 
-#: nova/compute/manager.py:5199
+#: nova/compute/manager.py:5075
 #, python-format
 msgid "Instance has had %(attempts)s of %(max)s cleanup attempts"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:104
+#: nova/compute/resource_tracker.py:100
 msgid ""
 "Host field should not be set on the instance until resources have been "
 "claimed."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:109
+#: nova/compute/resource_tracker.py:105
 msgid ""
 "Node field should not be set on the instance until resources have been "
 "claimed."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:115 nova/compute/resource_tracker.py:159
+#: nova/compute/resource_tracker.py:111 nova/compute/resource_tracker.py:154
 #, python-format
 msgid "Memory overhead for %(flavor)d MB instance; %(overhead)d MB"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:279
+#: nova/compute/resource_tracker.py:280
 #, python-format
 msgid "Cannot get the metrics from %s."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:299
+#: nova/compute/resource_tracker.py:273
 msgid "Auditing locally available compute resources"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:304
+#: nova/compute/resource_tracker.py:278
 msgid ""
 "Virt driver does not support 'get_available_resource'  Compute tracking is "
 "disabled."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:379
+#: nova/compute/resource_tracker.py:351
 #, python-format
 msgid "Compute_service record created for %(host)s:%(node)s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:385
+#: nova/compute/resource_tracker.py:357
 #, python-format
 msgid "Compute_service record updated for %(host)s:%(node)s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:416
+#: nova/compute/resource_tracker.py:388
 #, python-format
 msgid "Hypervisor: free ram (MB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:417
+#: nova/compute/resource_tracker.py:389
 #, python-format
 msgid "Hypervisor: free disk (GB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:422
+#: nova/compute/resource_tracker.py:394
 #, python-format
 msgid "Hypervisor: free VCPUs: %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:424
+#: nova/compute/resource_tracker.py:396
 msgid "Hypervisor: VCPU information unavailable"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:428
+#: nova/compute/resource_tracker.py:400
 #, python-format
 msgid "Hypervisor: assignable PCI devices: %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:431
+#: nova/compute/resource_tracker.py:403
 msgid "Hypervisor: no assignable PCI devices"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:438
+#: nova/compute/resource_tracker.py:410
 #, python-format
 msgid "Free ram (MB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:439
+#: nova/compute/resource_tracker.py:411
 #, python-format
 msgid "Free disk (GB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:444
+#: nova/compute/resource_tracker.py:416
 #, python-format
 msgid "Free VCPUS: %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:446
+#: nova/compute/resource_tracker.py:418
 msgid "Free VCPU information unavailable"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:449
+#: nova/compute/resource_tracker.py:421
 #, python-format
 msgid "Free PCI devices: %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:485
+#: nova/compute/resource_tracker.py:457
 #, python-format
 msgid "Updating from migration %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:552
+#: nova/compute/resource_tracker.py:524
 msgid "Instance not resizing, skipping migration."
 msgstr ""
 
@@ -6037,14 +6120,14 @@
 msgid "Flavor could not be found, skipping migration."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:657
+#: nova/compute/resource_tracker.py:629
 #, python-format
 msgid ""
 "Detected running orphan instance: %(uuid)s (consuming %(memory_mb)s MB "
 "memory)"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:671
+#: nova/compute/resource_tracker.py:643
 #, python-format
 msgid "Missing keys: %s"
 msgstr ""
@@ -6068,42 +6151,42 @@
 msgid "Can't access image %(image_id)s: %(error)s"
 msgstr ""
 
-#: nova/compute/utils.py:336
+#: nova/compute/utils.py:337
 msgid ""
 "No aggregate id or name specified for this notification and it will be "
 "ignored"
 msgstr ""
 
-#: nova/compute/utils.py:357
+#: nova/compute/utils.py:355
 #, python-format
 msgid ""
 "No host name specified for the notification of HostAPI.%s and it will be "
 "ignored"
 msgstr ""
 
-#: nova/compute/monitors/__init__.py:149
+#: nova/compute/monitors/__init__.py:182
 #, python-format
 msgid ""
 "Excluding monitor %(monitor_name)s due to metric name overlap; overlapping "
 "metrics: %(overlap)s"
 msgstr ""
 
-#: nova/compute/monitors/__init__.py:157
+#: nova/compute/monitors/__init__.py:190
 #, python-format
 msgid "Monitor %(monitor_name)s cannot be used: %(ex)s"
 msgstr ""
 
-#: nova/compute/monitors/__init__.py:163
+#: nova/compute/monitors/__init__.py:196
 #, python-format
 msgid "The following monitors have been disabled: %s"
 msgstr ""
 
-#: nova/compute/monitors/virt/cpu_monitor.py:138
+#: nova/compute/monitors/virt/cpu_monitor.py:112
 #, python-format
 msgid "Not all properties needed are implemented in the compute driver: %s"
 msgstr ""
 
-#: nova/conductor/api.py:385
+#: nova/conductor/api.py:405
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -6114,29 +6197,29 @@
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:345
+#: nova/conductor/manager.py:339
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
-#: nova/conductor/manager.py:696
+#: nova/conductor/manager.py:662
 msgid "No valid host found for cold migrate"
 msgstr ""
 
-#: nova/conductor/manager.py:759
+#: nova/conductor/manager.py:763
 #, python-format
 msgid ""
 "Migration of instance %(instance_id)s to host %(dest)s unexpectedly failed."
 msgstr ""
 
-#: nova/conductor/manager.py:816 nova/conductor/manager.py:839
+#: nova/conductor/manager.py:783 nova/conductor/manager.py:793
 msgid "Unshelve attempted but vm_state not SHELVED or SHELVED_OFFLOADED"
 msgstr ""
 
-#: nova/conductor/manager.py:835
+#: nova/conductor/manager.py:843
 msgid "No valid host found for unshelve instance"
 msgstr ""
 
-#: nova/conductor/tasks/live_migrate.py:115
+#: nova/conductor/tasks/live_migrate.py:116
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6148,18 +6231,18 @@
 msgid "Skipping host: %(host)s because: %(e)s"
 msgstr ""
 
-#: nova/conductor/tasks/live_migrate.py:179
+#: nova/conductor/tasks/live_migrate.py:191
 #, python-format
 msgid ""
 "Exceeded max scheduling retries %(max_retries)d for instance "
 "%(instance_uuid)s during live migration"
 msgstr ""
 
-#: nova/console/manager.py:81 nova/console/vmrc_manager.py:64
+#: nova/console/manager.py:82 nova/console/vmrc_manager.py:64
 msgid "Adding console"
 msgstr ""
 
-#: nova/console/manager.py:99 nova/console/vmrc_manager.py:114
+#: nova/console/manager.py:102 nova/console/vmrc_manager.py:114
 #, python-format
 msgid "Tried to remove non-existent console %(console_id)s."
 msgstr ""
@@ -6215,84 +6298,88 @@
 msgid "Failed to run xvp."
 msgstr ""
 
-#: nova/consoleauth/manager.py:92
+#: nova/consoleauth/manager.py:93
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s"
 msgstr ""
 
-#: nova/consoleauth/manager.py:117
+#: nova/consoleauth/manager.py:118
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s"
 msgstr ""
 
-#: nova/db/api.py:627
+#: nova/db/api.py:598
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:712 nova/db/api.py:740
+#: nova/db/api.py:681 nova/db/api.py:709
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1638
+#: nova/db/api.py:1647
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1783
+#: nova/db/api.py:1792
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:170
+#: nova/db/sqlalchemy/api.py:166
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:211
+#: nova/db/sqlalchemy/api.py:201
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:224 nova/virt/baremetal/db/sqlalchemy/api.py:62
+#: nova/db/sqlalchemy/api.py:214 nova/virt/baremetal/db/sqlalchemy/api.py:62
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:783
+#: nova/db/sqlalchemy/api.py:767
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1004
+#: nova/db/sqlalchemy/api.py:808
+msgid "Failed to update usages bulk deallocating floating IP"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:988
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1296 nova/db/sqlalchemy/api.py:1336
+#: nova/db/sqlalchemy/api.py:1280 nova/db/sqlalchemy/api.py:1320
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1471
+#: nova/db/sqlalchemy/api.py:1455
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1564
+#: nova/db/sqlalchemy/api.py:1548
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be empty, "
 "\"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1723
+#: nova/db/sqlalchemy/api.py:1706
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1987
+#: nova/db/sqlalchemy/api.py:1967
 #, python-format
 msgid "Invalid field name: %s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:3145
+#: nova/db/sqlalchemy/api.py:3107
 #, python-format
 msgid ""
 "quota_usages out of sync, updating. project_id: %(project_id)s, user_id: "
@@ -6300,160 +6387,121 @@
 "usage: %(in_use)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:3233
+#: nova/db/sqlalchemy/api.py:3203
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4790
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must have "
 "been rebooted or crashed. Updating totals."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:5216
+#: nova/db/sqlalchemy/api.py:5147
 #, python-format
 msgid "Add metadata failed for aggregate %(id)s after %(retries)s retries"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:5598
+#: nova/db/sqlalchemy/api.py:5569
 #, python-format
 msgid "IntegrityError detected when archiving table %s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:41
-#: nova/virt/baremetal/db/sqlalchemy/migration.py:39
+#: nova/db/sqlalchemy/migration.py:70
+#: nova/virt/baremetal/db/sqlalchemy/migration.py:67
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:68
-#: nova/virt/baremetal/db/sqlalchemy/migration.py:67
+#: nova/db/sqlalchemy/migration.py:97
+#: nova/virt/baremetal/db/sqlalchemy/migration.py:95
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:96
-#: nova/openstack/common/db/sqlalchemy/utils.py:194
+#: nova/db/sqlalchemy/utils.py:78
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:102
-#: nova/openstack/common/db/sqlalchemy/utils.py:200
+#: nova/db/sqlalchemy/utils.py:84
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column %s "
 "It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:245
+#: nova/db/sqlalchemy/utils.py:227
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:261
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:285
+#: nova/db/sqlalchemy/utils.py:267
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:294
+#: nova/db/sqlalchemy/utils.py:276
 #, python-format
 msgid "Extra column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:316
+#: nova/db/sqlalchemy/utils.py:296
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:319
+#: nova/db/sqlalchemy/utils.py:299
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:342 nova/db/sqlalchemy/utils.py:346
-#: nova/db/sqlalchemy/migrate_repo/versions/180_havana.py:111
-#: nova/db/sqlalchemy/migrate_repo/versions/180_havana.py:1094
+#: nova/db/sqlalchemy/utils.py:321 nova/db/sqlalchemy/utils.py:325
+#: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:928
+#: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:59
 #: nova/db/sqlalchemy/migrate_repo/versions/193_cinder_cleanup.py:167
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:354
-#: nova/openstack/common/db/sqlalchemy/utils.py:301
+#: nova/db/sqlalchemy/utils.py:333
 msgid "Unsupported id columns type"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/180_havana.py:138
+#: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:63
 msgid "Exception while seeding instance_types table"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/186_new_bdm_format.py:187
-#, python-format
-msgid ""
-"Got an unexpected block device %s that cannot be converted to v2 format"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/200_add_transport_url_to_cell.py:141
-#, python-format
-msgid "Failed to downgrade cell %(name)s: %(error)s"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py:135
-msgid "project_user_quotas table not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py:143
-#, python-format
-msgid "%s table not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/213_add_pci_devices.py:72
-msgid "Exception while creating table 'pci_devices'."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/213_add_pci_devices.py:83
-msgid "Exception for adding pci stats to compute node."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/213_add_pci_devices.py:97
-msgid "Exception while dropping 'pci_devices' tables."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/213_add_pci_devices.py:107
-msgid "Exception for dropping pci stats from compute node."
-msgstr ""
-
-#: nova/image/glance.py:218
+#: nova/image/glance.py:217
 #, python-format
 msgid ""
 "Error contacting glance server '%(host)s:%(port)s' for '%(method)s', "
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:251
+#: nova/image/glance.py:250
 #, python-format
 msgid ""
 "When loading the module %(module_str)s the following error occurred: %(ex)s"
 msgstr ""
 
-#: nova/image/glance.py:324
+#: nova/image/glance.py:323
 #, python-format
 msgid "Failed to instantiate the download handler for %(scheme)s"
 msgstr ""
 
-#: nova/image/glance.py:340
+#: nova/image/glance.py:339
 #, python-format
 msgid "Successfully transferred using %s"
 msgstr ""
 
-#: nova/image/glance.py:576
+#: nova/image/glance.py:575
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -6509,10 +6557,10 @@
 "used."
 msgstr ""
 
-#: nova/image/download/file.py:32
+#: nova/image/download/file.py:30
 msgid ""
-"A list of filesystems that will be configured in this file under the "
-"sections image_file_url:<list entry name>"
+"List of file systems that are configured in this file in the "
+"image_file_url:<list entry name> sections"
 msgstr ""
 
 #: nova/image/download/file.py:79
@@ -6564,17 +6612,17 @@
 msgid "Copied %(source_file)s using %(module_str)s"
 msgstr ""
 
-#: nova/ipv6/account_identifier.py:41 nova/ipv6/rfc2462.py:36
+#: nova/ipv6/account_identifier.py:40 nova/ipv6/rfc2462.py:36
 #, python-format
 msgid "Bad mac for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/ipv6/account_identifier.py:43 nova/ipv6/rfc2462.py:38
+#: nova/ipv6/account_identifier.py:42 nova/ipv6/rfc2462.py:38
 #, python-format
 msgid "Bad prefix for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/ipv6/account_identifier.py:45
+#: nova/ipv6/account_identifier.py:44
 #, python-format
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
@@ -6598,20 +6646,20 @@
 msgid "Not deleting key %s"
 msgstr ""
 
-#: nova/network/api.py:58
+#: nova/network/api.py:57
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:72
+#: nova/network/api.py:70
 #, python-format
 msgid "Updating cache with info: %s"
 msgstr ""
 
-#: nova/network/api.py:86
+#: nova/network/api.py:83
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:249 nova/network/neutronv2/api.py:661
+#: nova/network/api.py:244 nova/network/neutronv2/api.py:648
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -6734,115 +6782,115 @@
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:226
+#: nova/network/linux_net.py:221
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:262
+#: nova/network/linux_net.py:257
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:269
+#: nova/network/linux_net.py:264
 msgid "Skipping duplicate iptables rule addition"
 msgstr ""
 
-#: nova/network/linux_net.py:293
+#: nova/network/linux_net.py:288
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r %(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:428
+#: nova/network/linux_net.py:423
 msgid "Skipping apply due to lack of new rules"
 msgstr ""
 
-#: nova/network/linux_net.py:456
+#: nova/network/linux_net.py:451
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:711
+#: nova/network/linux_net.py:706
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:761
+#: nova/network/linux_net.py:756
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:809
+#: nova/network/linux_net.py:804
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1011
+#: nova/network/linux_net.py:1006
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1056
+#: nova/network/linux_net.py:1051
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1058
+#: nova/network/linux_net.py:1053
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1138
+#: nova/network/linux_net.py:1133
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1140
+#: nova/network/linux_net.py:1135
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1301
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1338
+#: nova/network/linux_net.py:1323
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1341
+#: nova/network/linux_net.py:1326
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1444
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1505
+#: nova/network/linux_net.py:1490
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1517
+#: nova/network/linux_net.py:1502
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1555
+#: nova/network/linux_net.py:1540
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1789
+#: nova/network/linux_net.py:1777
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1797
+#: nova/network/linux_net.py:1785
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -6869,116 +6917,117 @@
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:810
+#: nova/network/manager.py:805
 #, python-format
 msgid "instance-dns-zone not found |%s|."
 msgstr ""
 
-#: nova/network/manager.py:817
+#: nova/network/manager.py:812
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone |%(zone)s|. "
 "Instance is in zone |%(zone2)s|. No DNS record will be created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:837
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:902
+#: nova/network/manager.py:897
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:928
+#: nova/network/manager.py:923
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:967
+#: nova/network/manager.py:962
 #, python-format
 msgid "Leased IP |%s|"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:966
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:980
+#: nova/network/manager.py:975
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:985
+#: nova/network/manager.py:980
 #, python-format
 msgid "Released IP |%s|"
 msgstr ""
 
-#: nova/network/manager.py:989
+#: nova/network/manager.py:984
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:988
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1012
+#: nova/network/manager.py:1007
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1036
+#: nova/network/manager.py:1031
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1056
+#: nova/network/manager.py:1051
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify network_size "
 "flag."
 msgstr ""
 
-#: nova/network/manager.py:1139
+#: nova/network/manager.py:1134
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1142
+#: nova/network/manager.py:1137
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1153
+#: nova/network/manager.py:1148
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr (%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1219
-msgid "Network already exists!"
-msgstr ""
-
-#: nova/network/manager.py:1238
+#: nova/network/manager.py:1233
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1837
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be greater "
 "than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1844
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
 "Network size is %(network_size)s"
 msgstr ""
 
+#: nova/network/manager.py:1898
+#, python-format
+msgid "Remove unused gateway %s"
+msgstr ""
+
 #: nova/network/minidns.py:49
 #, python-format
 msgid "minidns file is |%s|"
@@ -7007,172 +7056,210 @@
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:82
+#: nova/network/model.py:80
 #, python-format
 msgid "Invalid IP format %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:171
+#: nova/network/neutronv2/api.py:183
 #, python-format
 msgid "Successfully created port: %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:175
+#: nova/network/neutronv2/api.py:177
+msgid "Neutron error: quota exceeded"
+msgstr ""
+
+#: nova/network/neutronv2/api.py:187
 #, python-format
 msgid "Neutron error creating port on network %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:210
+#: nova/network/neutronv2/api.py:224
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:213
+#: nova/network/neutronv2/api.py:227
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:248
+#: nova/network/neutronv2/api.py:265
 msgid "No network configured!"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:267
+#: nova/network/neutronv2/api.py:284
 #, python-format
 msgid ""
 "Multiple security groups found matching '%s'. Use an ID to be more specific."
 msgstr ""
 
-#: nova/network/neutronv2/api.py:333
+#: nova/network/neutronv2/api.py:350
 #, python-format
 msgid "Failed to update port %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:340
+#: nova/network/neutronv2/api.py:357
 #, python-format
 msgid "Failed to delete port %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:386
+#: nova/network/neutronv2/api.py:402
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:400
+#: nova/network/neutronv2/api.py:404
 #, python-format
-msgid "Failed to delete neutron port %(portid)s"
+msgid "Port %s does not exist"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:417
+#: nova/network/neutronv2/api.py:438
 #, python-format
 msgid "Failed to delete neutron port %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:445
+#: nova/network/neutronv2/api.py:461
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:475
+#: nova/network/neutronv2/api.py:493
 #, python-format
 msgid ""
 "Unable to update port %(portid)s on subnet %(subnet_id)s with failure: "
 "%(exception)s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:504
+#: nova/network/neutronv2/api.py:523
 #, python-format
 msgid "Unable to update port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:518
+#: nova/network/neutronv2/api.py:533
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:531
+#: nova/network/neutronv2/api.py:542
 msgid ""
 "Multiple possible networks found, use a Network ID to be more specific."
 msgstr ""
 
-#: nova/network/neutronv2/api.py:825
+#: nova/network/neutronv2/api.py:556
+#, python-format
+msgid "Failed to access port %s"
+msgstr ""
+
+#: nova/network/neutronv2/api.py:747
+#, python-format
+msgid "Unable to access floating IP %s"
+msgstr ""
+
+#: nova/network/neutronv2/api.py:810
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:921
+#: nova/network/neutronv2/api.py:875
+#, python-format
+msgid "Unable to access floating IP %(fixed_ip)s for port %(port_id)"
+msgstr ""
+
+#: nova/network/neutronv2/api.py:906
 #, python-format
 msgid "Unable to update host of port %s"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:64
+#: nova/network/neutronv2/api.py:970
+#, python-format
+msgid ""
+"Network %(id)s not matched with the tenants network! The ports tenant "
+"%(tenant_id)s will be used."
+msgstr ""
+
+#: nova/network/security_group/neutron_driver.py:58
 #, python-format
 msgid "Neutron Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:85
+#: nova/network/security_group/neutron_driver.py:79
 #, python-format
 msgid "Neutron Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:141
+#: nova/network/security_group/neutron_driver.py:133
 #, python-format
 msgid "Neutron security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:144
-#: nova/network/security_group/neutron_driver.py:191
-#: nova/network/security_group/neutron_driver.py:286
+#: nova/network/security_group/neutron_driver.py:136
+#: nova/network/security_group/neutron_driver.py:183
+#: nova/network/security_group/neutron_driver.py:278
 #, python-format
 msgid "Neutron Error: %s"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:165
+#: nova/network/security_group/neutron_driver.py:157
 msgid "Neutron Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:174
+#: nova/network/security_group/neutron_driver.py:166
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:211
+#: nova/network/security_group/neutron_driver.py:203
 #, python-format
 msgid "Neutron Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:215
+#: nova/network/security_group/neutron_driver.py:207
 #, python-format
 msgid "Neutron Error adding rules to security group %s"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:219
-#: nova/network/security_group/neutron_driver.py:413
-#: nova/network/security_group/neutron_driver.py:420
-#: nova/network/security_group/neutron_driver.py:446
-#: nova/network/security_group/neutron_driver.py:462
-#: nova/network/security_group/neutron_driver.py:469
-#: nova/network/security_group/neutron_driver.py:498
+#: nova/network/security_group/neutron_driver.py:211
+#: nova/network/security_group/neutron_driver.py:374
+#: nova/network/security_group/neutron_driver.py:381
+#: nova/network/security_group/neutron_driver.py:407
+#: nova/network/security_group/neutron_driver.py:423
+#: nova/network/security_group/neutron_driver.py:430
+#: nova/network/security_group/neutron_driver.py:459
 msgid "Neutron Error:"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:273
+#: nova/network/security_group/neutron_driver.py:265
 #, python-format
 msgid "Neutron Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:283
+#: nova/network/security_group/neutron_driver.py:275
 #, python-format
 msgid "Neutron security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:429
+#: nova/network/security_group/neutron_driver.py:405
+#: nova/network/security_group/neutron_driver.py:456
+#, python-format
+msgid "Security group %(name)s is not found for project %(project)s"
+msgstr ""
+
+#: nova/network/security_group/neutron_driver.py:421
+#: nova/network/security_group/neutron_driver.py:472
+#, python-format
+msgid "instance_id %s could not be found as device id on any ports"
+msgstr ""
+
+#: nova/network/security_group/neutron_driver.py:390
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:439
-#: nova/network/security_group/neutron_driver.py:490
+#: nova/network/security_group/neutron_driver.py:400
+#: nova/network/security_group/neutron_driver.py:451
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
@@ -7180,7 +7267,7 @@
 #: nova/network/security_group/neutron_driver.py:500
 #, python-format
 msgid ""
-"Security group %(security_group_name)s not assocaited with the instance "
+"Security group %(security_group_name)s not associated with the instance "
 "%(instance)s"
 msgstr ""
 
@@ -7189,26 +7276,31 @@
 msgid "This rule already exists in group %s"
 msgstr ""
 
-#: nova/objects/base.py:73
+#: nova/objects/base.py:69
 #, python-format
 msgid "Error setting %(attr)s"
 msgstr ""
 
-#: nova/objects/base.py:200
+#: nova/objects/base.py:212
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:316
+#: nova/objects/base.py:311
 #, python-format
 msgid "Cannot load '%s' in the base class"
 msgstr ""
 
-#: nova/objects/base.py:356
+#: nova/objects/base.py:351
 #, python-format
 msgid "%(objname)s object has no attribute '%(attrname)s'"
 msgstr ""
 
+#: nova/objects/instance.py:477
+#, python-format
+msgid "Lazy-loading `%(attr)s' on %(name)s uuid %(uuid)s"
+msgstr ""
+
 #: nova/objects/fields.py:30
 #, python-format
 msgid "Key %(key)s must be of type %(expected)s not %(actual)s"
@@ -7234,83 +7326,62 @@
 msgstr ""
 
 #: nova/objects/fields.py:286 nova/objects/fields.py:295
-#: nova/objects/fields.py:410
 #, python-format
 msgid "Network \"%s\" is not valid"
 msgstr ""
 
-#: nova/objects/fields.py:307
+#: nova/objects/fields.py:334
 msgid "A list is required here"
 msgstr ""
 
-#: nova/objects/fields.py:323
+#: nova/objects/fields.py:350
 msgid "A dict is required here"
 msgstr ""
 
-#: nova/objects/fields.py:362
+#: nova/objects/fields.py:389
 #, python-format
 msgid "An object of type %s is required here"
 msgstr ""
 
-#: nova/objects/fields.py:389
+#: nova/objects/fields.py:416
 msgid "A NetworkModel is required here"
 msgstr ""
 
-#: nova/objects/fields.py:406
-#, python-format
-msgid "CIDR \"%s\" is not in proper form"
-msgstr ""
-
-#: nova/objects/fields.py:415
-#, python-format
-msgid "Netmask length \"%s\" is not valid"
-msgstr ""
-
-#: nova/objects/fields.py:418
-#, python-format
-msgid "Netmask length \"%(length)s\" is not valid for IPv%(version)i address"
-msgstr ""
-
-#: nova/objects/instance.py:421
+#: nova/objects/instance.py:422
 #, python-format
 msgid "No save handler for %s"
 msgstr ""
 
-#: nova/objects/instance.py:490
-#, python-format
-msgid "Lazy-loading `%(attr)s' on %(name)s uuid %(uuid)s"
-msgstr ""
-
-#: nova/objects/instance_info_cache.py:82
+#: nova/objects/instance_info_cache.py:85
 msgid "Failed to notify cells of instance info cache update"
 msgstr ""
 
-#: nova/objects/service.py:76
+#: nova/objects/service.py:73
 #, python-format
 msgid "Lazy-loading `%(attr)s' on %(name)s id %(id)s"
 msgstr ""
 
-#: nova/objects/utils.py:61 nova/objects/utils.py:75
+#: nova/objects/utils.py:59 nova/objects/utils.py:73
 msgid "None is not valid here"
 msgstr ""
 
-#: nova/objects/utils.py:112
+#: nova/objects/utils.py:110
 msgid "A list of strings is required here"
 msgstr ""
 
-#: nova/objects/utils.py:114
+#: nova/objects/utils.py:112
 msgid "Invalid values found in list (strings are required)"
 msgstr ""
 
-#: nova/objects/utils.py:126
+#: nova/objects/utils.py:124
 msgid "A dict of strings is required here"
 msgstr ""
 
-#: nova/objects/utils.py:128
+#: nova/objects/utils.py:126
 msgid "Invalid keys found in dict (strings are required)"
 msgstr ""
 
-#: nova/objects/utils.py:131
+#: nova/objects/utils.py:129
 msgid "Invalid values found in dict (strings are required)"
 msgstr ""
 
@@ -7324,71 +7395,81 @@
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/excutils.py:91
+#: nova/openstack/common/excutils.py:90
 #, python-format
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr ""
 
-#: nova/openstack/common/imageutils.py:96
+#: nova/openstack/common/gettextutils.py:263
+msgid "Message objects do not support addition."
+msgstr ""
+
+#: nova/openstack/common/gettextutils.py:272
+msgid ""
+"Message objects do not support str() because they may contain non-ascii "
+"characters. Please use unicode() or translate() instead."
+msgstr ""
+
+#: nova/virt/images.py:115
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:103
+#: nova/openstack/common/lockutils.py:100
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:168
+#: nova/openstack/common/lockutils.py:166
 #, python-format
 msgid "Got semaphore \"%(lock)s\""
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:177
+#: nova/openstack/common/lockutils.py:175
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\""
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:187
+#: nova/openstack/common/lockutils.py:185
 #, python-format
 msgid "Created lock path: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:205
+#: nova/openstack/common/lockutils.py:203
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:209
+#: nova/openstack/common/lockutils.py:207
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:247
+#: nova/openstack/common/lockutils.py:244
 #, python-format
 msgid "Got semaphore / lock \"%(function)s\""
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:251
+#: nova/openstack/common/lockutils.py:248
 #, python-format
 msgid "Semaphore / lock released \"%(function)s\""
 msgstr ""
 
-#: nova/openstack/common/log.py:303
+#: nova/openstack/common/log.py:245
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:402
+#: nova/openstack/common/log.py:337
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:453
+#: nova/openstack/common/log.py:387
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:623
+#: nova/openstack/common/log.py:557
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -7411,27 +7492,27 @@
 msgid "in dynamic looping call"
 msgstr ""
 
-#: nova/openstack/common/periodic_task.py:43
+#: nova/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: nova/openstack/common/periodic_task.py:134
+#: nova/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: nova/openstack/common/periodic_task.py:139
+#: nova/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: nova/openstack/common/periodic_task.py:177
+#: nova/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: nova/openstack/common/periodic_task.py:186
+#: nova/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
@@ -7451,18 +7532,41 @@
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
+#: nova/openstack/common/processutils.py:58
+msgid "Unexpected error while running command."
+msgstr "Hindi inaasahang pagkakamali habang pinatatakbo ang utos."
+
+#: nova/openstack/common/processutils.py:61
+#, python-format
+msgid ""
+"%(description)s\n"
+"Command: %(cmd)s\n"
+"Exit code: %(exit_code)s\n"
+"Stdout: %(stdout)r\n"
+"Stderr: %(stderr)r"
+msgstr ""
+"%(description)s\n"
+"Command: %(cmd)s\n"
+"Exit code: %(exit_code)s\n"
+"Stdout: %(stdout)r\n"
+"Stderr: %(stderr)r"
+
 #: nova/openstack/common/processutils.py:132
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
+#: nova/openstack/common/processutils.py:145
+msgid "Command requested root, but did not specify a root helper."
+msgstr ""
+
 #: nova/openstack/common/processutils.py:147
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: nova/openstack/common/processutils.py:172
-#: nova/openstack/common/processutils.py:244
+#: nova/openstack/common/processutils.py:244 nova/virt/powervm/common.py:118
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -7485,11 +7589,11 @@
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/openstack/common/service.py:166 nova/openstack/common/service.py:378
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: nova/openstack/common/service.py:175 nova/openstack/common/service.py:263
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
@@ -7498,49 +7602,49 @@
 msgid "Exception during rpc cleanup."
 msgstr ""
 
-#: nova/openstack/common/service.py:232
+#: nova/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: nova/openstack/common/service.py:269
+#: nova/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: nova/openstack/common/service.py:302
+#: nova/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: nova/openstack/common/service.py:321
+#: nova/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: nova/openstack/common/service.py:331
+#: nova/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: nova/openstack/common/service.py:348
+#: nova/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: nova/openstack/common/service.py:352
+#: nova/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: nova/openstack/common/service.py:356
+#: nova/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: nova/openstack/common/service.py:386
+#: nova/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: nova/openstack/common/service.py:404
+#: nova/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -7565,493 +7669,73 @@
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/openstack/common/db/sqlalchemy/session.py:542
-msgid "DB exception wrapped."
-msgstr "DB exception wrapped."
-
-#: nova/openstack/common/db/sqlalchemy/session.py:604
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: nova/openstack/common/db/sqlalchemy/session.py:685
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: nova/openstack/common/db/sqlalchemy/utils.py:97
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: nova/openstack/common/db/sqlalchemy/utils.py:119
-msgid "Unknown sort direction, must be 'desc' or 'asc'"
-msgstr ""
-
-#: nova/openstack/common/db/sqlalchemy/utils.py:280
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: nova/openstack/common/middleware/notifier.py:40
-#, python-format
-msgid "An exception occurred processing the API call: %s "
-msgstr ""
-
-#: nova/openstack/common/notifier/api.py:129
-#, python-format
-msgid "%s not in valid priorities"
-msgstr ""
-
-#: nova/openstack/common/notifier/api.py:145
-#, python-format
-msgid ""
-"Problem '%(e)s' attempting to send to notification system. "
-"Payload=%(payload)s"
-msgstr ""
-
-#: nova/openstack/common/notifier/api.py:164
-#, python-format
-msgid "Failed to load notifier %s. These notifications will not be sent."
-msgstr ""
-
-#: nova/openstack/common/notifier/rabbit_notifier.py:27
-msgid ""
-"The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
-msgstr ""
-
-#: nova/openstack/common/notifier/rpc_notifier.py:45
-#: nova/openstack/common/notifier/rpc_notifier2.py:51
-#, python-format
-msgid "Could not send notification to %(topic)s. Payload=%(message)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/__init__.py:105
-#, python-format
-msgid ""
-"A RPC is being made while holding a lock. The locks currently held are "
-"%(locks)s. This is probably a bug. Please report it. Include the following: "
-"[%(stack)s]."
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:75
-msgid "Pool creating new connection"
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:202
-#, python-format
-msgid ""
-"No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:205
-#, python-format
-msgid "_call_waiters: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:212
-#, python-format
-msgid ""
-"Number of call waiters is greater than warning threshhold: %d. There could "
-"be a MulticallProxyWaiter leak."
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:290
-#, python-format
-msgid "unpacked context: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:341
-#, python-format
-msgid "UNIQUE_ID is %s."
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:434
-#, python-format
-msgid "received %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:442
-#, python-format
-msgid "no method for message: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:443
-#, python-format
-msgid "No method for message: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:471
-#: nova/openstack/common/rpc/impl_zmq.py:280
-#, python-format
-msgid "Expected exception during message handling (%s)"
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:479
-#: nova/openstack/common/rpc/impl_zmq.py:286
-msgid "Exception during message handling"
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:553
-#, python-format
-msgid "Making synchronous call on %s ..."
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:556
-#, python-format
-msgid "MSG_ID is %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:582
-#, python-format
-msgid "Making asynchronous cast on %s..."
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:591
-msgid "Making asynchronous fanout cast..."
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:619
-#, python-format
-msgid "Sending %(event_type)s on %(topic)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:77
-msgid "An unknown RPC related exception occurred."
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:107
-#, python-format
-msgid ""
-"Remote error: %(exc_type)s %(value)s\n"
-"%(traceback)s."
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:124
+#: nova/openstack/common/db/sqlalchemy/migration.py:214
 #, python-format
 msgid ""
-"Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method: "
-"\"%(method)s\" info: \"%(info)s\""
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:141
-#: nova/openstack/common/rpc/common.py:142
-#: nova/openstack/common/rpc/common.py:143
-msgid "<unknown>"
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:147
-#, python-format
-msgid "Found duplicate message(%(msg_id)s). Skipping it."
+"Tables \"%s\" have non utf8 collation, please make sure all tables are "
+"CHARSET=utf8"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:155
-#, python-format
-msgid "Specified RPC version, %(version)s, not supported by this endpoint."
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:160
-#, python-format
+#: nova/openstack/common/db/sqlalchemy/migration.py:238
 msgid ""
-"Specified RPC envelope version, %(version)s, not supported by this endpoint."
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:165
-#, python-format
-msgid "Specified RPC version cap, %(version_cap)s, is too low"
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:289
-#, python-format
-msgid "Returning exception %s to caller"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_kombu.py:157
-msgid "Failed to process message ... skipping it."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_kombu.py:161
-msgid "Failed to process message ... will requeue."
+"The database is not under version control, but has tables. Please stamp the "
+"current version of the schema manually."
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_kombu.py:496
-#, python-format
-msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_kombu.py:518
-#, python-format
-msgid "Connected to AMQP server on %(hostname)s:%(port)d"
-msgstr ""
+#: nova/openstack/common/db/sqlalchemy/session.py:542
+msgid "DB exception wrapped."
+msgstr "DB exception wrapped."
 
-#: nova/openstack/common/rpc/impl_kombu.py:555
+#: nova/openstack/common/db/sqlalchemy/session.py:684
 #, python-format
-msgid ""
-"Unable to connect to AMQP server on %(hostname)s:%(port)d after "
-"%(max_retries)d tries: %(err_str)s"
+msgid "Database server has gone away: %s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_kombu.py:569
-#, python-format
+#: nova/openstack/common/db/sqlalchemy/session.py:764
 msgid ""
-"AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
-"again in %(sleep_time)d seconds."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_kombu.py:623
-#: nova/openstack/common/rpc/impl_qpid.py:574
-#, python-format
-msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_kombu.py:641
-#: nova/openstack/common/rpc/impl_qpid.py:589
-#, python-format
-msgid "Timed out waiting for RPC response: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_kombu.py:645
-#: nova/openstack/common/rpc/impl_qpid.py:593
-#, python-format
-msgid "Failed to consume message from queue: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_kombu.py:684
-#: nova/openstack/common/rpc/impl_qpid.py:628
-#, python-format
-msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_qpid.py:88
-#, python-format
-msgid "Invalid value for qpid_topology_version: %d"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_qpid.py:192
-msgid "Failed to process message... skipping it."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_qpid.py:516
-#, python-format
-msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_qpid.py:522
-#, python-format
-msgid "Connected to AMQP server on %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_qpid.py:535
-msgid "Re-established AMQP queues"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_qpid.py:601
-msgid "Error processing message.  Skipping it."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:96
-msgid "JSON serialization failed."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:101
-#, python-format
-msgid "Deserializing: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:136
-#, python-format
-msgid "Connecting to %(addr)s with %(type)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:137
-#, python-format
-msgid "-> Subscribed to %(subscribe)s"
+"This application has not enabled MySQL traditional mode, which means silent "
+"data corruption may occur. Please encourage the application developers to "
+"enable this mode."
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:138
+#: nova/openstack/common/db/sqlalchemy/session.py:684
 #, python-format
-msgid "-> bind: %(bind)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:146
-msgid "Could not open socket."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:158
-#, python-format
-msgid "Subscribing to %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:200
-msgid "You cannot recv on this socket."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:205
-msgid "You cannot send on this socket."
+msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:267
+#: nova/openstack/common/db/sqlalchemy/test_migrations.py:63
 #, python-format
-msgid "Running func with context: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:305
-msgid "Sending reply"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:339
-msgid "RPC message did not include method."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:371
-msgid "Registering reactor"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:383
-msgid "In reactor registered"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:388
-msgid "Consuming socket"
+msgid "Got lock \"%s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:438
+#: nova/openstack/common/db/sqlalchemy/test_migrations.py:66
 #, python-format
-msgid "Creating proxy for topic: %s"
+msgid "Lock released \"%s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:444
-msgid "Topic contained dangerous characters."
+#: nova/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:476
-msgid "Topic socket file creation failed."
+#: nova/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:482
+#: nova/openstack/common/db/sqlalchemy/utils.py:279
 #, python-format
-msgid ""
-"Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:498
+#: nova/openstack/common/middleware/notifier.py:40
 #, python-format
-msgid "Required IPC directory does not exist at %s"
+msgid "An exception occurred processing the API call: %s "
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:507
+#: nova/pci/pci_manager.py:154
 #, python-format
-msgid "Permission denied to IPC directory at %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:510
 msgid ""
-"Could not create ZeroMQ receiver daemon. Socket may already be in use."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:544
-#, python-format
-msgid "CONSUMER RECEIVED DATA: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:563
-msgid "ZMQ Envelope version unsupported or unknown."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:591
-msgid "Skipping topic registration. Already registered."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:598
-#, python-format
-msgid "Consumer is a zmq.%s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:650
-msgid "Creating payload"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:663
-msgid "Creating queue socket for reply waiter"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:676
-msgid "Sending cast"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:679
-msgid "Cast sent; Waiting reply"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:682
-#, python-format
-msgid "Received message: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:683
-msgid "Unpacking response"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:692
-msgid "Unsupported or unknown ZMQ envelope returned."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:699
-msgid "RPC Message Invalid."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:722
-#, python-format
-msgid "%(msg)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:725
-#, python-format
-msgid "Sending message(s) to: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:729
-msgid "No matchmaker results. Not casting."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:732
-msgid "No match from matchmaker."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:814
-#, python-format
-msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
-msgstr ""
-
-#: nova/openstack/common/rpc/matchmaker.py:47
-msgid "Match not found by MatchMaker."
-msgstr ""
-
-#: nova/openstack/common/rpc/matchmaker.py:81
-msgid "Matchmaker does not implement registration or heartbeat."
-msgstr ""
-
-#: nova/openstack/common/rpc/matchmaker.py:217
-#, python-format
-msgid "Matchmaker unregistered: %(key)s, %(host)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/matchmaker.py:229
-msgid "Register before starting heartbeat."
-msgstr ""
-
-#: nova/openstack/common/rpc/matchmaker_ring.py:77
-#: nova/openstack/common/rpc/matchmaker_ring.py:95
-#, python-format
-msgid "No key defining hosts for topic '%s', see ringfile"
-msgstr ""
-
-#: nova/pci/pci_manager.py:156
-#, python-format
-msgid "Trying to remove device with %(status)sownership %(instance_uuid)s"
+"Trying to remove device with %(status)s ownership %(instance_uuid)s because "
+"of %(pci_exception)s"
 msgstr ""
 
 #: nova/scheduler/chance.py:57
@@ -8062,27 +7746,23 @@
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:62
+#: nova/scheduler/driver.py:58
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:64 nova/scheduler/utils.py:81
+#: nova/scheduler/driver.py:60 nova/scheduler/utils.py:77
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:137
+#: nova/scheduler/driver.py:134
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:146
+#: nova/scheduler/driver.py:143
 msgid "Driver must implement select_destinations"
 msgstr ""
 
-#: nova/scheduler/driver.py:151
-msgid "Driver must implement select_hosts"
-msgstr ""
-
 #: nova/scheduler/filter_scheduler.py:78
 #, python-format
 msgid ""
@@ -8129,53 +7809,50 @@
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:176
+#: nova/scheduler/host_manager.py:177
 #, python-format
 msgid "Metric name unknown of %r"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:367
+#: nova/scheduler/host_manager.py:192
+#, python-format
+msgid ""
+"Host has more disk space than database expected (%(physical)sgb > "
+"%(database)sgb)"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:337
 #, python-format
 msgid "Host filter ignoring hosts: %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:379
+#: nova/scheduler/host_manager.py:349
 #, python-format
 msgid "Host filter forcing available hosts to %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:382
+#: nova/scheduler/host_manager.py:352
 #, python-format
 msgid "No hosts matched due to not matching 'force_hosts' value of '%s'"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:395
+#: nova/scheduler/host_manager.py:365
 #, python-format
 msgid "Host filter forcing available nodes to %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:398
+#: nova/scheduler/host_manager.py:368
 #, python-format
 msgid "No nodes matched due to not matching 'force_nodes' value of '%s'"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:438
-#, python-format
-msgid "Ignoring %(service_name)s service update from %(host)s"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:444
-#, python-format
-msgid "Received %(service_name)s service update from %(state_key)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:464
+#: nova/scheduler/host_manager.py:434
 #: nova/scheduler/filters/trusted_filter.py:212
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:486
+#: nova/scheduler/host_manager.py:456
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
@@ -8190,19 +7867,31 @@
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/utils.py:63
+#: nova/scheduler/utils.py:59
 #, python-format
 msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/filters/affinity_filter.py:109
+#: nova/scheduler/utils.py:165
+#, python-format
+msgid "Ignoring the invalid elements of the option %(name)s: %(options)s"
+msgstr ""
+
+#: nova/scheduler/filters/affinity_filter.py:108
 #, python-format
 msgid "Group anti affinity: check if %(host)s not in %(configured)s"
 msgstr ""
 
-#: nova/scheduler/filters/affinity_filter.py:125
+#: nova/scheduler/filters/affinity_filter.py:124
+#, python-format
+msgid "Group affinity: check if %(host)s in %(configured)s"
+msgstr ""
+
+#: nova/scheduler/filters/aggregate_image_properties_isolation.py:61
 #, python-format
-msgid "Group affinity: check if %(host)s in %(configured)s"
+msgid ""
+"%(host_state)s fails image aggregate properties requirements. Property "
+"%(prop)s does not match %(options)s."
 msgstr ""
 
 #: nova/scheduler/filters/aggregate_instance_extra_specs.py:59
@@ -8241,7 +7930,7 @@
 
 #: nova/scheduler/filters/compute_filter.py:47
 #, python-format
-msgid "%(host_state)s has not been heard from in a  while"
+msgid "%(host_state)s has not been heard from in a while"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:51
@@ -8260,28 +7949,28 @@
 msgid "Could not decode cpu_allocation_ratio: '%s'"
 msgstr ""
 
-#: nova/scheduler/filters/disk_filter.py:49
+#: nova/scheduler/filters/disk_filter.py:48
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_disk)s MB usable disk, it only has "
 "%(usable_disk_mb)s MB usable disk."
 msgstr ""
 
-#: nova/scheduler/filters/image_props_filter.py:56
+#: nova/scheduler/filters/image_props_filter.py:53
 #, python-format
 msgid ""
 "Instance contains properties %(image_props)s, but no corresponding "
 "supported_instances are advertised by the compute node"
 msgstr ""
 
-#: nova/scheduler/filters/image_props_filter.py:80
+#: nova/scheduler/filters/image_props_filter.py:82
 #, python-format
 msgid ""
 "Instance properties %(image_props)s are satisfied by compute host hypervisor "
 "version %(hypervisor_version)s and supported instances %(supp_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/image_props_filter.py:89
+#: nova/scheduler/filters/image_props_filter.py:91
 #, python-format
 msgid ""
 "Instance contains properties %(image_props)s that are not provided by the "
@@ -8289,7 +7978,7 @@
 "%(hypervisor_version)s do not match"
 msgstr ""
 
-#: nova/scheduler/filters/image_props_filter.py:109
+#: nova/scheduler/filters/image_props_filter.py:91
 #, python-format
 msgid "%(host_state)s does not support requested instance_properties"
 msgstr ""
@@ -8300,6 +7989,11 @@
 "%(host_state)s fails I/O ops check: Max IOs per host is set to %(max_io_ops)s"
 msgstr ""
 
+#: nova/scheduler/filters/metrics_filter.py:50
+#, python-format
+msgid "%(host_state)s does not have the following metrics: %(metrics)s"
+msgstr ""
+
 #: nova/scheduler/filters/num_instances_filter.py:40
 #, python-format
 msgid ""
@@ -8324,11 +8018,6 @@
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/weights/metrics.py:75
-#, python-format
-msgid "Ignoring the invalid elements of metrics_weight_setting: %s"
-msgstr ""
-
 #: nova/servicegroup/api.py:61
 #, python-format
 msgid "ServiceGroup driver defined as an instance of %s"
@@ -8339,6 +8028,14 @@
 msgid "unknown ServiceGroup driver name: %s"
 msgstr ""
 
+#: nova/servicegroup/api.py:85
+#, python-format
+msgid ""
+"Report interval must be less than service down time. Current config: "
+"<service_down_time: %(service_down_time)s, report_interval: "
+"%(report_interval)s>. Setting service_down_time to: %(new_service_down_time)s"
+msgstr ""
+
 #: nova/servicegroup/api.py:84
 #, python-format
 msgid ""
@@ -8460,22 +8157,22 @@
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_processutils.py:73
+#: nova/tests/fake_processutils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_processutils.py:81
+#: nova/tests/fake_processutils.py:80
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_processutils.py:97
+#: nova/tests/fake_processutils.py:96
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_processutils.py:100
+#: nova/tests/fake_processutils.py:99
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
@@ -8496,76 +8193,80 @@
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/api/test_auth.py:88
+#: nova/tests/api/test_auth.py:85
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3111
-#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2327
+#: nova/tests/api/openstack/compute/test_servers.py:3000
+#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2249
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3116
-#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2332
+#: nova/tests/api/openstack/compute/test_servers.py:3005
+#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2254
 msgid ""
 "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3121
-#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2337
+#: nova/tests/api/openstack/compute/test_servers.py:3010
+#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2259
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1503
-#: nova/tests/compute/test_compute.py:1530
+#: nova/tests/compute/test_compute.py:1441
+#: nova/tests/compute/test_compute.py:1466
+#: nova/tests/compute/test_compute.py:1523
+#: nova/tests/compute/test_compute.py:1548
 #: nova/tests/compute/test_compute.py:1591
-#: nova/tests/compute/test_compute.py:1618
-#: nova/tests/compute/test_compute.py:1665
-#: nova/tests/compute/test_compute.py:4986
+#: nova/tests/compute/test_compute.py:4728
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1510
-#: nova/tests/compute/test_compute.py:1560
-#: nova/tests/compute/test_compute.py:1607
-#: nova/tests/compute/test_compute.py:1633
+#: nova/tests/compute/test_compute.py:1447
+#: nova/tests/compute/test_compute.py:1495
+#: nova/tests/compute/test_compute.py:1538
+#: nova/tests/compute/test_compute.py:1562
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2436
+#: nova/tests/compute/test_compute.py:2289
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4997
+#: nova/tests/compute/test_compute.py:4739
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:5578
+#: nova/tests/compute/test_compute.py:5283
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9718
+#: nova/tests/compute/test_compute.py:9384
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:2594
+#: nova/exception.py:264 nova/tests/compute/test_keypairs.py:103
+msgid "Keypair data is invalid"
+msgstr "Ang Keypair data ay hindi wasto"
+
+#: nova/tests/db/test_migrations.py:3273
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/api_samples_test_base.py:117
+#: nova/tests/integrated/api_samples_test_base.py:116
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/api_samples_test_base.py:131
+#: nova/tests/integrated/api_samples_test_base.py:130
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -8575,22 +8276,22 @@
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/api_samples_test_base.py:143
+#: nova/tests/integrated/api_samples_test_base.py:142
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/api_samples_test_base.py:163
+#: nova/tests/integrated/api_samples_test_base.py:162
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/api_samples_test_base.py:167
+#: nova/tests/integrated/api_samples_test_base.py:166
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/api_samples_test_base.py:188
-#: nova/tests/integrated/api_samples_test_base.py:204
+#: nova/tests/integrated/api_samples_test_base.py:187
+#: nova/tests/integrated/api_samples_test_base.py:203
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -8652,318 +8353,330 @@
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/virt/hyperv/test_hypervapi.py:491
+#: nova/tests/virt/hyperv/test_hypervapi.py:488
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/hyperv/test_hypervapi.py:952
+#: nova/tests/virt/hyperv/test_hypervapi.py:947
 msgid "Simulated failure"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:932
+#: nova/tests/virt/libvirt/fakelibvirt.py:909
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:936
+#: nova/tests/virt/libvirt/fakelibvirt.py:913
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:940
+#: nova/tests/virt/libvirt/fakelibvirt.py:917
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:953
+#: nova/tests/virt/libvirt/fakelibvirt.py:930
 msgid ""
 "virEventRegisterDefaultImpl() must be             called before connection "
 "is used."
 msgstr ""
 
-#: nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py:89
-#: nova/virt/vmwareapi/vm_util.py:957
+#: nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py:88
+#: nova/virt/vmwareapi/vm_util.py:899
 #, python-format
 msgid "Datastore regex %s did not match any datastores"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_vm_utils.py:495
-#: nova/virt/xenapi/vm_utils.py:2269
+#: nova/tests/virt/xenapi/test_vm_utils.py:485
+#: nova/virt/xenapi/vm_utils.py:2130
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left)s bytes left "
 "to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:940
+#: nova/tests/virt/xenapi/test_xenapi.py:969
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:951
+#: nova/tests/virt/xenapi/test_xenapi.py:980
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/virt/xenapi/image/test_bittorrent.py:132
-#: nova/virt/xenapi/image/bittorrent.py:94
-msgid "Cannot create default bittorrent URL without torrent_base_url set"
+#: nova/tests/virt/xenapi/image/test_bittorrent.py:133
+#: nova/virt/xenapi/image/bittorrent.py:98
+msgid ""
+"Cannot create default bittorrent URL without torrent_base_url set or torrent "
+"URL fetcher extension"
+msgstr ""
+
+#: nova/tests/virt/xenapi/image/test_bittorrent.py:167
+#: nova/virt/xenapi/image/bittorrent.py:102
+msgid "Multiple torrent URL fetcher extensions found. Failing."
 msgstr ""
 
-#: nova/tests/virt/xenapi/image/test_bittorrent.py:164
-#: nova/virt/xenapi/image/bittorrent.py:103
-msgid "Multiple torrent URL fetcher extension found. Failing."
+#: nova/virt/block_device.py:243
+#, python-format
+msgid "Driver failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/block_device.py:165
+#: nova/virt/block_device.py:162
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/configdrive.py:98
+#: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/cpu.py:60 nova/virt/cpu.py:64
+#: nova/virt/libvirt/driver.py:3304 nova/virt/libvirt/driver.py:3308
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/cpu.py:73
+#: nova/virt/libvirt/driver.py:3317
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/cpu.py:80
+#: nova/virt/libvirt/driver.py:3324
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/cpu.py:85
+#: nova/virt/libvirt/driver.py:3329
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/driver.py:1041
+#: nova/virt/driver.py:1009
 #, python-format
 msgid "Discarding event %s"
 msgstr ""
 
-#: nova/virt/driver.py:1046
+#: nova/virt/driver.py:1014
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:1049
+#: nova/virt/driver.py:1017
 #, python-format
 msgid "Emitting event %s"
 msgstr ""
 
-#: nova/virt/driver.py:1052
+#: nova/virt/driver.py:1020
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:1133
+#: nova/virt/driver.py:1101
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:1136
+#: nova/virt/driver.py:1104
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:1143
+#: nova/virt/driver.py:1111
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:211
+#: nova/virt/fake.py:215
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:180 nova/virt/libvirt/firewall.py:318
+#: nova/virt/firewall.py:177 nova/virt/libvirt/firewall.py:327
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:188
+#: nova/virt/firewall.py:185
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:190
+#: nova/virt/firewall.py:187
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:372
+#: nova/virt/firewall.py:368
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:503 nova/virt/xenapi/firewall.py:77
+#: nova/virt/firewall.py:496 nova/virt/xenapi/firewall.py:77
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:88
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:107
+#: nova/virt/images.py:105
 #, python-format
 msgid ""
 "%(base)s virtual size %(disk_size)s larger than flavor root disk size "
 "%(size)s"
 msgstr ""
 
-#: nova/virt/images.py:124
+#: nova/virt/images.py:222
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: nova/virt/baremetal/common.py:29
+#: nova/virt/storage_users.py:63 nova/virt/storage_users.py:101
+#, python-format
+msgid "Cannot decode JSON from %(id_path)s"
+msgstr ""
+
+#: nova/virt/baremetal/common.py:27
 msgid "Connection failed"
 msgstr ""
 
-#: nova/virt/baremetal/common.py:67
+#: nova/virt/baremetal/common.py:65
 msgid "Connection error"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:86
+#: nova/virt/baremetal/driver.py:85
 #, python-format
 msgid "Request for baremetal node %s sent to wrong service host"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:139
+#: nova/virt/baremetal/driver.py:140
 msgid "cpu_arch is not found in flavor_extra_specs"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:178
+#: nova/virt/baremetal/driver.py:177
 #, python-format
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:266
+#: nova/virt/baremetal/driver.py:254
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:293
+#: nova/virt/baremetal/driver.py:281
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:304
+#: nova/virt/baremetal/driver.py:293
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:322
+#: nova/virt/baremetal/driver.py:311
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:327
+#: nova/virt/baremetal/driver.py:316
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:337
+#: nova/virt/baremetal/driver.py:326
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:350
+#: nova/virt/baremetal/driver.py:339
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/iboot_pdu.py:53
+#: nova/virt/baremetal/iboot_pdu.py:51
 msgid "iboot PDU relay ID must be an integer."
 msgstr ""
 
-#: nova/virt/baremetal/iboot_pdu.py:64
+#: nova/virt/baremetal/iboot_pdu.py:62
 msgid "iboot PDU port must be an integer."
 msgstr ""
 
-#: nova/virt/baremetal/iboot_pdu.py:91
-#: nova/virt/baremetal/virtual_power_driver.py:159
+#: nova/virt/baremetal/iboot_pdu.py:89
+#: nova/virt/baremetal/virtual_power_driver.py:157
 #, python-format
 msgid "activate_node name %s"
 msgstr ""
 
-#: nova/virt/baremetal/iboot_pdu.py:103
+#: nova/virt/baremetal/iboot_pdu.py:101
 #, python-format
 msgid "reboot_node: %s"
 msgstr ""
 
-#: nova/virt/baremetal/iboot_pdu.py:116
-#: nova/virt/baremetal/virtual_power_driver.py:182
+#: nova/virt/baremetal/iboot_pdu.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:180
 #, python-format
 msgid "deactivate_node name %s"
 msgstr ""
 
-#: nova/virt/baremetal/iboot_pdu.py:129
-#: nova/virt/baremetal/virtual_power_driver.py:195
+#: nova/virt/baremetal/iboot_pdu.py:127
+#: nova/virt/baremetal/virtual_power_driver.py:193
 #, python-format
 msgid "Checking if %s is running"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:89
+#: nova/virt/baremetal/ipmi.py:86
 #, python-format
 msgid "pid file %s does not contain any pid"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:112
+#: nova/virt/baremetal/ipmi.py:109
 msgid "Node id not supplied to IPMI"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:115
+#: nova/virt/baremetal/ipmi.py:112
 msgid "Address not supplied to IPMI"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:118
+#: nova/virt/baremetal/ipmi.py:115
 msgid "User not supplied to IPMI"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:121
+#: nova/virt/baremetal/ipmi.py:118
 msgid "Password not supplied to IPMI"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:138
+#: nova/virt/baremetal/ipmi.py:135
 #, python-format
 msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:154
+#: nova/virt/baremetal/ipmi.py:151
 #, python-format
 msgid "IPMI power on failed after %d tries"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:164
+#: nova/virt/baremetal/ipmi.py:159
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:181
+#: nova/virt/baremetal/ipmi.py:175
 #, python-format
 msgid "IPMI power off failed after %d tries"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:191
+#: nova/virt/baremetal/ipmi.py:183
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:202
+#: nova/virt/baremetal/ipmi.py:193
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:214 nova/virt/baremetal/tilera_pdu.py:154
+#: nova/virt/baremetal/ipmi.py:205 nova/virt/baremetal/tilera_pdu.py:154
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:110
+#: nova/virt/baremetal/pxe.py:106
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
@@ -8990,32 +8703,32 @@
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:462 nova/virt/baremetal/tilera.py:320
+#: nova/virt/baremetal/pxe.py:453 nova/virt/baremetal/tilera.py:320
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:469
+#: nova/virt/baremetal/pxe.py:460
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:474
+#: nova/virt/baremetal/pxe.py:465
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:478
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:480 nova/virt/baremetal/tilera.py:345
+#: nova/virt/baremetal/pxe.py:471 nova/virt/baremetal/tilera.py:345
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:485
+#: nova/virt/baremetal/pxe.py:476
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
@@ -9126,7 +8839,7 @@
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:89
+#: nova/virt/baremetal/virtual_power_driver.py:87
 #, python-format
 msgid "Setting up %s commands."
 msgstr ""
@@ -9143,31 +8856,31 @@
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:137
+#: nova/virt/baremetal/virtual_power_driver.py:135
 msgid "Getting full node list."
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:143
+#: nova/virt/baremetal/virtual_power_driver.py:141
 #, python-format
 msgid "Looking up Name for Mac address %s."
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:171
+#: nova/virt/baremetal/virtual_power_driver.py:169
 #, python-format
 msgid "reset node: %s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:198
+#: nova/virt/baremetal/virtual_power_driver.py:197
 #, python-format
 msgid "Node \"%(name)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:232
+#: nova/virt/baremetal/virtual_power_driver.py:230
 #, python-format
 msgid "Result for run_command: %s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:235
+#: nova/virt/baremetal/virtual_power_driver.py:233
 #, python-format
 msgid "Error running command: %s"
 msgstr ""
@@ -9177,17 +8890,16 @@
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:195 nova/virt/hyperv/volumeops.py:185
-#: nova/virt/libvirt/driver.py:1065
+#: nova/virt/hyperv/volumeops.py:183 nova/virt/libvirt/driver.py:984
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:234
+#: nova/virt/baremetal/volume_driver.py:228
 #, python-format
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:288
+#: nova/virt/baremetal/volume_driver.py:261
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -9217,39 +8929,51 @@
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
 
-#: nova/virt/disk/api.py:168
+#: nova/virt/disk/api.py:128
+#, python-format
+msgid ""
+"Checking the file system with e2fsck has failed, the resize will be aborted. "
+"(%s)"
+msgstr ""
+
+#: nova/virt/disk/api.py:162
+#, python-format
+msgid "Resizing the file system with resize2fs has failed with error: %s"
+msgstr ""
+
+#: nova/virt/disk/api.py:156
 #, python-format
 msgid "Checking if we can resize image %(image)s. size=%(size)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:174
+#: nova/virt/disk/api.py:162
 #, python-format
 msgid "Cannot resize image %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:182
+#: nova/virt/disk/api.py:170
 #, python-format
 msgid ""
 "Checking if we can resize filesystem inside %(image)s. CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:192
+#: nova/virt/disk/api.py:180
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:202
+#: nova/virt/disk/api.py:218
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(error)s. Cannot "
 "resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:269
+#: nova/virt/disk/api.py:257
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:325
+#: nova/virt/disk/api.py:313
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s "
@@ -9257,77 +8981,77 @@
 "use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:345
+#: nova/virt/disk/api.py:331
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:367
+#: nova/virt/disk/api.py:350
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': %(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:389 nova/virt/disk/mount/loop.py:59
+#: nova/virt/disk/mount/loop.py:59
 #, python-format
 msgid "Release loop device %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:393 nova/virt/disk/mount/nbd.py:128
+#: nova/virt/disk/mount/nbd.py:128
 #, python-format
 msgid "Release nbd device %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:397
+#: nova/virt/disk/api.py:413
 #, python-format
 msgid "Failed to teardown container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:410
+#: nova/virt/disk/api.py:380
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:435
+#: nova/virt/disk/api.py:405
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:447
+#: nova/virt/disk/api.py:417
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:456
+#: nova/virt/disk/api.py:426
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:497
+#: nova/virt/disk/api.py:467
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:525
+#: nova/virt/disk/api.py:495
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:550
+#: nova/virt/disk/api.py:520
 #, python-format
 msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:589
+#: nova/virt/disk/api.py:564
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:618
+#: nova/virt/disk/api.py:593
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:634
+#: nova/virt/disk/api.py:609
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -9399,12 +9123,12 @@
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:209
+#: nova/virt/disk/mount/api.py:208
 #, python-format
 msgid "Umount %s"
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:223
+#: nova/virt/disk/mount/api.py:219
 msgid "Fail to mount, tearing back down"
 msgstr ""
 
@@ -9423,6 +9147,11 @@
 msgid "Got loop device %s"
 msgstr ""
 
+#: nova/virt/disk/mount/nbd.py:57
+#, python-format
+msgid "NBD error - previous umount did not cleanup /var/lock/qemu-nbd-%s."
+msgstr ""
+
 #: nova/virt/disk/mount/nbd.py:56 nova/virt/disk/mount/nbd.py:70
 msgid "No free nbd devices"
 msgstr ""
@@ -9479,118 +9208,118 @@
 msgid "Falling back to VFSLocalFS"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:55
+#: nova/virt/disk/vfs/guestfs.py:56
 #, python-format
 msgid "Mount guest OS image %(imgfile)s partition %(part)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:64
+#: nova/virt/disk/vfs/guestfs.py:65
 #, python-format
 msgid "Inspecting guest OS image %s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:68
+#: nova/virt/disk/vfs/guestfs.py:69
 #, python-format
 msgid "No operating system found in %s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:72
+#: nova/virt/disk/vfs/guestfs.py:73
 #, python-format
 msgid "Multi-boot OS %(roots)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:74
+#: nova/virt/disk/vfs/guestfs.py:75
 #, python-format
 msgid "Multi-boot operating system found in %s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:80
+#: nova/virt/disk/vfs/guestfs.py:81
 #, python-format
 msgid "Inspecting guest OS root filesystem %s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:85
+#: nova/virt/disk/vfs/guestfs.py:86
 #, python-format
 msgid "No mount points found in %(root)s of %(imgfile)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:93
+#: nova/virt/disk/vfs/guestfs.py:94
 #, python-format
 msgid "Mounting %(dev)s at %(dir)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:99
+#: nova/virt/disk/vfs/guestfs.py:100
 #, python-format
 msgid ""
 "Error mounting %(device)s to %(dir)s in image %(imgfile)s with libguestfs "
 "(%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:109
+#: nova/virt/disk/vfs/guestfs.py:110
 #, python-format
 msgid "Setting up appliance for %(imgfile)s %(imgfmt)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:124
+#: nova/virt/disk/vfs/guestfs.py:128
 #, python-format
 msgid "Error mounting %(imgfile)s with libguestfs (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:131
+#: nova/virt/disk/vfs/guestfs.py:135
 msgid "Tearing down appliance"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:137
+#: nova/virt/disk/vfs/guestfs.py:141
 #, python-format
 msgid "Failed to close augeas %s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:145
+#: nova/virt/disk/vfs/guestfs.py:149
 #, python-format
 msgid "Failed to shutdown appliance %s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:153
+#: nova/virt/disk/vfs/guestfs.py:157
 #, python-format
 msgid "Failed to close guest handle %s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:165 nova/virt/disk/vfs/localfs.py:103
+#: nova/virt/disk/vfs/guestfs.py:169 nova/virt/disk/vfs/localfs.py:103
 #, python-format
 msgid "Make directory path=%s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:170 nova/virt/disk/vfs/localfs.py:108
+#: nova/virt/disk/vfs/guestfs.py:174 nova/virt/disk/vfs/localfs.py:108
 #, python-format
 msgid "Append file path=%s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:175 nova/virt/disk/vfs/localfs.py:117
+#: nova/virt/disk/vfs/guestfs.py:179 nova/virt/disk/vfs/localfs.py:117
 #, python-format
 msgid "Replace file path=%s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:180 nova/virt/disk/vfs/localfs.py:126
+#: nova/virt/disk/vfs/guestfs.py:184 nova/virt/disk/vfs/localfs.py:126
 #, python-format
 msgid "Read file path=%s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:185 nova/virt/disk/vfs/localfs.py:132
+#: nova/virt/disk/vfs/guestfs.py:189 nova/virt/disk/vfs/localfs.py:132
 #, python-format
 msgid "Has file path=%s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:194
+#: nova/virt/disk/vfs/guestfs.py:198
 #, python-format
 msgid "Set permissions path=%(path)s mode=%(mode)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:200
+#: nova/virt/disk/vfs/guestfs.py:204
 #, python-format
 msgid "Set ownership path=%(path)s user=%(user)s group=%(group)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:214
+#: nova/virt/disk/vfs/guestfs.py:218
 #, python-format
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
@@ -9625,26 +9354,41 @@
 msgid "Set permissions path=%(path)s user=%(user)s group=%(group)s"
 msgstr ""
 
-#: nova/virt/docker/driver.py:46
+#: nova/virt/docker/client.py:73
+#, python-format
+msgid ""
+"Content-Type of response is not application/json (Docker bug?). Requested "
+"URL %s"
+msgstr ""
+
+#: nova/virt/docker/driver.py:45
 msgid "Default TCP port to find the docker-registry container"
 msgstr ""
 
-#: nova/virt/docker/driver.py:74
+#: nova/virt/docker/driver.py:73
+msgid ""
+"The docker driver does not meet the Nova project's requirements for quality "
+"verification and is planned for removal. This may change, but users should "
+"plan accordingly. Additional details here: "
+"https://wiki.openstack.org/wiki/HypervisorSupportMatrix/DeprecationPlan"
+msgstr ""
+
+#: nova/virt/docker/driver.py:76
 msgid ""
 "Docker daemon is not running or is not reachable (check the rights on "
 "/var/run/docker.sock)"
 msgstr ""
 
-#: nova/virt/docker/driver.py:100
+#: nova/virt/docker/driver.py:106
 msgid "VIF plugging is not supported by the Docker driver."
 msgstr ""
 
-#: nova/virt/docker/driver.py:105
+#: nova/virt/docker/driver.py:111
 msgid "VIF unplugging is not supported by the Docker driver."
 msgstr ""
 
-#: nova/virt/docker/driver.py:143 nova/virt/libvirt/driver.py:3665
-#: nova/virt/xenapi/host.py:191
+#: nova/virt/docker/driver.py:143 nova/virt/libvirt/driver.py:3494
+#: nova/virt/powervm/operator.py:639 nova/virt/xenapi/host.py:191
 #, python-format
 msgid ""
 "Hostname has changed from %(old)s to %(new)s. A restart is required to take "
@@ -9655,103 +9399,107 @@
 msgid "Cannot find any PID under container \"{0}\""
 msgstr ""
 
-#: nova/virt/docker/driver.py:228
-msgid "Cannot set fixed ip"
-msgstr ""
-
 #: nova/virt/docker/driver.py:253
 msgid "Failed to setup the network, rolling back"
 msgstr ""
 
-#: nova/virt/docker/driver.py:263
+#: nova/virt/docker/driver.py:267
 msgid "Image container format not supported ({0})"
 msgstr ""
 
-#: nova/virt/docker/driver.py:292
+#: nova/virt/docker/driver.py:296
 msgid "Image name \"{0}\" does not exist, fetching it..."
 msgstr ""
 
-#: nova/virt/docker/driver.py:297
+#: nova/virt/docker/driver.py:301
 msgid "Cannot pull missing image"
 msgstr ""
 
-#: nova/virt/docker/driver.py:302
+#: nova/virt/docker/driver.py:306
 msgid "Cannot create container"
 msgstr ""
 
-#: nova/virt/docker/driver.py:308
+#: nova/virt/docker/driver.py:312
 msgid "Cannot setup network: {0}"
 msgstr ""
 
-#: nova/virt/docker/driver.py:326
+#: nova/virt/docker/driver.py:330
 msgid "Cannot stop the container, please check docker logs"
 msgstr ""
 
-#: nova/virt/docker/driver.py:329
+#: nova/virt/docker/driver.py:333
 msgid "Cannot restart the container, please check docker logs"
 msgstr ""
 
+#: nova/virt/docker/network.py:34
+#, python-format
+msgid "Cannot remove network namespace, netns id: %s"
+msgstr ""
+
+#: nova/virt/docker/network.py:44
+msgid "Cannot find fixed ip"
+msgstr ""
+
+#: nova/virt/docker/network.py:51
+msgid "Cannot find gateway"
+msgstr ""
+
 #: nova/virt/hyperv/basevolumeutils.py:72
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:155
+#: nova/virt/hyperv/driver.py:165
 msgid "VIF plugging is not supported by the Hyper-V driver."
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:170
 msgid "VIF unplugging is not supported by the Hyper-V driver."
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:164
+#: nova/virt/hyperv/driver.py:160
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:168
+#: nova/virt/hyperv/driver.py:164
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:94
+#: nova/virt/hyperv/hostops.py:93
 #, python-format
 msgid "Windows version: %s "
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:106
+#: nova/virt/hyperv/hostops.py:105
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:140 nova/virt/libvirt/driver.py:4968
-#: nova/virt/xenapi/host.py:168
+#: nova/virt/hyperv/hostops.py:139 nova/virt/libvirt/driver.py:4800
+#: nova/virt/xenapi/host.py:167
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:166
+#: nova/virt/hyperv/hostops.py:165
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:181
+#: nova/virt/hyperv/hostops.py:180
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:51
-#, python-format
-msgid "The image is not a valid VHD: %s"
-msgstr ""
-
-#: nova/virt/hyperv/imagecache.py:81
+#: nova/virt/hyperv/imagecache.py:70
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal size: "
 "%(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:96
+#: nova/virt/hyperv/imagecache.py:85
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:101
+#: nova/virt/hyperv/imagecache.py:90
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -9817,12 +9565,12 @@
 msgid "Live migration networks are not configured on this host"
 msgstr ""
 
-#: nova/virt/hyperv/livemigrationutils.py:72 nova/virt/hyperv/vmutils.py:141
+#: nova/virt/hyperv/livemigrationutils.py:72 nova/virt/hyperv/vmutils.py:131
 #, python-format
 msgid "VM not found: %s"
 msgstr ""
 
-#: nova/virt/hyperv/livemigrationutils.py:74 nova/virt/hyperv/vmutils.py:150
+#: nova/virt/hyperv/livemigrationutils.py:74 nova/virt/hyperv/vmutils.py:140
 #, python-format
 msgid "Duplicate VM name found: %s"
 msgstr ""
@@ -9859,86 +9607,86 @@
 msgid "Getting live migration networks for remote host: %s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:50
+#: nova/virt/hyperv/migrationops.py:49
 msgid "Migration target is the source host"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:52
+#: nova/virt/hyperv/migrationops.py:51
 #, python-format
 msgid "Migration target host: %s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:73
+#: nova/virt/hyperv/migrationops.py:72
 #, python-format
 msgid "Copying disk \"%(disk_file)s\" to \"%(dest_path)s\""
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:97
+#: nova/virt/hyperv/migrationops.py:96
 msgid "Cannot cleanup migration files"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:105
+#: nova/virt/hyperv/migrationops.py:104
 #, python-format
 msgid ""
 "Cannot resize the root disk to a smaller size. Current size: "
 "%(curr_root_gb)s GB. Requested size: %(new_root_gb)s GB"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:113
+#: nova/virt/hyperv/migrationops.py:112
 msgid "migrate_disk_and_power_off called"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:133
+#: nova/virt/hyperv/migrationops.py:132
 msgid "confirm_migration called"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:148
+#: nova/virt/hyperv/migrationops.py:147
 msgid "finish_revert_migration called"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:170
+#: nova/virt/hyperv/migrationops.py:169
 #, python-format
 msgid "Copying base disk %(base_vhd_path)s to %(base_vhd_copy_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:176
+#: nova/virt/hyperv/migrationops.py:175
 #, python-format
 msgid ""
 "Reconnecting copied base VHD %(base_vhd_copy_path)s and diff VHD "
 "%(diff_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:184
+#: nova/virt/hyperv/migrationops.py:183
 #, python-format
 msgid ""
 "Merging base disk %(base_vhd_copy_path)s and diff disk %(diff_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:200
+#: nova/virt/hyperv/migrationops.py:199 nova/virt/hyperv/vmops.py:164
 msgid "Cannot resize a VHD to a smaller size"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:207
+#: nova/virt/hyperv/migrationops.py:206
 #, python-format
 msgid "Getting parent disk info for disk: %s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:213
+#: nova/virt/hyperv/migrationops.py:212
 #, python-format
 msgid "Resizing disk \"%(vhd_path)s\" to new max size %(new_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:225
+#: nova/virt/hyperv/migrationops.py:224
 #, python-format
 msgid ""
 "Reconnecting copied base VHD %(base_vhd_path)s and diff VHD %(diff_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:236
+#: nova/virt/hyperv/migrationops.py:235
 msgid "finish_migration called"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:245
+#: nova/virt/hyperv/migrationops.py:244
 #, python-format
 msgid "Cannot find boot VHD file for instance: %s"
 msgstr ""
@@ -9973,6 +9721,15 @@
 msgid "Removing directory: %s"
 msgstr ""
 
+#: nova/virt/hyperv/rdpconsoleops.py:31
+msgid "get_rdp_console called"
+msgstr ""
+
+#: nova/virt/hyperv/rdpconsoleops.py:36
+#, python-format
+msgid "RDP console: %(host)s:%(port)s, %(vm_id)s"
+msgstr ""
+
 #: nova/virt/hyperv/snapshotops.py:55
 #, python-format
 msgid "Creating snapshot for instance %s"
@@ -10028,213 +9785,211 @@
 msgid "Failed to remove snapshot for VM %s"
 msgstr ""
 
-#: nova/virt/hyperv/vhdutils.py:67 nova/virt/hyperv/vhdutilsv2.py:54
+#: nova/virt/hyperv/vhdutils.py:54 nova/virt/hyperv/vhdutilsv2.py:54
 #, python-format
 msgid "Unsupported disk format: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vhdutils.py:148
+#: nova/virt/hyperv/vhdutils.py:136
 #, python-format
 msgid "The %(vhd_type)s type VHD is not supported"
 msgstr ""
 
-#: nova/virt/hyperv/vhdutils.py:159
+#: nova/virt/hyperv/vhdutils.py:147
 #, python-format
 msgid "Unable to obtain block size from VHD %(vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vhdutils.py:206
+#: nova/virt/hyperv/vhdutils.py:188
 msgid "Unsupported virtual disk format"
 msgstr ""
 
+#: nova/virt/hyperv/vhdutilsv2.py:134
+msgid "Differencing VHDX images are not supported"
+msgstr ""
+
+#: nova/virt/hyperv/vhdutilsv2.py:157
+#, python-format
+msgid ""
+"Unable to obtain internal size from VHDX: %(vhd_path)s. Exception: %(ex)s"
+msgstr ""
+
 #: nova/virt/hyperv/vif.py:74
 #, python-format
 msgid "Creating vswitch port for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:116
+#: nova/virt/hyperv/vmops.py:114
 #, python-format
 msgid "VIF driver not found for network_api_class: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:125
+#: nova/virt/hyperv/vmops.py:123
 msgid "get_info called for instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:148
+#: nova/virt/hyperv/vmops.py:146
 #, python-format
 msgid ""
 "Creating differencing VHD. Parent: %(base_vhd_path)s, Target: "
 "%(root_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:155
+#: nova/virt/hyperv/vmops.py:153
 #, python-format
 msgid "Copying VHD image %(base_vhd_path)s to target: %(root_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:175
+#: nova/virt/hyperv/vmops.py:169
 #, python-format
 msgid ""
 "Cannot resize a VHD to a smaller size, the original size is "
 "%(base_vhd_size)s, the newer size is %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:182
+#: nova/virt/hyperv/vmops.py:167
 #, python-format
 msgid "Resizing VHD %(root_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:209
+#: nova/virt/hyperv/vmops.py:194
 msgid "Spawning new instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:237
+#: nova/virt/hyperv/vmops.py:222
 msgid "Spawn instance failed"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:272
-#, python-format
-msgid "Creating nic for instance: %s"
+#: nova/virt/hyperv/vmops.py:269
+msgid "Creating nic for instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:283 nova/virt/vmwareapi/vmops.py:563
+#: nova/virt/hyperv/vmops.py:268 nova/virt/vmwareapi/vmops.py:537
 #, python-format
 msgid "Invalid config_drive_format \"%s\""
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:286
-#, python-format
-msgid "Using config drive for instance: %s"
+#: nova/virt/vmwareapi/vmops.py:541
+msgid "Using config drive for instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:299 nova/virt/libvirt/driver.py:2537
+#: nova/virt/hyperv/vmops.py:284 nova/virt/libvirt/driver.py:2417
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:307 nova/virt/libvirt/driver.py:2544
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/hyperv/vmops.py:292 nova/virt/libvirt/driver.py:2424
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:343
-#, python-format
-msgid "Got request to destroy instance: %s"
-msgstr ""
-
-#: nova/virt/hyperv/vmops.py:356
-#, python-format
-msgid "Instance not found: %s"
+#: nova/virt/hyperv/vmops.py:340
+msgid "Got request to destroy instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:362
+#: nova/virt/hyperv/vmops.py:347
 #, python-format
 msgid "Failed to destroy instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:367
-msgid "reboot instance"
-msgstr ""
-
-#: nova/virt/hyperv/vmops.py:373
+#: nova/virt/hyperv/vmops.py:358
 msgid "Pause instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:379
+#: nova/virt/hyperv/vmops.py:364
 msgid "Unpause instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:385
+#: nova/virt/hyperv/vmops.py:370
 msgid "Suspend instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:391
+#: nova/virt/hyperv/vmops.py:376
 msgid "Resume instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:397
+#: nova/virt/hyperv/vmops.py:382
 msgid "Power off instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:403
+#: nova/virt/hyperv/vmops.py:388
 msgid "Power on instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:410
+#: nova/virt/hyperv/vmops.py:395
 #, python-format
 msgid "Successfully changed state of VM %(vm_name)s to: %(req_state)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:415
+#: nova/virt/hyperv/vmops.py:400
 #, python-format
 msgid "Failed to change vm state of %(vm_name)s to %(req_state)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:119
+#: nova/virt/hyperv/vmutils.py:109
 #, python-format
 msgid "Cannot get VM summary data for: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:206
+#: nova/virt/hyperv/vmutils.py:196
 msgid ""
 "The Windows account running nova-compute on this Hyper-V host doesn't have "
 "the required permissions to create or operate the virtual machine."
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:216
+#: nova/virt/hyperv/vmutils.py:206
 #, python-format
 msgid "Creating VM %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:221
+#: nova/virt/hyperv/vmutils.py:211
 #, python-format
 msgid "Setting memory for vm %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:224
+#: nova/virt/hyperv/vmutils.py:214
 #, python-format
 msgid "Set vCPUs for vm %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:385
+#: nova/virt/hyperv/vmutils.py:373
 #, python-format
 msgid "Successfully changed vm state of %(vm_name)s to %(req_state)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:430
+#: nova/virt/hyperv/vmutils.py:414
 #, python-format
 msgid "Operation failed with return value: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:446
+#: nova/virt/hyperv/vmutils.py:430
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s - "
 "%(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:457
+#: nova/virt/hyperv/vmutils.py:441
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:463
+#: nova/virt/hyperv/vmutils.py:447
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:469
+#: nova/virt/hyperv/vmutils.py:453
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:582
+#: nova/virt/hyperv/vmutils.py:561
 msgid "Metrics collection is not supported on this version of Hyper-V"
 msgstr ""
 
-#: nova/virt/hyperv/vmutilsv2.py:244
+#: nova/virt/hyperv/vmutilsv2.py:237
 #, python-format
 msgid "Metric not found: %s"
 msgstr ""
@@ -10253,42 +10008,49 @@
 "%(target_iqn)s, LUN: %(target_lun)s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:110
+#: nova/virt/hyperv/volumeops.py:109
 #, python-format
 msgid "Attach_volume: %(connection_info)s to %(instance_name)s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:141
+#: nova/virt/hyperv/volumeops.py:140
 #, python-format
 msgid "Attach volume failed: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:144
+#: nova/virt/hyperv/volumeops.py:142
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:157
+#: nova/virt/hyperv/volumeops.py:155
 #, python-format
 msgid "Logging off storage target %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:162
+#: nova/virt/hyperv/volumeops.py:160
 #, python-format
 msgid "Detach_volume: %(connection_info)s from %(instance_name)s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:175
+#: nova/virt/hyperv/volumeops.py:173
 #, python-format
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:198 nova/virt/hyperv/volumeops.py:212
+#: nova/virt/hyperv/volumeops.py:209
+#, python-format
+msgid ""
+"Attempt %d to get device_number from get_device_number_for_target failed. "
+"Retrying..."
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:196 nova/virt/hyperv/volumeops.py:210
 #, python-format
 msgid "Unable to find a mounted disk for target_iqn: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:200
+#: nova/virt/hyperv/volumeops.py:198
 #, python-format
 msgid "Device number: %(device_number)s, target lun: %(target_lun)s"
 msgstr ""
@@ -10298,459 +10060,474 @@
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:146
+#: nova/virt/libvirt/blockinfo.py:140
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:194
+#: nova/virt/libvirt/blockinfo.py:188
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:290
+#: nova/virt/libvirt/blockinfo.py:280
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/config.py:72
+#: nova/virt/libvirt/config.py:71
 #, python-format
 msgid "Generated XML %s "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:398
+#: nova/virt/libvirt/driver.py:360
 #, python-format
 msgid ""
 "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:526
+#: nova/virt/libvirt/driver.py:484
 #, python-format
 msgid "Event loop thread is not active, discarding event %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:557
 msgid "Starting native event thread"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:604
+#: nova/virt/libvirt/driver.py:562
 msgid "Starting green dispatch thread"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:615
+#: nova/virt/libvirt/driver.py:621
+#, python-format
+msgid ""
+"The libvirt driver is not tested on %(type)s/%(arch)s by the OpenStack "
+"project and thus its quality can not be ensured. For more information, see: "
+"https://wiki.openstack.org/wiki/HypervisorSupportMatrix"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:573
 #, python-format
 msgid ""
 "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:623
+#: nova/virt/libvirt/driver.py:584
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:637
+#: nova/virt/libvirt/driver.py:595
 #, python-format
 msgid "Registering for lifecycle events %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:644
+#: nova/virt/libvirt/driver.py:668
 #, python-format
 msgid "URI %(uri)s does not support events: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:650
+#: nova/virt/libvirt/driver.py:608
 #, python-format
 msgid "Registering for connection events: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:655
+#: nova/virt/libvirt/driver.py:682
+#, python-format
+msgid ""
+"The version of python-libvirt does not support registerCloseCallback or is "
+"too old: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:685
 #, python-format
 msgid "URI %(uri)s does not support connection events: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:675
+#: nova/virt/libvirt/driver.py:623
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:692
+#: nova/virt/libvirt/driver.py:636
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:714 nova/virt/libvirt/driver.py:717
+#: nova/virt/libvirt/driver.py:658 nova/virt/libvirt/driver.py:661
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:740
+#: nova/virt/libvirt/driver.py:679
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:842
+#: nova/virt/libvirt/driver.py:780
 msgid "Cannot destroy instance, operation time out"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:844
+#: nova/virt/libvirt/driver.py:782
 msgid "operation time out"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:849
+#: nova/virt/libvirt/driver.py:787
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:803
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:870
+#: nova/virt/libvirt/driver.py:808
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:880
+#: nova/virt/libvirt/driver.py:818
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:890
+#: nova/virt/libvirt/driver.py:828
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:848
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:926
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:946
+#: nova/virt/libvirt/driver.py:884
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:952
+#: nova/virt/libvirt/driver.py:890
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1001
+#: nova/virt/libvirt/driver.py:1042
 #, python-format
 msgid "Ignoring Volume Error on vol %(vol_id)s during delete %(exc)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1071
+#: nova/virt/libvirt/driver.py:990
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1078
+#: nova/virt/libvirt/driver.py:997
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1144
+#: nova/virt/libvirt/driver.py:1058
 #, python-format
 msgid ""
 "Volume sets block size, but the current libvirt hypervisor '%s' does not "
 "support custom block size"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1151
+#: nova/virt/libvirt/driver.py:1065
 #, python-format
 msgid "Volume sets block size, but libvirt '%s' or later is required."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
+#: nova/virt/libvirt/driver.py:1162
 msgid "Swap only supports host devices"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1316
+#: nova/virt/libvirt/driver.py:1230
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1340
+#: nova/virt/libvirt/driver.py:1255
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1361
+#: nova/virt/libvirt/driver.py:1277
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1365
+#: nova/virt/libvirt/driver.py:1281
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1473
+#: nova/virt/libvirt/driver.py:1381
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1476
+#: nova/virt/libvirt/driver.py:1384
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1506
+#: nova/virt/libvirt/driver.py:1417
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1518
+#: nova/virt/libvirt/driver.py:1429
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1525
+#: nova/virt/libvirt/driver.py:1436
 msgid "libvirt error while requesting blockjob info."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1609
+#: nova/virt/libvirt/driver.py:1520
 msgid "Failed to send updated snapshot status to volume service."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1659
+#: nova/virt/libvirt/driver.py:1570
 msgid "Found no disk to snapshot."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1682
+#: nova/virt/libvirt/driver.py:1594
 #, python-format
 msgid "snap xml: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1696
+#: nova/virt/libvirt/driver.py:1608
 msgid ""
 "Unable to create quiesced VM snapshot, attempting again with quiescing "
 "disabled."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1703
+#: nova/virt/libvirt/driver.py:1615
 msgid "Unable to create VM snapshot, failing volume_snapshot operation."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1723
+#: nova/virt/libvirt/driver.py:1765
 #, python-format
 msgid "volume_snapshot_create: create_info: %(c_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1732
+#: nova/virt/libvirt/driver.py:1645
 #, python-format
 msgid "Unknown type: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1737
+#: nova/virt/libvirt/driver.py:1650
 msgid "snapshot_id required in create_info"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1746
+#: nova/virt/libvirt/driver.py:1659
 msgid ""
 "Error occurred during volume_snapshot_create, sending error status to Cinder."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1785
+#: nova/virt/libvirt/driver.py:1698
 #, python-format
 msgid ""
 "Libvirt '%s' or later is required for online deletion of volume snapshots."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1789
+#: nova/virt/libvirt/driver.py:1702
 #, python-format
 msgid "volume_snapshot_delete: delete_info: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1792
+#: nova/virt/libvirt/driver.py:1705
 #, python-format
 msgid "Unknown delete_info type %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1822
+#: nova/virt/libvirt/driver.py:1735
 #, python-format
 msgid "Unable to locate disk matching id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1825
+#: nova/virt/libvirt/driver.py:1867
 #, python-format
 msgid "found dev, it's %(dev)s, with active disk: %(disk)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1838
+#: nova/virt/libvirt/driver.py:1751
 #, python-format
 msgid "disk: %(disk)s, base: %(base)s, bw: %(bw)s, flags: %(flags)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1849
+#: nova/virt/libvirt/driver.py:1762
 msgid "blockRebase started successfully"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1853
+#: nova/virt/libvirt/driver.py:1766
 msgid "waiting for blockRebase job completion"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1869
+#: nova/virt/libvirt/driver.py:1782
 msgid "blockCommit started successfully"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1873
+#: nova/virt/libvirt/driver.py:1786
 msgid "waiting for blockCommit job completion"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1883
+#: nova/virt/libvirt/driver.py:1796
 msgid ""
 "Error occurred during volume_snapshot_delete, sending error status to Cinder."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1899
+#: nova/virt/libvirt/driver.py:1812
 #, python-format
 msgid "Instance soft reboot failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1903
+#: nova/virt/libvirt/driver.py:1816
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1907
+#: nova/virt/libvirt/driver.py:1820
 msgid "Failed to soft reboot instance. Trying hard reboot."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1948
+#: nova/virt/libvirt/driver.py:1861
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1956
+#: nova/virt/libvirt/driver.py:1869
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2025
+#: nova/virt/libvirt/driver.py:1923
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2177
+#: nova/virt/libvirt/driver.py:2073
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2184
+#: nova/virt/libvirt/driver.py:2080 nova/virt/powervm/operator.py:231
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2200
+#: nova/virt/libvirt/driver.py:2096
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2238 nova/virt/libvirt/driver.py:2264
+#: nova/virt/libvirt/driver.py:2134 nova/virt/libvirt/driver.py:2160
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2253 nova/virt/xenapi/vmops.py:1562
+#: nova/virt/libvirt/driver.py:2149 nova/virt/xenapi/vmops.py:1449
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2315
+#: nova/virt/libvirt/driver.py:2211
 msgid "This python runtime does not support direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2329
+#: nova/virt/libvirt/driver.py:2220
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2333
+#: nova/virt/libvirt/driver.py:2224
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2338 nova/virt/libvirt/driver.py:2343
+#: nova/virt/libvirt/driver.py:2229 nova/virt/libvirt/driver.py:2234
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2306
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2528
+#: nova/virt/libvirt/driver.py:2408
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2552
+#: nova/virt/libvirt/driver.py:2594
 msgid "File injection into a boot from volume instance is not supported"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2586
+#: nova/virt/libvirt/driver.py:2461
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2598
+#: nova/virt/libvirt/driver.py:2473
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644
+#: nova/virt/libvirt/driver.py:2519
 #, python-format
 msgid "Detaching PCI devices with libvirt < %(ver)s is not permitted"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2673
+#: nova/virt/libvirt/driver.py:2548
 msgid "Instance disappeared while detaching a PCI device from it."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2684
+#: nova/virt/libvirt/driver.py:2559
 #, python-format
 msgid "Attaching PCI devices %(dev)s to %(dom)s failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2725
+#: nova/virt/libvirt/driver.py:2763
 #, python-format
 msgid "Updating compute service status to %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2766
 #, python-format
 msgid "Not overriding manual compute service status with: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2733
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "Cannot update service status on host: %s,since it is not registered."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2736
+#: nova/virt/libvirt/driver.py:2773
 #, python-format
 msgid ""
 "Cannot update service status on host: %s,due to an unexpected exception."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2809
+#: nova/virt/libvirt/driver.py:2615
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt hypervisor "
 "'%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2815
+#: nova/virt/libvirt/driver.py:2621
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2819
+#: nova/virt/libvirt/driver.py:2625
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2823
+#: nova/virt/libvirt/driver.py:2629
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2839
+#: nova/virt/libvirt/driver.py:2645
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does not "
 "support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3088
+#: nova/virt/libvirt/driver.py:2896
 msgid "Configuring timezone for windows instance to localtime"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3214
+#: nova/virt/libvirt/driver.py:3002
 msgid "Qemu guest agent is enabled through image metadata"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3245
+#: nova/virt/libvirt/driver.py:3348
 #, python-format
 msgid ""
 "Start to_xml network_info=%(network_info)s disk_info=%(disk_info)s "
@@ -10758,122 +10535,123 @@
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3263
+#: nova/virt/libvirt/driver.py:3366
 #, python-format
 msgid "End to_xml xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3281
+#: nova/virt/libvirt/driver.py:3068
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3302
+#: nova/virt/libvirt/driver.py:3089
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3360
+#: nova/virt/libvirt/driver.py:3139
 #, python-format
 msgid "An error occurred while trying to define a domain with xml: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3369
+#: nova/virt/libvirt/driver.py:3148
 #, python-format
 msgid ""
 "An error occurred while trying to launch a defined domain with xml: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3377
+#: nova/virt/libvirt/driver.py:3156
 #, python-format
 msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443 nova/virt/libvirt/driver.py:3584
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3222 nova/virt/libvirt/driver.py:3413
+#: nova/virt/libvirt/driver.py:3439
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3517
+#: nova/virt/libvirt/driver.py:3346
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented for "
 "this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3527
+#: nova/virt/libvirt/driver.py:3356
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3685
 #, python-format
-msgid "couldn't obtain the vpu count from domain id: %s"
+msgid ""
+"couldn't obtain the vpu count from domain id: %(id)s, exception: %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3651
+#: nova/virt/libvirt/driver.py:3480
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3821
+#: nova/virt/libvirt/driver.py:3650
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3834
+#: nova/virt/libvirt/driver.py:3946
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, rd_req=%(rd_req)d, "
 "rd_bytes=%(rd_bytes)d, wr_req=%(wr_req)d, wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3851
+#: nova/virt/libvirt/driver.py:3681
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3857
+#: nova/virt/libvirt/driver.py:3687
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats for "
 "device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3911
+#: nova/virt/libvirt/driver.py:3741
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance is "
 "on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3995
+#: nova/virt/libvirt/driver.py:3822
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4003
+#: nova/virt/libvirt/driver.py:3830
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4047
+#: nova/virt/libvirt/driver.py:3874
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too large(available "
 "on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4074
+#: nova/virt/libvirt/driver.py:3901
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4086
+#: nova/virt/libvirt/driver.py:3913
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -10883,120 +10661,123 @@
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4103
+#: nova/virt/libvirt/driver.py:3930
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should mount "
 "the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4153
+#: nova/virt/libvirt/driver.py:3980
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4225
+#: nova/virt/libvirt/driver.py:4052
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4326
+#: nova/virt/libvirt/driver.py:4153
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4445
+#: nova/virt/libvirt/driver.py:4268
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error "
 "Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4477
+#: nova/virt/libvirt/driver.py:4304
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4482
+#: nova/virt/libvirt/driver.py:4300
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4486
+#: nova/virt/libvirt/driver.py:4309
 #, python-format
 msgid "skipping disk %(path)s (%(target)s) as it is a volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4526
+#: nova/virt/libvirt/driver.py:4657
 #, python-format
-msgid "Getting disk size of %(i_name)s: %(e)s"
+msgid ""
+"Periodic task is updating the host stat, it is trying to get disk "
+"%(i_name)s, but disk file was removed by concurrent operations such as "
+"resize."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4605
+#: nova/virt/libvirt/driver.py:4419
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4674
+#: nova/virt/libvirt/driver.py:4488
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4680
+#: nova/virt/libvirt/driver.py:4494
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4750
+#: nova/virt/libvirt/driver.py:4565
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4858
+#: nova/virt/libvirt/driver.py:4992
 #, python-format
 msgid "Checking instance files accessibility %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4882
+#: nova/virt/libvirt/driver.py:4712
 #, python-format
 msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4887
+#: nova/virt/libvirt/driver.py:4717
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4894
+#: nova/virt/libvirt/driver.py:4724
 #, python-format
 msgid "Deletion of %s failed"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4897
+#: nova/virt/libvirt/driver.py:4727
 #, python-format
 msgid "Deletion of %s complete"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:51
+#: nova/virt/libvirt/firewall.py:52
 msgid ""
 "Libvirt module could not be loaded. NWFilterFirewall will not work correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:108
+#: nova/virt/libvirt/firewall.py:109
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:116
+#: nova/virt/libvirt/firewall.py:117
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:259
+#: nova/virt/libvirt/firewall.py:268
 #, python-format
 msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:281
+#: nova/virt/libvirt/firewall.py:290
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:299
+#: nova/virt/libvirt/firewall.py:308
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -11025,171 +10806,176 @@
 msgid "You should specify images_rbd_pool flag to use rbd images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:579
+#: nova/virt/libvirt/imagebackend.py:507
 msgid "rbd python libraries not found"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:625
+#: nova/virt/libvirt/imagebackend.py:552
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:134
+#: nova/virt/libvirt/imagecache.py:140
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:179
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:195
+#: nova/virt/libvirt/imagecache.py:201
 #, python-format
 msgid "Writing stored info to %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:293
+#: nova/virt/libvirt/imagecache.py:330
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:296
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:302
+#, python-format
+msgid "Failed to get disk backing file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:312
+#: nova/virt/libvirt/imagecache.py:348
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:385
+#: nova/virt/libvirt/imagecache.py:423
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:395
+#: nova/virt/libvirt/imagecache.py:433
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:404
+#: nova/virt/libvirt/imagecache.py:442
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:428
 #, python-format
-msgid "Cannot remove %(base_file)s, it does not exist"
+msgid "Cannot remove %s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:469
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:434
+#: nova/virt/libvirt/imagecache.py:472
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:441
+#: nova/virt/libvirt/imagecache.py:479
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:452
+#: nova/virt/libvirt/imagecache.py:490
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:476
+#: nova/virt/libvirt/imagecache.py:514
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:488
+#: nova/virt/libvirt/imagecache.py:526
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:500
+#: nova/virt/libvirt/imagecache.py:538
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:507
+#: nova/virt/libvirt/imagecache.py:545
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:516
+#: nova/virt/libvirt/imagecache.py:573
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:520
+#: nova/virt/libvirt/imagecache.py:580
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:538
+#: nova/virt/libvirt/imagecache.py:598
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:543
+#: nova/virt/libvirt/imagecache.py:603
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:546
+#: nova/virt/libvirt/imagecache.py:606
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:550
+#: nova/virt/libvirt/imagecache.py:610
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:558
+#: nova/virt/libvirt/imagecache.py:618
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:575
+#: nova/virt/libvirt/imagecache.py:569
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:81 nova/virt/libvirt/utils.py:87
+#: nova/virt/libvirt/utils.py:78 nova/virt/libvirt/utils.py:84
 msgid "systool is not installed"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:91
+#: nova/virt/libvirt/utils.py:88
 msgid "Cannot find any Fibre Channel HBAs"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:233
+#: nova/virt/libvirt/utils.py:230
 #, python-format
 msgid ""
 "Insufficient Space on Volume Group %(vg)s. Only %(free_space)db available, "
 "but %(size)db required by volume %(lv)s."
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:246
+#: nova/virt/libvirt/utils.py:243
 #, python-format
 msgid ""
 "Volume group %(vg)s will not be able to hold sparse volume %(lv)s. Virtual "
@@ -11197,242 +10983,285 @@
 "%(free_space)db."
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:285
+#: nova/virt/libvirt/utils.py:282
 #, python-format
 msgid "rbd remove %(name)s in pool %(pool)s failed"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:306
+#: nova/virt/libvirt/utils.py:303
 #, python-format
 msgid "vg %s must be LVM volume group"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:335
+#: nova/virt/libvirt/utils.py:332
 #, python-format
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:580
+#: nova/virt/libvirt/utils.py:394
+#, python-format
+msgid "ignoring unrecognized volume_clear='%s' value"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:415
+#, python-format
+msgid "volume_clear='%s' is not handled"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:607
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:336 nova/virt/libvirt/vif.py:580
-#: nova/virt/libvirt/vif.py:762
+#: nova/virt/libvirt/vif.py:318 nova/virt/libvirt/vif.py:541
+#: nova/virt/libvirt/vif.py:702
 #, python-format
 msgid "vif_type=%(vif_type)s instance=%(instance)s vif=%(vif)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:343 nova/virt/libvirt/vif.py:587
-#: nova/virt/libvirt/vif.py:769
+#: nova/virt/libvirt/vif.py:325 nova/virt/libvirt/vif.py:548
+#: nova/virt/libvirt/vif.py:709
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:387 nova/virt/libvirt/vif.py:607
-#: nova/virt/libvirt/vif.py:789
+#: nova/virt/libvirt/vif.py:364 nova/virt/libvirt/vif.py:566
+#: nova/virt/libvirt/vif.py:727
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:399
+#: nova/virt/libvirt/vif.py:376
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:410
+#: nova/virt/libvirt/vif.py:387
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:527 nova/virt/libvirt/vif.py:551
-#: nova/virt/libvirt/vif.py:575
+#: nova/virt/libvirt/vif.py:504 nova/virt/libvirt/vif.py:536
 msgid "Failed while plugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:623 nova/virt/libvirt/vif.py:654
-#: nova/virt/libvirt/vif.py:672 nova/virt/libvirt/vif.py:693
-#: nova/virt/libvirt/vif.py:712 nova/virt/libvirt/vif.py:736
-#: nova/virt/libvirt/vif.py:757
+#: nova/virt/libvirt/vif.py:582 nova/virt/libvirt/vif.py:610
+#: nova/virt/libvirt/vif.py:628 nova/virt/libvirt/vif.py:649
+#: nova/virt/libvirt/vif.py:668 nova/virt/libvirt/vif.py:697
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:147
+#: nova/virt/libvirt/volume.py:131
 #, python-format
 msgid "Unknown content in connection_info/qos_specs: %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156
+#: nova/virt/libvirt/volume.py:154
 #, python-format
 msgid "Unknown content in connection_info/access_mode: %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:249 nova/virt/libvirt/volume.py:526
+#: nova/virt/libvirt/volume.py:247 nova/virt/libvirt/volume.py:580
 #, python-format
 msgid "iscsiadm %(command)s: stdout=%(out)s stderr=%(err)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:301
+#: nova/virt/libvirt/volume.py:276
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:304
+#: nova/virt/libvirt/volume.py:279
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:317
+#: nova/virt/libvirt/volume.py:292
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:373
+#: nova/virt/libvirt/volume.py:375
+#, python-format
+msgid "Unable to delete volume device %s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:386
 #, python-format
 msgid ""
 "Failed to remove multipath device descriptor %(dev_mapper)s. Exception "
 "message: %(msg)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:536
+#: nova/virt/libvirt/volume.py:590
 #, python-format
 msgid "multipath %(command)s: stdout=%(out)s stderr=%(err)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:639 nova/virt/libvirt/volume.py:775
+#: nova/virt/libvirt/volume.py:736 nova/virt/libvirt/volume.py:872
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:687
+#: nova/virt/libvirt/volume.py:784
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:689
+#: nova/virt/libvirt/volume.py:786
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:801
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:846
+#: nova/virt/libvirt/volume.py:943
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:855
+#: nova/virt/libvirt/volume.py:952
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:865
+#: nova/virt/libvirt/volume.py:962
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:868
+#: nova/virt/libvirt/volume.py:965
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:885
+#: nova/virt/libvirt/volume.py:982
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:894
+#: nova/virt/libvirt/volume.py:991
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:927
+#: nova/virt/libvirt/volume.py:971
 #, python-format
 msgid "devices to remove = %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:971
+#: nova/virt/libvirt/volume.py:1068
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:982
+#: nova/virt/libvirt/volume.py:1079
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:988
+#: nova/virt/libvirt/volume.py:1085
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:1003
+#: nova/virt/libvirt/volume.py:1100
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:112
+#: nova/virt/vmwareapi/driver.py:93
+msgid ""
+"The VMware ESX driver is not tested by the OpenStack project and thus its "
+"quality can not be ensured. For more information, see: "
+"https://wiki.openstack.org/wiki/HypervisorSupportMatrix"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:149
 msgid ""
 "Must specify host_ip, host_username and host_password to use "
 "compute_driver=vmwareapi.VMwareESXDriver or vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:206
+#: nova/virt/vmwareapi/driver.py:420
+#, python-format
+msgid "Invalid Regular Expression %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:243
 msgid "Instance cannot be found in host, or in an unknownstate."
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:362
+#: nova/virt/vmwareapi/driver.py:402
 #, python-format
 msgid "All clusters specified %s were not found in the vCenter"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:371
+#: nova/virt/vmwareapi/driver.py:411
 #, python-format
 msgid "The following clusters could not be found in the vCenter %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:380
-#, python-format
-msgid "Invalid Regular Expression %s"
-msgstr ""
-
-#: nova/virt/vmwareapi/driver.py:502
+#: nova/virt/vmwareapi/driver.py:538
 #, python-format
 msgid "The resource %s does not exist"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:548
+#: nova/virt/vmwareapi/driver.py:584
 #, python-format
 msgid "Invalid cluster or resource pool name : %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:571
+#: nova/virt/vmwareapi/driver.py:607
 #, python-format
 msgid "The available nodes are: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:757
+#: nova/virt/vmwareapi/driver.py:793
 #, python-format
 msgid ""
 "Unable to connect to server at %(server)s, sleeping for %(seconds)s seconds"
 msgstr ""
 
+#: nova/virt/vmwareapi/driver.py:768
+#, python-format
+msgid "Unable to validate session %s!"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:770
+#, python-format
+msgid "Exception: %(ex)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:810
+#, python-format
+msgid "Session %s is inactive!"
+msgstr ""
+
 #: nova/virt/vmwareapi/driver.py:836
 #, python-format
-msgid "In vmwareapi:_call_method, got this exception: %s"
+msgid ""
+"_call_method(session=%(key)s) failed. Module: %(module)s. Method: "
+"%(method)s. args: %(args)s. kwargs: %(kwargs)s. Iteration: %(n)s. Exception: "
+"%(ex)s. "
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:857
+#, python-format
+msgid "In vmwareapi: _call_method (session=%s)"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:872
+#: nova/virt/vmwareapi/driver.py:916
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:878
+#: nova/virt/vmwareapi/driver.py:922
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:884
+#: nova/virt/vmwareapi/driver.py:928
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -11454,48 +11283,85 @@
 msgid "No default value for use_linked_clone found."
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:48 nova/virt/xenapi/fake.py:81
+#: nova/virt/vmwareapi/error_util.py:136
+msgid "Resource already exists."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:141
+msgid "Cannot delete file."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:146
+msgid "File already exists."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:151
+msgid "File fault."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:156
+msgid "File locked."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:161
+msgid "File not found."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:166
+msgid "Invalid property."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:171
+msgid "Not Authenticated."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:194
+#, python-format
+msgid "Fault %s not matched."
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:47 nova/virt/xenapi/fake.py:80
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:238
+#: nova/virt/vmwareapi/fake.py:220
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:863
+#: nova/virt/vmwareapi/fake.py:753
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:865 nova/virt/vmwareapi/fake.py:1062
+#: nova/virt/vmwareapi/fake.py:755 nova/virt/vmwareapi/fake.py:948
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:934
+#: nova/virt/vmwareapi/fake.py:824
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:949
+#: nova/virt/vmwareapi/fake.py:839
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:952
+#: nova/virt/vmwareapi/fake.py:842
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:1059
+#: nova/virt/vmwareapi/fake.py:945
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:42
+#: nova/virt/vmwareapi/host.py:40
 #, python-format
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:65
+#: nova/virt/vmwareapi/host.py:63
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
@@ -11521,6 +11387,11 @@
 msgid "Creating Port Group with name %s on the ESX host"
 msgstr ""
 
+#: nova/virt/vmwareapi/network_util.py:170
+#, python-format
+msgid "Port Group %s already exists."
+msgstr ""
+
 #: nova/virt/vmwareapi/network_util.py:174
 #, python-format
 msgid "Created Port Group with name %s on the ESX host"
@@ -11532,139 +11403,166 @@
 "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vif.py:116
+#: nova/virt/vmwareapi/vif.py:114
 #, python-format
 msgid ""
 "No valid network found in %(opaque)s, from %(bridge)s or "
 "%(integration_bridge)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vim.py:111
+#: nova/virt/vmwareapi/vim.py:87
 msgid "Unable to import suds."
 msgstr ""
 
-#: nova/virt/vmwareapi/vim.py:202
+#: nova/virt/vmwareapi/vim.py:174
 #, python-format
 msgid "No such SOAP method '%s' provided by VI SDK"
 msgstr ""
 
-#: nova/virt/vmwareapi/vim.py:207
+#: nova/virt/vmwareapi/vim.py:179
 #, python-format
 msgid "httplib error in %s: "
 msgstr ""
 
-#: nova/virt/vmwareapi/vim.py:214
+#: nova/virt/vmwareapi/vim.py:211
+#, python-format
+msgid "urllib2 error in  %s: "
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:186
 #, python-format
 msgid "Socket error in %s: "
 msgstr ""
 
-#: nova/virt/vmwareapi/vim.py:219
+#: nova/virt/vmwareapi/vim.py:191
 #, python-format
 msgid "Type error in  %s: "
 msgstr ""
 
-#: nova/virt/vmwareapi/vim.py:223
+#: nova/virt/vmwareapi/vim.py:195
 #, python-format
 msgid "Exception in %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vim_util.py:192
+#: nova/virt/vmwareapi/vim_util.py:190
 #, python-format
 msgid "Unable to retrieve value for %(path)s Reason: %(reason)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vm_util.py:836
+#: nova/virt/vmwareapi/vm_util.py:1031
 msgid "No host available on cluster"
 msgstr ""
 
-#: nova/virt/vmwareapi/vm_util.py:1028
+#: nova/virt/vmwareapi/vm_util.py:970
 #, python-format
 msgid "Failed to get cluster references %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vm_util.py:1040
+#: nova/virt/vmwareapi/vm_util.py:982
 #, python-format
 msgid "Failed to get resource pool references %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:106
+#: nova/virt/vmwareapi/vmops.py:101
 msgid "Getting list of instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:132
+#: nova/virt/vmwareapi/vmops.py:127
 #, python-format
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:137
+#: nova/virt/vmwareapi/vmops.py:133
 #, python-format
 msgid "Extending root virtual disk to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:151
+#: nova/virt/vmwareapi/vmops.py:148
 #, python-format
 msgid "Extending virtual disk failed with error: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:158
+#: nova/virt/vmwareapi/vmops.py:144
 msgid "Extended root virtual disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:161
+#: nova/virt/vmwareapi/vmops.py:158
 #, python-format
 msgid "Deleting the datastore file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:172
+#: nova/virt/vmwareapi/vmops.py:175
+#, python-format
+msgid ""
+"Unable to delete %(ds)s. There may be more than one process or thread that "
+"tries to delete the file. Exception: %(ex)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:180
 msgid "Deleted the datastore file"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198 nova/virt/xenapi/vmops.py:334
+#: nova/virt/xenapi/vmops.py:334
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:256
+#: nova/virt/vmwareapi/vmops.py:213
 msgid "Image disk size greater than requested disk size"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:293
+#: nova/virt/vmwareapi/vmops.py:251
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:301
+#: nova/virt/vmwareapi/vmops.py:259
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:324
+#: nova/virt/vmwareapi/vmops.py:345
+#, python-format
+msgid "Creating temporary folder for %(folder)s on datastore %(datastore)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter type "
 "%(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:343
+#: nova/virt/vmwareapi/vmops.py:302
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:353
+#: nova/virt/vmwareapi/vmops.py:379
+#, python-format
+msgid "Moving temporary folder %(tmp)s to cache folder %(cache)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:399
+#, python-format
+msgid "File %(folder)s already exists on %(ds)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:404
 #, python-format
 msgid ""
-"Downloading image file data %(image_ref)s to the ESX data store "
+"Downloading image file data %(image_ref)s to the data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:373
+#: nova/virt/vmwareapi/vmops.py:424
 #, python-format
 msgid ""
-"Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the ESX "
-"data store %(data_store_name)s"
+"Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the data "
+"store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:387
+#: nova/virt/vmwareapi/vmops.py:367
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type "
@@ -11672,308 +11570,301 @@
 "type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:408
+#: nova/virt/vmwareapi/vmops.py:388
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:501
+#: nova/virt/vmwareapi/vmops.py:475
 #, python-format
 msgid "Copying root disk of size %sGb"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:551
-msgid "Powering on the VM instance"
+#: nova/virt/vmwareapi/vmops.py:582
+#, python-format
+msgid "Root disk file creation failed - %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
-msgid "Powered on the VM instance"
+#: nova/virt/vmwareapi/vmops.py:525
+msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:567
-msgid "Using config drive for instance"
+#: nova/virt/vmwareapi/vmops.py:531
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:606
+#: nova/virt/vmwareapi/vmops.py:582
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(instance_name)s to attach cdrom %(file_path)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:614
+#: nova/virt/vmwareapi/vmops.py:590
 #, python-format
 msgid ""
 "Reconfigured VM instance %(instance_name)s to attach cdrom %(file_path)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:710
+#: nova/virt/vmwareapi/vmops.py:686
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:720
+#: nova/virt/vmwareapi/vmops.py:696
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:741
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:778
+#: nova/virt/vmwareapi/vmops.py:754
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:787
+#: nova/virt/vmwareapi/vmops.py:763
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:777
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:858
+#: nova/virt/vmwareapi/vmops.py:840
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:865
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:868
+#: nova/virt/vmwareapi/vmops.py:850
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:870
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:874
+#: nova/virt/vmwareapi/vmops.py:856
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:886 nova/virt/vmwareapi/vmops.py:1199
+#: nova/virt/vmwareapi/vmops.py:868 nova/virt/vmwareapi/vmops.py:1183
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:891 nova/virt/vmwareapi/vmops.py:1204
+#: nova/virt/vmwareapi/vmops.py:873 nova/virt/vmwareapi/vmops.py:1188
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:875
 #, python-format
 msgid ""
 "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:923 nova/virt/vmwareapi/vmops.py:1071
+#: nova/virt/vmwareapi/vmops.py:906 nova/virt/vmwareapi/vmops.py:1055
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:928 nova/virt/vmwareapi/vmops.py:1076
+#: nova/virt/vmwareapi/vmops.py:911 nova/virt/vmwareapi/vmops.py:1060
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:932
+#: nova/virt/vmwareapi/vmops.py:915
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:935
+#: nova/virt/vmwareapi/vmops.py:918
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:937
+#: nova/virt/vmwareapi/vmops.py:920
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the VM: "
 "%s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:946
+#: nova/virt/vmwareapi/vmops.py:933
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:961
+#: nova/virt/vmwareapi/vmops.py:945
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:950
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:974
+#: nova/virt/vmwareapi/vmops.py:958
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:978
+#: nova/virt/vmwareapi/vmops.py:962
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:989
+#: nova/virt/vmwareapi/vmops.py:973
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:993
+#: nova/virt/vmwareapi/vmops.py:977
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:980
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:999
+#: nova/virt/vmwareapi/vmops.py:983
 msgid ""
 "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:993
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1014
+#: nova/virt/vmwareapi/vmops.py:998
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1016
+#: nova/virt/vmwareapi/vmops.py:1000
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1079
+#: nova/virt/vmwareapi/vmops.py:1063
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1082
+#: nova/virt/vmwareapi/vmops.py:1066
 msgid ""
 "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1093
+#: nova/virt/vmwareapi/vmops.py:1077
 msgid ""
 "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1097
+#: nova/virt/vmwareapi/vmops.py:1081
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1102
+#: nova/virt/vmwareapi/vmops.py:1086
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1122
+#: nova/virt/vmwareapi/vmops.py:1106
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1153
+#: nova/virt/vmwareapi/vmops.py:1137
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1143
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1175
+#: nova/virt/vmwareapi/vmops.py:1158
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1183
+#: nova/virt/vmwareapi/vmops.py:1166
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1195
+#: nova/virt/vmwareapi/vmops.py:1179
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1206
+#: nova/virt/vmwareapi/vmops.py:1190
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying "
 "the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1219
+#: nova/virt/vmwareapi/vmops.py:1206
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1225
+#: nova/virt/vmwareapi/vmops.py:1212
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1260
+#: nova/virt/vmwareapi/vmops.py:1237
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1272
+#: nova/virt/vmwareapi/vmops.py:1249
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1282 nova/virt/xenapi/vmops.py:1506
+#: nova/virt/vmwareapi/vmops.py:1259 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286 nova/virt/xenapi/vmops.py:1510
+#: nova/virt/vmwareapi/vmops.py:1263 nova/virt/xenapi/vmops.py:1397
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1364
+#: nova/virt/vmwareapi/vmops.py:1335
 #, python-format
 msgid "VM %(uuid)s is currently on host %(host_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1415
+#: nova/virt/vmwareapi/vmops.py:1386
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1421
+#: nova/virt/vmwareapi/vmops.py:1392
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1433
+#: nova/virt/vmwareapi/vmops.py:1404
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1440
+#: nova/virt/vmwareapi/vmops.py:1411
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1529
+#: nova/virt/vmwareapi/vmops.py:1509
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1535
+#: nova/virt/vmwareapi/vmops.py:1515
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1562
-msgid "VIF plugging is not supported by the VMware driver."
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:1567
-msgid "VIF unplugging is not supported by the VMware driver."
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:1580
+#: nova/virt/vmwareapi/vmops.py:1560
 #, python-format
 msgid ""
 "Will copy while retaining adapter type %(adapter_type)s and disk type "
@@ -12010,36 +11901,31 @@
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:172
+#: nova/virt/vmwareapi/vmware_images.py:170
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:183
+#: nova/virt/vmwareapi/vmware_images.py:181
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:188
+#: nova/virt/vmwareapi/vmware_images.py:186
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volume_util.py:159
+#: nova/virt/vmwareapi/volume_util.py:164
 #, python-format
 msgid "Rescanning HBA %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volume_util.py:162
+#: nova/virt/vmwareapi/volume_util.py:167
 #, python-format
 msgid "Rescanned HBA %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/volume_util.py:174 nova/virt/xenapi/volume_utils.py:277
-#, python-format
-msgid "Mountpoint cannot be translated: %s"
-msgstr ""
-
 #: nova/virt/vmwareapi/volumeops.py:62
 #, python-format
 msgid ""
@@ -12054,213 +11940,213 @@
 "device %(device_name)s with type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:125
+#: nova/virt/vmwareapi/volumeops.py:124
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(instance_name)s to detach disk %(disk_key)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:133
+#: nova/virt/vmwareapi/volumeops.py:132
 #, python-format
 msgid ""
 "Reconfigured VM instance %(instance_name)s to detach disk %(disk_key)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:141
+#: nova/virt/vmwareapi/volumeops.py:140
 #, python-format
 msgid "Discovering iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:146
 msgid "Storage target found. No need to discover"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:155
+#: nova/virt/vmwareapi/volumeops.py:154
 #, python-format
 msgid "Discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:160
+#: nova/virt/vmwareapi/volumeops.py:159
 #, python-format
 msgid ""
 "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:233 nova/virt/vmwareapi/volumeops.py:268
+#: nova/virt/vmwareapi/volumeops.py:232 nova/virt/vmwareapi/volumeops.py:267
 #: nova/virt/xenapi/volumeops.py:61
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:242
+#: nova/virt/vmwareapi/volumeops.py:241
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:253 nova/virt/vmwareapi/volumeops.py:429
+#: nova/virt/vmwareapi/volumeops.py:252 nova/virt/vmwareapi/volumeops.py:427
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:275
+#: nova/virt/vmwareapi/volumeops.py:274
 #, python-format
 msgid "Volume attach. Driver type: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:346
+#: nova/virt/vmwareapi/volumeops.py:345
 #, python-format
 msgid ""
 "The volume has not been displaced from its original location: %s. No "
 "consolidation needed."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:353
+#: nova/virt/vmwareapi/volumeops.py:352
 #, python-format
 msgid ""
 "The volume's backing has been relocated to %s. Need to consolidate backing "
 "disk file."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:393 nova/virt/vmwareapi/volumeops.py:437
+#: nova/virt/vmwareapi/volumeops.py:391 nova/virt/vmwareapi/volumeops.py:435
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:401 nova/virt/vmwareapi/volumeops.py:421
+#: nova/virt/vmwareapi/volumeops.py:399 nova/virt/vmwareapi/volumeops.py:419
 #: nova/virt/xenapi/volumeops.py:134
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:412 nova/virt/vmwareapi/volumeops.py:439
+#: nova/virt/vmwareapi/volumeops.py:410 nova/virt/vmwareapi/volumeops.py:437
 #: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:446
+#: nova/virt/vmwareapi/volumeops.py:444
 #, python-format
 msgid "Volume detach. Driver type: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:459
+#: nova/virt/vmwareapi/volumeops.py:457
 #, python-format
 msgid "Root volume attach. Driver type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:126 nova/virt/xenapi/vmops.py:1781
+#: nova/virt/xenapi/agent.py:109 nova/virt/xenapi/vmops.py:1655
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:131 nova/virt/xenapi/vmops.py:1786
+#: nova/virt/xenapi/agent.py:114 nova/virt/xenapi/vmops.py:1660
 #, 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:136 nova/virt/xenapi/vmops.py:1791
+#: nova/virt/xenapi/agent.py:119 nova/virt/xenapi/vmops.py:1665
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:146
+#: nova/virt/xenapi/agent.py:129
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:136
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:142
 #, python-format
 msgid "The agent call to %(method)s was successful: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:185
+#: nova/virt/xenapi/agent.py:183
 #, python-format
 msgid "Ignoring error while configuring instance with agent: %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:167
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:232
+#: nova/virt/xenapi/vmops.py:642
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is %(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:235
+#: nova/virt/xenapi/vmops.py:645
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:246
+#: nova/virt/xenapi/agent.py:186
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:250
+#: nova/virt/xenapi/agent.py:248
 msgid "Skipping agent update."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:258
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:291
+#: nova/virt/xenapi/agent.py:227
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:244
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:318
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping agent ssh key injection for this image."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:266
 msgid "Skipping agent file injection for this image."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:342
+#: nova/virt/xenapi/agent.py:273
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:352
+#: nova/virt/xenapi/agent.py:283
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:387
+#: nova/virt/xenapi/agent.py:318
 msgid ""
 "XenServer tools installed in this image are capable of network injection.  "
 "Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:395
+#: nova/virt/xenapi/agent.py:326
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:399
+#: nova/virt/xenapi/agent.py:330
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:413
+#: nova/virt/xenapi/agent.py:344
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:455
+#: nova/virt/xenapi/agent.py:386
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -12271,68 +12157,80 @@
 "connection_password to use compute_driver=xenapi.XenAPIDriver"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:178
+#: nova/virt/xenapi/driver.py:172
+msgid ""
+"The xenapi driver does not meet the Nova project's requirements for quality "
+"verification and is planned for removal. This may change, but users should "
+"plan accordingly. Additional details here: "
+"https://wiki.openstack.org/wiki/HypervisorSupportMatrix/DeprecationPlan"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:164
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:407
+#: nova/virt/xenapi/driver.py:388
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:638
+#: nova/virt/xenapi/driver.py:608
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:762 nova/virt/xenapi/fake.py:870
-#: nova/virt/xenapi/fake.py:889 nova/virt/xenapi/fake.py:957
+#: nova/virt/xenapi/fake.py:749 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:876 nova/virt/xenapi/fake.py:944
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:764
+#: nova/virt/xenapi/fake.py:751
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:797
+#: nova/virt/xenapi/fake.py:784
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:803
+#: nova/virt/xenapi/fake.py:790
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:806
+#: nova/virt/xenapi/fake.py:793
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:872
+#: nova/virt/xenapi/fake.py:859
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:74
+#: nova/virt/xenapi/host.py:73
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database: "
 "assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:86
+#: nova/virt/xenapi/host.py:85
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
-#: nova/virt/xenapi/host.py:106
+#: nova/virt/xenapi/host.py:105
 #, python-format
 msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
+#: nova/virt/xenapi/host.py:196
+msgid "Failed to parse information about a pci device for passthrough"
+msgstr ""
+
 #: nova/virt/xenapi/host.py:211
 #, python-format
 msgid "Failed to extract instance support from %s"
@@ -12362,91 +12260,91 @@
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:72
+#: nova/virt/xenapi/pool.py:71
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:155
+#: nova/virt/xenapi/pool.py:159
 #, python-format
 msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:170
+#: nova/virt/xenapi/pool.py:176
 #, python-format
 msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:193
 #, python-format
 msgid "Pool-Join failed: %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:190
+#: nova/virt/xenapi/pool.py:196
 #, python-format
 msgid "Unable to join %s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:206
+#: nova/virt/xenapi/pool.py:212
 #, python-format
 msgid "Pool-eject failed: %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:218
+#: nova/virt/xenapi/pool.py:224
 #, python-format
 msgid "Unable to set up pool: %s."
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:229
+#: nova/virt/xenapi/pool.py:235
 #, python-format
 msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vif.py:105
+#: nova/virt/xenapi/vif.py:102
 #, python-format
 msgid "Found no PIF for device %s"
 msgstr ""
 
-#: nova/virt/xenapi/vif.py:124
+#: nova/virt/xenapi/vif.py:121
 #, python-format
 msgid ""
 "PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. Expected "
 "%(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:236
+#: nova/virt/xenapi/vm_utils.py:234
 #, python-format
 msgid ""
 "Device id %(id)s specified is not supported by hypervisor version %(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:351 nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:370
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:407
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
@@ -12458,59 +12356,59 @@
 "%(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:444
+#: nova/virt/xenapi/vm_utils.py:374
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:447
+#: nova/virt/xenapi/vm_utils.py:379
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:458
+#: nova/virt/xenapi/vm_utils.py:390
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:480
+#: nova/virt/xenapi/vm_utils.py:412
 #, python-format
 msgid ""
 "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:484
+#: nova/virt/xenapi/vm_utils.py:416
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:511
+#: nova/virt/xenapi/vm_utils.py:443
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:538
+#: nova/virt/xenapi/vm_utils.py:470
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) on "
 "%(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:554
+#: nova/virt/xenapi/vm_utils.py:486
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:579
+#: nova/virt/xenapi/vm_utils.py:511
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:668
+#: nova/virt/xenapi/vm_utils.py:602
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:648
 #, python-format
 msgid "No primary VDI found for %s"
 msgstr ""
@@ -12519,371 +12417,389 @@
 msgid "Error while removing sm_config"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:777
+#: nova/virt/xenapi/vm_utils.py:660
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:827
+#: nova/virt/xenapi/vm_utils.py:705
 #, python-format
 msgid ""
 "Only file-based SRs (ext/NFS) are supported by this feature.  SR %(uuid)s is "
 "of type %(type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:851
+#: nova/virt/xenapi/vm_utils.py:729
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:905
 #, python-format
 msgid "Multiple base images for image: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:913 nova/virt/xenapi/vmops.py:1033
+#: nova/virt/xenapi/vm_utils.py:942
+#, python-format
+msgid ""
+"Resizing up VDI %(vdi_ref)s from %(virtual_size)d to %(new_disk_size)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:953
+msgid "No need to change vdi virtual size."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:960
+#, python-format
+msgid "VDI %s is bigger than requested resize up size."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:962
+msgid "VDI too big for requested resize up."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:784 nova/virt/xenapi/vmops.py:928
 msgid "Can't resize a disk to 0 GB."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:958
+#: nova/virt/xenapi/vm_utils.py:831
 msgid "Skipping auto_config_disk as destination size is 0GB"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:965
+#: nova/virt/xenapi/vm_utils.py:838
 msgid "Disk must have only one partition."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:973
+#: nova/virt/xenapi/vm_utils.py:846
 #, python-format
 msgid "Disk contains a filesystem we are unable to resize: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:982
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Attempted auto_configure_disk failed because: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:976
 #, python-format
 msgid ""
 "Error when generating ephemeral disk. Device: %(userdevice)s Size GB: "
 "%(size_gb)s Error: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1203
+#: nova/virt/xenapi/vm_utils.py:1070
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1218
+#: nova/virt/xenapi/vm_utils.py:1082
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on this "
 "system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1289
+#: nova/virt/xenapi/vm_utils.py:1139
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1323
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1355
+#: nova/virt/xenapi/vm_utils.py:1422
 #, python-format
 msgid "Invalid value '%s' for torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1378
+#: nova/virt/xenapi/vm_utils.py:1445
 #, python-format
 msgid "Invalid value '%d' for image_compression_level"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1389
+#: nova/virt/xenapi/vm_utils.py:1239
 #, python-format
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1404
+#: nova/virt/xenapi/vm_utils.py:1254
 #, python-format
 msgid ""
 "Download handler '%(handler)s' raised an exception, falling back to default "
 "handler '%(default_handler)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1440
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1525
 #, python-format
-msgid ""
-"Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
+msgid "Image size %(size)d exceeded flavor allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1333
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1350
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1510
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1529
+#: nova/virt/xenapi/vm_utils.py:1379
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1543
+#: nova/virt/xenapi/vm_utils.py:1393
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1552
+#: nova/virt/xenapi/vm_utils.py:1402
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1647
+#: nova/virt/xenapi/vm_utils.py:1521
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1750
+#: nova/virt/xenapi/vm_utils.py:1624
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1845
 #, python-format
 msgid "Scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1780
+#: nova/virt/xenapi/vm_utils.py:1856
 #, python-format
 msgid "Retry SR scan due to error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1813
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1834
+#: nova/virt/xenapi/vm_utils.py:1684
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances on. "
 "Please check your configuration (e.g. set a default SR for the pool) and/or "
 "configure the flag 'sr_matching_filter'."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1847
+#: nova/virt/xenapi/vm_utils.py:1697
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1855
+#: nova/virt/xenapi/vm_utils.py:1705
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1857
+#: nova/virt/xenapi/vm_utils.py:1707
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1860
+#: nova/virt/xenapi/vm_utils.py:1710
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1713
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1867
+#: nova/virt/xenapi/vm_utils.py:1717
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1869
+#: nova/virt/xenapi/vm_utils.py:1719
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1872
+#: nova/virt/xenapi/vm_utils.py:1722
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1875
+#: nova/virt/xenapi/vm_utils.py:1725
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1878
+#: nova/virt/xenapi/vm_utils.py:1728
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1900
+#: nova/virt/xenapi/vm_utils.py:1750
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1934
+#: nova/virt/xenapi/vm_utils.py:1784
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2022
+#: nova/virt/xenapi/vm_utils.py:1874
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2034
+#: nova/virt/xenapi/vm_utils.py:1886
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2069
+#: nova/virt/xenapi/vm_utils.py:1921
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2089
+#: nova/virt/xenapi/vm_utils.py:1941
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2102
+#: nova/virt/xenapi/vm_utils.py:1954
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2105
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2107
+#: nova/virt/xenapi/vm_utils.py:1959
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2111
+#: nova/virt/xenapi/vm_utils.py:1963
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2117
+#: nova/virt/xenapi/vm_utils.py:1969
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2125
+#: nova/virt/xenapi/vm_utils.py:1977
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2167
+#: nova/virt/xenapi/vm_utils.py:2019
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2173
+#: nova/virt/xenapi/vm_utils.py:2025
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2199
+#: nova/virt/xenapi/vm_utils.py:2051
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to %(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2208
+#: nova/virt/xenapi/vm_utils.py:2061
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2244
+#: nova/virt/xenapi/vm_utils.py:2324
 msgid ""
 "Shrinking the filesystem down with resize2fs has failed, please check if you "
 "have enough free space on your disk."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2284
+#: nova/virt/xenapi/vm_utils.py:2145
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2320
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2373
+#: nova/virt/xenapi/vm_utils.py:2234
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2382
+#: nova/virt/xenapi/vm_utils.py:2243
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2494
+#: nova/virt/xenapi/vm_utils.py:2576
 msgid "This domU must be running on the host specified by connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2551
+#: nova/virt/xenapi/vmops.py:760
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2563
+#: nova/virt/xenapi/vmops.py:769
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2589
+#: nova/virt/xenapi/vm_utils.py:2671
 msgid "ipxe_boot_menu_url not set, user will have to enter URL manually..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2595
+#: nova/virt/xenapi/vm_utils.py:2677
 msgid "ipxe_network_name not set, user will have to enter IP manually..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2606
+#: nova/virt/xenapi/vm_utils.py:2416
 #, python-format
 msgid ""
 "Unable to find network matching '%(network_name)s', user will have to enter "
 "IP manually..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2630
+#: nova/virt/xenapi/vm_utils.py:2440
 #, python-format
 msgid "ISO creation tool '%s' does not exist."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:172
+#: nova/virt/xenapi/vmops.py:179
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:187
+#: nova/virt/xenapi/vmops.py:194
 msgid "Error: Agent is disabled"
 msgstr ""
 
@@ -12891,278 +12807,280 @@
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:414
+#: nova/virt/xenapi/vmops.py:413
 msgid "ipxe_boot is True but no ISO image found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:507
+#: nova/virt/xenapi/vmops.py:504
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Using PV kernel: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:574
+#: nova/virt/xenapi/vmops.py:593
 msgid "Auto configuring disk, attempting to resize root disk..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:627
+#: nova/virt/xenapi/vmops.py:626
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:658
 msgid "Skip agent setup, not enabled."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:646
+#: nova/virt/xenapi/vmops.py:665
 msgid "Skip agent setup, unable to contact agent."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:669
 #, python-format
 msgid "Detected agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:739
+#: nova/virt/xenapi/vmops.py:756
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:758
+#: nova/virt/xenapi/vmops.py:788
 #, python-format
 msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:795
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:769
+#: nova/virt/xenapi/vmops.py:799
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:803
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:828
+#: nova/virt/xenapi/vmops.py:857
 #, python-format
 msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:879
+#: nova/virt/xenapi/vmops.py:897
 msgid "Migrated root base vhds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:913
 msgid "Migrated all base vhds."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:930
+#: nova/virt/xenapi/vmops.py:947
 #, python-format
 msgid "Read-only migrated for disk: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:985
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "_migrate_disk_resizing_up failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1005
 #, python-format
 msgid "_migrate_disk_resizing_up failed to rollback: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1009
-msgid "Unable to resize ephemeral disks"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1082
-#, python-format
-msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1089
-msgid "Resize complete"
+#: nova/virt/xenapi/vmops.py:1022
+msgid "Can't resize down ephemeral disks."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1029
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1140
+#: nova/virt/xenapi/vmops.py:1035
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting halted "
 "instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1219
+#: nova/virt/xenapi/vmops.py:1114
 msgid "Unable to update metadata, VM not found."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1262
+#: nova/virt/xenapi/vmops.py:1157
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1266
+#: nova/virt/xenapi/vmops.py:1161
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1293
+#: nova/virt/xenapi/vmops.py:1188
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1300
+#: nova/virt/xenapi/vmops.py:1195
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1308
+#: nova/virt/xenapi/vmops.py:1203
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1335
+#: nova/virt/xenapi/vmops.py:1230
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1364
+#: nova/virt/xenapi/vmops.py:1259
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1415
+#: nova/virt/xenapi/vmops.py:1310
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1457
+#: nova/virt/xenapi/vmops.py:1344
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1660
+#: nova/virt/xenapi/vmops.py:1547
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1682
+#: nova/virt/xenapi/vmops.py:1569
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1691
+#: nova/virt/xenapi/vmops.py:1578
 #, python-format
 msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1694
+#: nova/virt/xenapi/vmops.py:1581
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1729
+#: nova/virt/xenapi/vmops.py:1718
 #, python-format
 msgid "Injecting hostname (%s) into xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1739
+#: nova/virt/xenapi/vmops.py:1618
 msgid "Removing hostname from xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1847
+#: nova/virt/xenapi/vmops.py:1721
 #, python-format
 msgid ""
 "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1868
+#: nova/virt/xenapi/vmops.py:1742
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1874
+#: nova/virt/xenapi/vmops.py:1865
 #, python-format
 msgid "PIF %s does not contain IP address"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1887
+#: nova/virt/xenapi/vmops.py:1754
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1961
+#: nova/virt/xenapi/vmops.py:1952
 msgid "XAPI supporting relax-xsm-sr-check=true required"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1972
+#: nova/virt/xenapi/vmops.py:1963
 #, python-format
 msgid "assert_can_migrate failed because: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:2032
+#: nova/virt/xenapi/vmops.py:1892
 msgid "Migrate Send failed"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:53
+#: nova/virt/xenapi/volume_utils.py:52
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:63
+#: nova/virt/xenapi/volume_utils.py:62
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:70
+#: nova/virt/xenapi/volume_utils.py:69
 msgid "Creating PBD for SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:73
+#: nova/virt/xenapi/volume_utils.py:72
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:84
+#: nova/virt/xenapi/volume_utils.py:83
 msgid "Forgetting SR..."
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:106
+#: nova/virt/xenapi/volume_utils.py:105
 #, python-format
 msgid "Unable to find SR from VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:123
+#: nova/virt/xenapi/volume_utils.py:122
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:131
+#: nova/virt/xenapi/volume_utils.py:130
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:155
+#: nova/virt/xenapi/volume_utils.py:154
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:163
+#: nova/virt/xenapi/volume_utils.py:176
+#, python-format
+msgid ""
+"VDI not found on SR %(sr)s (vdi_uuid %(vdi_uuid)s, target_lun %(target_lun)s)"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:162
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:185
+#: nova/virt/xenapi/volume_utils.py:184
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:195
+#: nova/virt/xenapi/volume_utils.py:194
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:204 nova/virt/xenapi/volume_utils.py:251
+#: nova/virt/xenapi/volume_utils.py:203 nova/virt/xenapi/volume_utils.py:250
 #, python-format
 msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:245
+#: nova/virt/xenapi/volume_utils.py:244
 #, python-format
 msgid "(vol_id,host,port,iqn): (%(vol_id)s,%(host)s,%(port)s,%(iqn)s)"
 msgstr ""
 
+#: nova/virt/vmwareapi/volume_util.py:179 nova/virt/xenapi/volume_utils.py:276
+#, python-format
+msgid "Mountpoint cannot be translated: %s"
+msgstr ""
+
 #: nova/virt/xenapi/volumeops.py:48
 #, python-format
 msgid ""
@@ -13179,7 +13097,7 @@
 msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
-#: nova/virt/xenapi/client/session.py:69
+#: nova/virt/xenapi/driver.py:662
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
@@ -13188,39 +13106,34 @@
 msgid "Plugin version mismatch (Expected %(exp)s, got %(got)s)"
 msgstr ""
 
-#: nova/virt/xenapi/client/session.py:121
+#: nova/virt/xenapi/driver.py:702
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/client/session.py:197
+#: nova/virt/xenapi/driver.py:787
 #, python-format
 msgid "%(plugin)s.%(fn)s attempt %(attempt)d/%(attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/client/session.py:211
+#: nova/virt/xenapi/driver.py:796
 #, python-format
 msgid "%(plugin)s.%(fn)s failed. Retrying call."
 msgstr ""
 
-#: nova/virt/xenapi/client/session.py:221
+#: nova/virt/xenapi/driver.py:809
 msgid "RetryableError, so retrying upload_vhd"
 msgstr ""
 
-#: nova/virt/xenapi/client/session.py:225
+#: nova/virt/xenapi/driver.py:813
 msgid "Error due to a signal, retrying upload_vhd"
 msgstr ""
 
-#: nova/virt/xenapi/client/session.py:243
-#: nova/virt/xenapi/client/session.py:257
+#: nova/virt/xenapi/driver.py:831 nova/virt/xenapi/driver.py:845
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
 #: nova/virt/xenapi/image/bittorrent.py:90
-msgid "No torrent URL fetcher extension found, using default."
-msgstr ""
-
-#: nova/virt/xenapi/image/bittorrent.py:107
 #, python-format
 msgid "Loading torrent URL fetcher from entry points %(ep)s"
 msgstr ""
@@ -13273,12 +13186,12 @@
 msgid "status must be 'available'"
 msgstr ""
 
-#: nova/volume/encryptors/__init__.py:44
+#: nova/volume/encryptors/__init__.py:45
 #, python-format
 msgid "Error instantiating %(provider)s: %(exception)s"
 msgstr ""
 
-#: nova/volume/encryptors/__init__.py:59
+#: nova/volume/encryptors/__init__.py:63
 #, python-format
 msgid ""
 "Failed to retrieve encryption metadata for volume %(volume_id)s: "
diff -Nru language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/screen-resolution-extra.po language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/screen-resolution-extra.po
--- language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/screen-resolution-extra.po	2014-02-24 08:27:31.000000000 +0000
+++ language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/screen-resolution-extra.po	2014-03-24 09:48:15.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:10+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:43+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../ScreenResolution/ui.py:60
 msgid ""
diff -Nru language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/software-properties.po language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/software-properties.po
--- language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/software-properties.po	2014-02-24 08:27:31.000000000 +0000
+++ language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/software-properties.po	2014-03-24 09:48:15.000000000 +0000
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: software-properties\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-02-10 15:29+0000\n"
-"PO-Revision-Date: 2014-02-11 08:30+0000\n"
+"POT-Creation-Date: 2014-02-28 21:39+0000\n"
+"PO-Revision-Date: 2014-03-07 11:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Filipino <fil@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:47+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:13+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../data/com.ubuntu.softwareproperties.policy.in.h:1
 msgid "Write Configuration"
diff -Nru language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/ubuntuone-control-panel.po language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/ubuntuone-control-panel.po
--- language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/ubuntuone-control-panel.po	2014-02-24 08:27:32.000000000 +0000
+++ language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/ubuntuone-control-panel.po	2014-03-24 09:48:16.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:35+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:13+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: fil\n"
 
 #: ../ubuntuone-installer.desktop.in.h:1
diff -Nru language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/update-manager.po language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/update-manager.po
--- language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/update-manager.po	2014-02-24 08:27:31.000000000 +0000
+++ language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/update-manager.po	2014-03-24 09:48:15.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2014-01-16 12:05+0000\n"
+"POT-Creation-Date: 2014-03-17 16:42+0000\n"
 "PO-Revision-Date: 2013-06-08 22:54+0000\n"
 "Last-Translator: Arnel A. Borja <Unknown>\n"
 "Language-Team: Filipino <fil@li.org>\n"
@@ -15,43 +15,43 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:54+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:11+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: fil\n"
 
-#: ../UpdateManager/backend/InstallBackendAptdaemon.py:62
+#: ../UpdateManager/backend/InstallBackendAptdaemon.py:67
 msgid "Checking for updates…"
 msgstr ""
 
-#: ../UpdateManager/backend/InstallBackendAptdaemon.py:84
+#: ../UpdateManager/backend/InstallBackendAptdaemon.py:92
 msgid "Installing updates…"
 msgstr ""
 
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
 msgid "Please wait, this can take some time."
 msgstr "Maghintay lamang, maaari itong tumagal."
 
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:64
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
 msgid "Update is complete"
 msgstr "Tapos na ang update"
 
-#: ../UpdateManager/ChangelogViewer.py:79
+#: ../UpdateManager/ChangelogViewer.py:73
 msgid "Open Link in Browser"
 msgstr "Buksan ang Link sa Browser"
 
-#: ../UpdateManager/ChangelogViewer.py:83
+#: ../UpdateManager/ChangelogViewer.py:76
 msgid "Copy Link to Clipboard"
 msgstr "Kopyahin ang Link tungo sa Clipboard"
 
-#: ../UpdateManager/Dialogs.py:80
+#: ../UpdateManager/Dialogs.py:115
 msgid "Settings…"
 msgstr "Mga kaayusan..."
 
-#: ../UpdateManager/Dialogs.py:112 ../UpdateManager/UpdateManager.py:192
+#: ../UpdateManager/Dialogs.py:144 ../UpdateManager/UpdateManager.py:247
 msgid "You stopped the check for updates."
 msgstr ""
 
-#: ../UpdateManager/Dialogs.py:114
+#: ../UpdateManager/Dialogs.py:146
 msgid "_Check Again"
 msgstr ""
 
@@ -59,37 +59,38 @@
 msgid "No software updates are available."
 msgstr ""
 
-#: ../UpdateManager/Dialogs.py:124 ../UpdateManager/Dialogs.py:133
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:678
 msgid "The software on this computer is up to date."
 msgstr ""
 
 #. Translators: these are Ubuntu version names like "Ubuntu 12.04"
-#: ../UpdateManager/Dialogs.py:135
+#: ../UpdateManager/Dialogs.py:172
 #, python-format
 msgid "However, %s %s is now available (you have %s)."
 msgstr ""
 
-#: ../UpdateManager/Dialogs.py:140
+#: ../UpdateManager/Dialogs.py:177
 msgid "Upgrade…"
 msgstr ""
 
 #. Translators: this is an Ubuntu version name like "Ubuntu 12.04"
-#: ../UpdateManager/Dialogs.py:162
+#: ../UpdateManager/Dialogs.py:200
 #, python-format
 msgid "Software updates are no longer provided for %s %s."
 msgstr ""
 
 #. Translators: this is an Ubuntu version name like "Ubuntu 12.04"
-#: ../UpdateManager/Dialogs.py:166
+#: ../UpdateManager/Dialogs.py:204
 #, python-format
 msgid "To stay secure, you should upgrade to %s %s."
 msgstr ""
 
-#: ../UpdateManager/Dialogs.py:179
+#: ../UpdateManager/Dialogs.py:217
 msgid "Not all updates can be installed"
 msgstr ""
 
-#: ../UpdateManager/Dialogs.py:181
+#: ../UpdateManager/Dialogs.py:219
 msgid ""
 "Run a partial upgrade, to install as many updates as possible.\n"
 "\n"
@@ -100,11 +101,11 @@
 "     * Normal changes of a pre-release version of Ubuntu"
 msgstr ""
 
-#: ../UpdateManager/Dialogs.py:189
+#: ../data/gtkbuilder/UpdateManager.ui.h:3
 msgid "_Partial Upgrade"
 msgstr "_Bahagiang Upgrade"
 
-#: ../UpdateManager/Dialogs.py:190
+#: ../DistUpgrade/DistUpgrade.ui.h:12
 msgid "_Continue"
 msgstr "_Ipagpatuloy"
 
@@ -112,7 +113,7 @@
 msgid "_Try Again"
 msgstr ""
 
-#: ../UpdateManager/Dialogs.py:232
+#: ../UpdateManager/Dialogs.py:279
 msgid "The computer needs to restart to finish installing updates."
 msgstr ""
 
@@ -125,7 +126,7 @@
 msgstr ""
 
 #. Basic GTK+ parameters
-#: ../UpdateManager/UpdateManager.py:82 ../data/update-manager.desktop.in.h:1
+#: ../UpdateManager/UpdateManager.py:87 ../data/update-manager.desktop.in.h:1
 msgid "Software Updater"
 msgstr ""
 
@@ -133,16 +134,16 @@
 msgid "Some software couldn’t be checked for updates."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:248
 msgid "Updated software is available from a previous check."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:269
+#: ../UpdateManager/UpdateManager.py:1153
 msgid "Software index is broken"
 msgstr "Ang software index ay sira"
 
-#: ../UpdateManager/UpdateManager.py:270
+#: ../UpdateManager/UpdateManager.py:1154
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -152,11 +153,11 @@
 "lamang gamitin ang \"Synaptic\" package manager o parakbuhin ang \"sudo apt-"
 "get install -f\" sa loob ng terminal para maayos ang isyung ito."
 
-#: ../UpdateManager/UpdateManager.py:276
+#: ../UpdateManager/UpdateManager.py:1003
 msgid "Could not initialize the package information"
 msgstr "Hindi ma-initialize ang package information"
 
-#: ../UpdateManager/UpdateManager.py:277
+#: ../UpdateManager/UpdateManager.py:1004
 msgid ""
 "An unresolvable problem occurred while initializing the package "
 "information.\n"
@@ -165,11 +166,12 @@
 "following error message:\n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:292
+#: ../DistUpgrade/DistUpgradeCache.py:697
+#: ../UpdateManager/UpdateManager.py:1032
 msgid "Could not calculate the upgrade"
 msgstr "Hindi makalkula ang upgrade"
 
-#: ../UpdateManager/UpdateManager.py:293
+#: ../UpdateManager/UpdateManager.py:352
 msgid ""
 "An unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -181,8 +183,8 @@
 msgid "Install Now"
 msgstr ""
 
-#: ../UpdateManager/UpdatesAvailable.py:151
-#: ../UpdateManagerText/UpdateManagerText.py:36
+#: ../UpdateManager/UpdateManager.py:229
+#: ../UpdateManagerText/UpdateManagerText.py:32
 msgid "Install"
 msgstr "I-install"
 
@@ -190,60 +192,60 @@
 msgid "Download"
 msgstr ""
 
-#: ../UpdateManager/UpdatesAvailable.py:204
+#: ../UpdateManager/UpdatesAvailable.py:377
 msgid "_Remind Me Later"
 msgstr ""
 
 #. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdatesAvailable.py:250
+#: ../UpdateManager/UpdateManager.py:391
 #, python-format
 msgid "Version %s: \n"
 msgstr "Bersyon %s: \n"
 
-#: ../UpdateManager/UpdatesAvailable.py:308
+#: ../UpdateManager/UpdateManager.py:448
 msgid ""
 "No network connection detected, you can not download changelog information."
 msgstr ""
 
-#: ../UpdateManager/UpdatesAvailable.py:318
+#: ../UpdateManager/UpdateManager.py:456
 msgid "Downloading list of changes..."
 msgstr "Kinukuha ang listahan ng mga pagbabago"
 
-#: ../UpdateManager/UpdatesAvailable.py:363
+#: ../UpdateManager/UpdateManager.py:500
 msgid "_Deselect All"
 msgstr ""
 
-#: ../UpdateManager/UpdatesAvailable.py:366
+#: ../UpdateManager/UpdateManager.py:506
 msgid "Select _All"
 msgstr ""
 
-#: ../UpdateManager/UpdatesAvailable.py:427
+#: ../UpdateManager/UpdateManager.py:570
 #, python-format
 msgid "%s will be downloaded."
 msgstr ""
 
-#: ../UpdateManager/UpdatesAvailable.py:441
+#: ../UpdateManager/UpdatesAvailable.py:746
 msgid "The update has already been downloaded."
 msgid_plural "The updates have already been downloaded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdatesAvailable.py:447
+#: ../UpdateManager/UpdateManager.py:587
 msgid "There are no updates to install."
 msgstr ""
 
-#: ../UpdateManager/UpdatesAvailable.py:456
+#: ../UpdateManager/UpdateManager.py:600
 msgid "Unknown download size."
 msgstr ""
 
-#: ../UpdateManager/UpdatesAvailable.py:476
+#: ../UpdateManager/UpdatesAvailable.py:788
 #, python-format
 msgid ""
 "Updated software has been issued since %s %s was released. Do you want to "
 "install it now?"
 msgstr ""
 
-#: ../UpdateManager/UpdatesAvailable.py:481
+#: ../UpdateManager/UpdatesAvailable.py:793
 msgid ""
 "Updated software is available for this computer. Do you want to install it "
 "now?"
@@ -254,12 +256,13 @@
 "The computer also needs to restart to finish installing previous updates."
 msgstr ""
 
-#. print("on_button_install_clicked")
-#: ../UpdateManager/UpdatesAvailable.py:546
+#. print "on_button_install_clicked"
+#: ../DistUpgrade/DistUpgradeController.py:866
+#: ../UpdateManager/UpdateManager.py:753
 msgid "Not enough free disk space"
 msgstr "Kulang sa libreng disk space"
 
-#: ../UpdateManager/UpdatesAvailable.py:547
+#: ../UpdateManager/UpdateManager.py:754
 #, python-format
 msgid ""
 "The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -267,11 +270,11 @@
 "temporary packages of former installations using 'sudo apt-get clean'."
 msgstr ""
 
-#: ../UpdateManager/UpdatesAvailable.py:573
+#: ../UpdateManager/UpdateManager.py:858
 msgid "Connecting..."
 msgstr ""
 
-#: ../UpdateManager/UpdatesAvailable.py:589
+#: ../UpdateManager/UpdateManager.py:875
 msgid "You may not be able to check for updates or download new updates."
 msgstr ""
 
@@ -279,27 +282,27 @@
 msgid "Security updates"
 msgstr ""
 
-#: ../UpdateManager/Core/UpdateList.py:105
+#: ../UpdateManager/Core/UpdateList.py:70
 msgid "Other updates"
 msgstr "Iba pang mga update"
 
-#: ../UpdateManager/UnitySupport.py:70
+#: ../UpdateManager/UnitySupport.py:66
 msgid "Install All Available Updates"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:35
+#: ../UpdateManagerText/UpdateManagerText.py:31
 msgid "Cancel"
 msgstr "Itigil"
 
-#: ../UpdateManagerText/UpdateManagerText.py:38
+#: ../UpdateManagerText/UpdateManagerText.py:34
 msgid "Changelog"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:41
+#: ../UpdateManagerText/UpdateManagerText.py:37
 msgid "Updates"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:54
+#: ../UpdateManagerText/UpdateManagerText.py:50
 msgid "Building Updates List"
 msgstr "Ginagawa ang Talaan ng mga Update"
 
@@ -317,15 +320,15 @@
 " * Normal changes of a pre-release version of Ubuntu"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:127
+#: ../UpdateManagerText/UpdateManagerText.py:122
 msgid "Downloading changelog"
 msgstr "Kinukuha ang changelog"
 
-#: ../UpdateManager/Core/MyCache.py:346
+#: ../UpdateManager/Core/MyCache.py:316
 msgid "This update does not come from a source that supports changelogs."
 msgstr ""
 
-#: ../UpdateManager/Core/MyCache.py:352 ../UpdateManager/Core/MyCache.py:388
+#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -342,7 +345,7 @@
 "\n"
 msgstr ""
 
-#: ../UpdateManager/Core/MyCache.py:374
+#: ../UpdateManager/Core/MyCache.py:339
 #, python-format
 msgid ""
 "The changelog does not contain any relevant changes.\n"
@@ -351,7 +354,7 @@
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../UpdateManager/Core/MyCache.py:381
+#: ../UpdateManager/Core/MyCache.py:344
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -368,7 +371,7 @@
 msgstr ""
 
 #. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../UpdateManager/Core/utils.py:462
+#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399
 #, python-format
 msgid "%(size).0f kB"
 msgid_plural "%(size).0f kB"
@@ -376,20 +379,20 @@
 msgstr[1] ""
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/Core/utils.py:466
+#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:1
+#: ../data/gtkbuilder/UpdateManager.ui.h:27
 msgid "updates"
 msgstr "mga update"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
+#: ../data/gtkbuilder/UpdateManager.ui.h:32
 msgid "Changes"
 msgstr "Mga Pagbabago"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:3
+#: ../data/gtkbuilder/UpdateManager.ui.h:33
 msgid "Description"
 msgstr "Paglalarawan"
 
@@ -405,18 +408,18 @@
 msgid "The computer will need to restart."
 msgstr ""
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:6
+#: ../data/gtkbuilder/UpdateManager.ui.h:28
 msgid ""
 "You are connected via roaming and may be charged for the data consumed by "
 "this update."
 msgstr ""
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:7
+#: ../data/gtkbuilder/UpdateManager.ui.h:8
 msgid ""
 "You may want to wait until you’re not using a mobile broadband connection."
 msgstr ""
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:8
+#: ../data/gtkbuilder/UpdateManager.ui.h:30
 msgid "It’s safer to connect the computer to AC power before updating."
 msgstr ""
 
@@ -428,151 +431,149 @@
 msgid "Show and install available updates"
 msgstr "Ipakita lahat ng maaaring i-install na update"
 
-#: ../update-manager:70 ../update-manager-text:55
+#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46
 msgid "Show version and exit"
 msgstr "Ipakita ang bersyon at lumabas"
 
-#: ../update-manager:73
+#: ../update-manager:64
 msgid "Directory that contains the data files"
 msgstr ""
 
-#: ../update-manager:76
+#: ../update-manager:67
 msgid "Check if a new Ubuntu release is available"
 msgstr ""
 
-#: ../update-manager:79
+#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182
 msgid "Check if upgrading to the latest devel release is possible"
 msgstr "Tignan kung ang pag-upgrade sa pinakabagong devel release ay maaari"
 
-#: ../update-manager:83
+#: ../update-manager:74
 msgid "Upgrade using the latest proposed version of the release upgrader"
 msgstr ""
 
-#: ../update-manager:90
+#: ../update-manager:81
 msgid "Do not focus on map when starting"
 msgstr ""
 
-#: ../update-manager:93
+#: ../update-manager:87
 msgid "Do not check for updates when starting"
 msgstr ""
 
-#: ../update-manager:97
+#: ../update-manager:91 ../do-release-upgrade:65
 msgid "Test upgrade with a sandbox aufs overlay"
 msgstr ""
 
-#: ../update-manager-text:59
+#: ../update-manager-text:54
 msgid "Show description of the package instead of the changelog"
 msgstr ""
 
-#: ../ubuntu-support-status:91
+#: ../ubuntu-support-status:79
 msgid "Show unsupported packages on this machine"
 msgstr ""
 
-#: ../ubuntu-support-status:94
+#: ../ubuntu-support-status:82
 msgid "Show supported packages on this machine"
 msgstr ""
 
-#: ../ubuntu-support-status:97
+#: ../ubuntu-support-status:85
 msgid "Show all packages with their status"
 msgstr ""
 
-#: ../ubuntu-support-status:100
+#: ../ubuntu-support-status:88
 msgid "Show all packages in a list"
 msgstr ""
 
-#: ../ubuntu-support-status:142
+#: ../ubuntu-support-status:130
 #, c-format
 msgid "Support status summary of '%s':"
 msgstr ""
 
-#: ../ubuntu-support-status:145
+#: ../ubuntu-support-status:133
 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
 msgstr ""
 
-#: ../ubuntu-support-status:151
+#: ../ubuntu-support-status:139
 msgid ""
 "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
 "downloaded"
 msgstr ""
 
-#: ../ubuntu-support-status:154
+#: ../ubuntu-support-status:142
 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
 msgstr ""
 
-#: ../ubuntu-support-status:162
+#: ../ubuntu-support-status:150
 msgid ""
 "Run with --show-unsupported, --show-supported or --show-all to see more "
 "details"
 msgstr ""
 
-#: ../ubuntu-support-status:166
+#: ../ubuntu-support-status:154
 msgid "No longer downloadable:"
 msgstr ""
 
-#: ../ubuntu-support-status:169
+#: ../ubuntu-support-status:157
 msgid "Unsupported: "
 msgstr ""
 
-#: ../ubuntu-support-status:174
+#: ../ubuntu-support-status:162
 #, c-format
 msgid "Supported until %s:"
 msgstr ""
 
-#: ../ubuntu-support-status:183
+#: ../ubuntu-support-status:171
 msgid "Unsupported"
 msgstr ""
 
-#. Why do we use %s here instead of $strings or {} format placeholders?
-#. It's because we don't want to break existing translations.
-#: ../janitor/plugincore/exceptions.py:43
+#: ../Janitor/computerjanitor/exc.py:30
 #, python-format
 msgid "Unimplemented method: %s"
 msgstr ""
 
-#: ../janitor/plugincore/core/file_cruft.py:41
+#: ../Janitor/computerjanitor/file_cruft.py:46
 msgid "A file on disk"
 msgstr ""
 
-#: ../janitor/plugincore/core/missing_package_cruft.py:40
+#: ../Janitor/computerjanitor/missing_package_cruft.py:33
 msgid "Install missing package."
 msgstr "Ini-install ang nawawalang pakete."
 
-#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292.
-#: ../janitor/plugincore/core/missing_package_cruft.py:50
+#: ../Janitor/computerjanitor/missing_package_cruft.py:42
 #, python-format
 msgid "Package %s should be installed."
 msgstr "Ang paketeng %s ay dapat i-install."
 
-#: ../janitor/plugincore/core/package_cruft.py:50
+#: ../Janitor/computerjanitor/package_cruft.py:45
 msgid ".deb package"
 msgstr ".deb package"
 
-#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:47
+#: ../Janitor/plugins/langpack_manual_plugin.py:34
 #, python-format
 msgid "%s needs to be marked as manually installed."
 msgstr "%s ay kailangang markahan bilang mano-manong nai-install"
 
-#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:50
+#: ../Janitor/plugins/kdelibs4to5_plugin.py:39
 msgid ""
 "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
 "installed. See bugs.launchpad.net, bug #279621 for details."
 msgstr ""
 
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:45
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:36
 #, python-format
 msgid "%i obsolete entries in the status file"
 msgstr ""
 
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:48
+#: ../Janitor/plugins/dpkg_status_plugin.py:39
 msgid "Obsolete entries in dpkg status"
 msgstr ""
 
 #. pragma: no cover
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:51
+#: ../Janitor/plugins/dpkg_status_plugin.py:42
 msgid "Obsolete dpkg status entries"
 msgstr ""
 
-#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:43
+#: ../Janitor/plugins/remove_lilo_plugin.py:28
 msgid ""
 "Remove lilo since grub is also installed.(See bug #314004 for details.)"
 msgstr ""
diff -Nru language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/usbcreator.po language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/usbcreator.po
--- language-pack-fil-base-14.04+20140223/data/fil/LC_MESSAGES/usbcreator.po	2014-02-24 08:27:31.000000000 +0000
+++ language-pack-fil-base-14.04+20140320/data/fil/LC_MESSAGES/usbcreator.po	2014-03-24 09:48:15.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: usb-creator\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-02-19 18:39+0000\n"
+"POT-Creation-Date: 2014-03-13 12:00+0000\n"
 "PO-Revision-Date: 2011-04-27 16:55+0000\n"
 "Last-Translator: Ron Philip Gutierrez <iamronipe@gmail.com>\n"
 "Language-Team: Filipino <fil@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:12+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:45+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:1
 msgid "Install the bootloader"
@@ -61,35 +61,35 @@
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. set title of progress window (same as gtk frontend)
-#: .././usbcreator/frontends/kde/frontend.py:210
+#: .././usbcreator/frontends/kde/frontend.py:209
 #: .././usbcreator/frontends/winui/install_window.py:23
-#: .././gui/usbcreator-gtk.ui.h:8 usbcreator/frontends/kde/frontend.py:210
+#: .././gui/usbcreator-gtk.ui.h:8 usbcreator/frontends/kde/frontend.py:209
 msgid "Installing"
 msgstr ""
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. TODO evand 2009-07-28: Better error message.
-#: .././usbcreator/frontends/kde/frontend.py:238
+#: .././usbcreator/frontends/kde/frontend.py:237
 #: .././usbcreator/frontends/gtk/frontend.py:730
 #: .././usbcreator/frontends/winui/frontend.py:87
-#: usbcreator/frontends/kde/frontend.py:238
+#: usbcreator/frontends/kde/frontend.py:237
 msgid "Installation failed."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:414
+#: .././usbcreator/frontends/kde/frontend.py:413
 #: .././usbcreator/frontends/gtk/frontend.py:471
-#: usbcreator/frontends/kde/frontend.py:414
+#: usbcreator/frontends/kde/frontend.py:413
 msgid "The device is not large enough to hold this image."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:416
+#: .././usbcreator/frontends/kde/frontend.py:415
 #: .././usbcreator/frontends/gtk/frontend.py:473
-#: usbcreator/frontends/kde/frontend.py:416
+#: usbcreator/frontends/kde/frontend.py:415
 msgid "There is not enough free space for this image."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:419
-#: usbcreator/frontends/kde/frontend.py:419
+#: .././usbcreator/frontends/kde/frontend.py:418
+#: usbcreator/frontends/kde/frontend.py:418
 msgid "The device needs to be formatted for use."
 msgstr ""
 
@@ -97,58 +97,58 @@
 #. TODO evand 2009-07-28: The list itself needs to be moved into the
 #. base frontend.
 #. To be displayed as a list of file type filters.
-#: .././usbcreator/frontends/kde/frontend.py:453
+#: .././usbcreator/frontends/kde/frontend.py:452
 #: .././usbcreator/frontends/gtk/frontend.py:623
 #: .././usbcreator/frontends/winui/frontend.py:181
-#: usbcreator/frontends/kde/frontend.py:453
+#: usbcreator/frontends/kde/frontend.py:452
 msgid "CD Images"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:453
+#: .././usbcreator/frontends/kde/frontend.py:452
 #: .././usbcreator/frontends/gtk/frontend.py:624
 #: .././usbcreator/frontends/winui/frontend.py:182
-#: usbcreator/frontends/kde/frontend.py:453
+#: usbcreator/frontends/kde/frontend.py:452
 msgid "Disk Images"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:481
-#: usbcreator/frontends/kde/frontend.py:481
+#: .././usbcreator/frontends/kde/frontend.py:480
+#: usbcreator/frontends/kde/frontend.py:480
 msgid "Starting up"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:490
-#: usbcreator/frontends/kde/frontend.py:490
+#: .././usbcreator/frontends/kde/frontend.py:489
+#: usbcreator/frontends/kde/frontend.py:489
 msgid "You must select both source image and target device first."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:517
+#: .././usbcreator/frontends/kde/frontend.py:516
 #: .././usbcreator/frontends/winui/frontend.py:73
-#: usbcreator/frontends/kde/frontend.py:517
+#: usbcreator/frontends/kde/frontend.py:516
 msgid ""
 "The installation is complete.  You may now reboot your computer with this "
 "device inserted to try or install Ubuntu."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:528
-#: usbcreator/frontends/kde/frontend.py:528
+#: .././usbcreator/frontends/kde/frontend.py:527
+#: usbcreator/frontends/kde/frontend.py:527
 msgid "Retry?"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:540
-#: .././gui/usbcreator-gtk.ui.h:9 usbcreator/frontends/kde/frontend.py:540
+#: .././usbcreator/frontends/kde/frontend.py:539
+#: .././gui/usbcreator-gtk.ui.h:9 usbcreator/frontends/kde/frontend.py:539
 msgid "Quit the installation?"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:541
-#: .././gui/usbcreator-gtk.ui.h:10 usbcreator/frontends/kde/frontend.py:541
+#: .././usbcreator/frontends/kde/frontend.py:540
+#: .././gui/usbcreator-gtk.ui.h:10 usbcreator/frontends/kde/frontend.py:540
 msgid "Do you really want to quit the installation now?"
 msgstr ""
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. TODO information about the device we're about to format.
-#: .././usbcreator/frontends/kde/frontend.py:572
+#: .././usbcreator/frontends/kde/frontend.py:571
 #: .././usbcreator/frontends/gtk/frontend.py:791
-#: usbcreator/frontends/kde/frontend.py:572
+#: usbcreator/frontends/kde/frontend.py:571
 msgid "Are you sure you want to erase the entire disk?"
 msgstr ""
 
@@ -509,6 +509,6 @@
 msgid "Error"
 msgstr ""
 
-#: usbcreator/frontends/kde/frontend.py:208
+#: usbcreator/frontends/kde/frontend.py:207
 msgid "Cancel"
 msgstr ""
diff -Nru language-pack-fil-base-14.04+20140223/debian/changelog language-pack-fil-base-14.04+20140320/debian/changelog
--- language-pack-fil-base-14.04+20140223/debian/changelog	2014-02-24 09:11:53.000000000 +0000
+++ language-pack-fil-base-14.04+20140320/debian/changelog	2014-03-24 09:48:14.000000000 +0000
@@ -1,6 +1,6 @@
-language-pack-fil-base (1:14.04+20140223) trusty; urgency=low
+language-pack-fil-base (1:14.04+20140320) trusty; urgency=low
 
   * Initial Release.
 
- -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Mon, 24 Feb 2014 08:27:30 +0000
+ -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Mon, 24 Mar 2014 09:48:14 +0000