Merge "Imported Translations from Zanata"

Author: Zuul

glance/locale/en_GB/LC_MESSAGES/glance.po

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glance VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2020-10-02 06:38+0000\n"
+"POT-Creation-Date: 2020-12-02 23:08+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1375,39 +1375,6 @@ msgstr ""
 "    * image's uuid\n"
 "\n"
 
-msgid ""
-"\n"
-"Role used to identify an authenticated user as administrator.\n"
-"\n"
-"Provide a string value representing a Keystone role to identify an\n"
-"administrative user. Users with this role will be granted\n"
-"administrative privileges.\n"
-"\n"
-"NOTE: The default value for this option has changed in this release.\n"
-"\n"
-"Possible values:\n"
-"    * A string value which is a valid Keystone role\n"
-"\n"
-"Related options:\n"
-"    * None\n"
-"\n"
-msgstr ""
-"\n"
-"Role used to identify an authenticated user as administrator.\n"
-"\n"
-"Provide a string value representing a Keystone role to identify an\n"
-"administrative user. Users with this role will be granted\n"
-"administrative privileges.\n"
-"\n"
-"NOTE: The default value for this option has changed in this release.\n"
-"\n"
-"Possible values:\n"
-"    * A string value which is a valid Keystone role\n"
-"\n"
-"Related options:\n"
-"    * None\n"
-"\n"
-
 msgid ""
 "\n"
 "Rule format for property protection.\n"
@@ -2597,33 +2564,6 @@ msgstr ""
 "    * None\n"
 "\n"
 
-msgid ""
-"\n"
-"This option is redundant as its goal can be achieved via policy file\n"
-"configuration.  Additionally, it can override any configured policies,\n"
-"leading to unexpected behavior and difficulty in policy configuration.\n"
-"The option will be removed early in the Victoria development cycle,\n"
-"following the standard OpenStack deprecation policy.\n"
-"\n"
-"Because this can be a security issue, the default value of this\n"
-"configuration option has been changed in this release.\n"
-"\n"
-"Please see the 'Deprecation Notes' section of the Ussuri Glance\n"
-"Release Notes for more information.\n"
-msgstr ""
-"\n"
-"This option is redundant as its goal can be achieved via policy file\n"
-"configuration.  Additionally, it can override any configured policies,\n"
-"leading to unexpected behaviour and difficulty in policy configuration.\n"
-"The option will be removed early in the Victoria development cycle,\n"
-"following the standard OpenStack deprecation policy.\n"
-"\n"
-"Because this can be a security issue, the default value of this\n"
-"configuration option has been changed in this release.\n"
-"\n"
-"Please see the 'Deprecation Notes' section of the Ussuri Glance\n"
-"Release Notes for more information.\n"
-
 msgid ""
 "\n"
 "This option is redundant.  Control custom image property usage via the\n"

releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po

@@ -6,11 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Glance Release Notes\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-02 06:37+0000\n"
+"POT-Creation-Date: 2020-12-02 23:06+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2020-10-03 10:11+0000\n"
+"PO-Revision-Date: 2020-12-10 01:29+0000\n"
 "Last-Translator: Andi Chandler <[email protected]>\n"
 "Language-Team: English (United Kingdom)\n"
 "Language: en_GB\n"
@@ -140,12 +140,15 @@ msgstr "20.0.0"
 msgid "20.0.1"
 msgstr "20.0.1"
 
-msgid "20.0.1-27"
-msgstr "20.0.1-27"
+msgid "20.0.1-28"
+msgstr "20.0.1-28"
 
 msgid "21.0.0.0rc1"
 msgstr "21.0.0.0rc1"
 
+msgid "21.0.0.0rc1-5"
+msgstr "21.0.0.0rc1-5"
+
 msgid ""
 "A change was added to the import API which provides time-based locking of an "
 "image to exclude other import operations from starting until the lock-"
@@ -2460,6 +2463,15 @@ msgstr ""
 "<https://governance.openstack.org/reference/tags/assert_follows-standard-"
 "deprecation.html>`_."
 
+msgid ""
+"The Glance API configuration option ``admin_role``, having been deprecated "
+"in the Ussuri release, is now removed.  If present in a configuration file, "
+"it will be silently ignored."
+msgstr ""
+"The Glance API configuration option ``admin_role``, having been deprecated "
+"in the Ussuri release, is now removed.  If present in a configuration file, "
+"it will be silently ignored."
+
 msgid ""
 "The Glance API configuration option ``allow_additional_image_properties`` is "
 "deprecated in this release and is subject to removal at the beginning of the "