diff --git a/keystone/locale/de/LC_MESSAGES/keystone-log-warning.po b/keystone/locale/de/LC_MESSAGES/keystone-log-warning.po index 4029a5f3b2..890dbcdb75 100644 --- a/keystone/locale/de/LC_MESSAGES/keystone-log-warning.po +++ b/keystone/locale/de/LC_MESSAGES/keystone-log-warning.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:06+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: 2014-06-20 20:10+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: German (http://www.transifex.com/projects/p/keystone/language/" @@ -38,19 +38,26 @@ msgstr "" msgid "KVS lock released (timeout reached) for: %s" msgstr "" -#: keystone/common/ldap/core.py:989 +#: keystone/common/ldap/core.py:1002 msgid "" "LDAP Server does not support paging. Disable paging in keystone.conf to " "avoid this message." msgstr "" -#: keystone/common/ldap/core.py:1185 +#: keystone/common/ldap/core.py:1201 #, python-format msgid "" "Invalid additional attribute mapping: \"%s\". Format must be " ":" msgstr "" +#: keystone/common/ldap/core.py:1312 +#, python-format +msgid "" +"ID attribute %(id_attr)s for LDAP object %(dn)s has multiple values and " +"therefore cannot be used as an ID. Will get the ID from DN instead" +msgstr "" + #: keystone/contrib/endpoint_policy/core.py:91 #, python-format msgid "" diff --git a/keystone/locale/en_AU/LC_MESSAGES/keystone-log-warning.po b/keystone/locale/en_AU/LC_MESSAGES/keystone-log-warning.po index d668b7f952..0707bfc74d 100644 --- a/keystone/locale/en_AU/LC_MESSAGES/keystone-log-warning.po +++ b/keystone/locale/en_AU/LC_MESSAGES/keystone-log-warning.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:06+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: 2014-06-20 20:10+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: English (Australia) (http://www.transifex.com/projects/p/" @@ -38,19 +38,26 @@ msgstr "" msgid "KVS lock released (timeout reached) for: %s" msgstr "" -#: keystone/common/ldap/core.py:989 +#: keystone/common/ldap/core.py:1002 msgid "" "LDAP Server does not support paging. Disable paging in keystone.conf to " "avoid this message." msgstr "" -#: keystone/common/ldap/core.py:1185 +#: keystone/common/ldap/core.py:1201 #, python-format msgid "" "Invalid additional attribute mapping: \"%s\". Format must be " ":" msgstr "" +#: keystone/common/ldap/core.py:1312 +#, python-format +msgid "" +"ID attribute %(id_attr)s for LDAP object %(dn)s has multiple values and " +"therefore cannot be used as an ID. Will get the ID from DN instead" +msgstr "" + #: keystone/contrib/endpoint_policy/core.py:91 #, python-format msgid "" diff --git a/keystone/locale/en_AU/LC_MESSAGES/keystone.po b/keystone/locale/en_AU/LC_MESSAGES/keystone.po index 0e87322c3c..0f0eb70c86 100644 --- a/keystone/locale/en_AU/LC_MESSAGES/keystone.po +++ b/keystone/locale/en_AU/LC_MESSAGES/keystone.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:05+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: 2014-04-19 01:30+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: English (Australia) " @@ -355,14 +355,21 @@ msgstr "" msgid "The Keystone configuration file %(config_file)s could not be found." msgstr "The Keystone configuration file %(config_file)s could not be found." -#: keystone/exception.py:403 +#: keystone/exception.py:402 +#, python-format +msgid "" +"The Keystone domain configuration file %(config_file)s defines an " +"additional SQL driver - only one is permitted." +msgstr "" + +#: keystone/exception.py:409 #, python-format msgid "" "%(mod_name)s doesn't provide database migrations. The migration " "repository path at %(path)s doesn't exist or isn't a directory." msgstr "" -#: keystone/exception.py:415 +#: keystone/exception.py:421 #, python-format msgid "" "Unable to sign SAML assertion. It is likely that this server does not " @@ -384,38 +391,38 @@ msgstr "" msgid "Failed to send %(res_id)s %(event_type)s notification" msgstr "Failed to send %(res_id)s %(event_type)s notification" -#: keystone/notifications.py:457 +#: keystone/notifications.py:455 #, python-format msgid "Failed to send %(action)s %(event_type)s notification" msgstr "" -#: keystone/assignment/controllers.py:76 +#: keystone/assignment/controllers.py:77 #, python-format msgid "Authentication failed: %s" msgstr "Authentication failed: %s" -#: keystone/assignment/controllers.py:109 -#: keystone/assignment/controllers.py:223 keystone/identity/controllers.py:67 +#: keystone/assignment/controllers.py:110 +#: keystone/assignment/controllers.py:224 keystone/identity/controllers.py:67 msgid "Name field is required and cannot be empty" msgstr "Name field is required and cannot be empty" -#: keystone/assignment/controllers.py:164 +#: keystone/assignment/controllers.py:165 msgid "Marker could not be found" msgstr "Marker could not be found" -#: keystone/assignment/controllers.py:175 +#: keystone/assignment/controllers.py:176 msgid "Invalid limit value" msgstr "Invalid limit value" -#: keystone/assignment/controllers.py:478 +#: keystone/assignment/controllers.py:479 msgid "Specify a domain or project, not both" msgstr "Specify a domain or project, not both" -#: keystone/assignment/controllers.py:483 +#: keystone/assignment/controllers.py:484 msgid "Specify a user or group, not both" msgstr "Specify a user or group, not both" -#: keystone/assignment/controllers.py:702 +#: keystone/assignment/controllers.py:712 #, python-format msgid "" "Group %(group)s not found for role-assignment - %(target)s with Role: " @@ -435,36 +442,40 @@ msgstr "Domain is disabled: %s" msgid "Project is disabled: %s" msgstr "Project is disabled: %s" -#: keystone/assignment/core.py:382 +#: keystone/assignment/core.py:325 +msgid "Multiple domains are not supported" +msgstr "" + +#: keystone/assignment/core.py:385 msgid "delete the default domain" msgstr "" -#: keystone/assignment/core.py:393 +#: keystone/assignment/core.py:396 msgid "cannot delete a domain that is enabled, please disable it first." msgstr "" -#: keystone/assignment/core.py:615 +#: keystone/assignment/core.py:617 #, python-format msgid "Project (%s)" msgstr "Project (%s)" -#: keystone/assignment/core.py:617 +#: keystone/assignment/core.py:619 #, python-format msgid "Domain (%s)" msgstr "Domain (%s)" -#: keystone/assignment/core.py:619 +#: keystone/assignment/core.py:621 msgid "Unknown Target" msgstr "Unknown Target" -#: keystone/assignment/core.py:1105 keystone/common/controller.py:286 -#: keystone/identity/core.py:310 +#: keystone/assignment/core.py:1107 keystone/common/controller.py:286 +#: keystone/identity/core.py:330 #, python-format msgid "Expected dict or list: %s" msgstr "Expected dict or list: %s" #: keystone/assignment/backends/kvs.py:257 -#: keystone/assignment/backends/ldap.py:552 +#: keystone/assignment/backends/ldap.py:550 #: keystone/assignment/backends/sql.py:405 #, python-format msgid "Cannot remove role that has not been granted, %s" @@ -475,14 +486,14 @@ msgid "Domain metadata not supported by LDAP" msgstr "" #: keystone/assignment/backends/ldap.py:215 -#: keystone/assignment/backends/ldap.py:259 keystone/catalog/core.py:96 -#: keystone/common/ldap/core.py:1340 keystone/identity/backends/kvs.py:120 +#: keystone/assignment/backends/ldap.py:259 keystone/catalog/core.py:100 +#: keystone/common/ldap/core.py:1377 keystone/identity/backends/kvs.py:120 #: keystone/identity/backends/kvs.py:225 #, python-format msgid "Duplicate ID, %s." msgstr "Duplicate ID, %s." -#: keystone/assignment/backends/ldap.py:223 keystone/common/ldap/core.py:1330 +#: keystone/assignment/backends/ldap.py:223 keystone/common/ldap/core.py:1367 #: keystone/identity/backends/kvs.py:128 keystone/identity/backends/kvs.py:155 #: keystone/identity/backends/kvs.py:232 keystone/identity/backends/kvs.py:260 #, python-format @@ -495,22 +506,22 @@ msgstr "Duplicate name, %s." msgid "Domains are read-only against LDAP" msgstr "" -#: keystone/assignment/backends/ldap.py:320 +#: keystone/assignment/backends/ldap.py:313 #: keystone/assignment/backends/sql.py:145 msgid "Inherited roles can only be assigned to domains" msgstr "Inherited roles can only be assigned to domains" -#: keystone/assignment/backends/ldap.py:529 +#: keystone/assignment/backends/ldap.py:530 #, python-format msgid "User %(user_id)s already has role %(role_id)s in tenant %(tenant_id)s" msgstr "" -#: keystone/assignment/backends/ldap.py:535 +#: keystone/assignment/backends/ldap.py:536 #, python-format msgid "Role %s not found" msgstr "Role %s not found" -#: keystone/assignment/backends/ldap.py:646 +#: keystone/assignment/backends/ldap.py:644 #, python-format msgid "Cannot duplicate name %s" msgstr "" @@ -634,7 +645,7 @@ msgstr "Invalid username or password" msgid "Conflicting region IDs specified: \"%(url_id)s\" != \"%(ref_id)s\"" msgstr "" -#: keystone/catalog/core.py:52 +#: keystone/catalog/core.py:56 #, python-format msgid "Malformed endpoint - %(url)r is not a string" msgstr "" @@ -897,66 +908,71 @@ msgstr "" msgid "`key_mangler` functions must be callable." msgstr "" -#: keystone/common/ldap/core.py:177 +#: keystone/common/ldap/core.py:186 #, python-format msgid "Invalid LDAP deref option: %(option)s. Choose one of: %(options)s" msgstr "" -#: keystone/common/ldap/core.py:187 +#: keystone/common/ldap/core.py:196 #, python-format msgid "Invalid LDAP TLS certs option: %(option)s. Choose one of: %(options)s" msgstr "Invalid LDAP TLS certs option: %(option)s. Choose one of: %(options)s" -#: keystone/common/ldap/core.py:199 +#: keystone/common/ldap/core.py:208 #, python-format msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s" msgstr "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s" -#: keystone/common/ldap/core.py:573 +#: keystone/common/ldap/core.py:583 msgid "Invalid TLS / LDAPS combination" msgstr "Invalid TLS / LDAPS combination" -#: keystone/common/ldap/core.py:577 +#: keystone/common/ldap/core.py:587 #, python-format msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available" msgstr "Invalid LDAP TLS_AVAIL option: %s. TLS not available" -#: keystone/common/ldap/core.py:587 +#: keystone/common/ldap/core.py:597 #, python-format msgid "tls_cacertfile %s not found or is not a file" msgstr "tls_cacertfile %s not found or is not a file" -#: keystone/common/ldap/core.py:599 +#: keystone/common/ldap/core.py:609 #, python-format msgid "tls_cacertdir %s not found or is not a directory" msgstr "tls_cacertdir %s not found or is not a directory" -#: keystone/common/ldap/core.py:1309 +#: keystone/common/ldap/core.py:1302 +#, python-format +msgid "ID attribute %(id_attr)s not found in LDAP object %(dn)s" +msgstr "" + +#: keystone/common/ldap/core.py:1346 #, python-format msgid "LDAP %s create" msgstr "LDAP %s create" -#: keystone/common/ldap/core.py:1314 +#: keystone/common/ldap/core.py:1351 #, python-format msgid "LDAP %s update" msgstr "LDAP %s update" -#: keystone/common/ldap/core.py:1319 +#: keystone/common/ldap/core.py:1356 #, python-format msgid "LDAP %s delete" msgstr "LDAP %s delete" -#: keystone/common/ldap/core.py:1462 +#: keystone/common/ldap/core.py:1498 #, python-format msgid "Cannot change %(option_name)s %(attr)s" msgstr "Cannot change %(option_name)s %(attr)s" -#: keystone/common/ldap/core.py:1529 +#: keystone/common/ldap/core.py:1585 #, python-format msgid "Member %(member)s is already a member of group %(group)s" msgstr "" -#: keystone/common/ldap/core.py:1587 +#: keystone/common/ldap/core.py:1634 #, python-format msgid "" "When deleting entries for %(search_base)s, could not delete nonexistent " @@ -969,11 +985,11 @@ msgid "" " self " msgstr "" -#: keystone/common/sql/core.py:400 +#: keystone/common/sql/core.py:401 msgid "Duplicate Entry" msgstr "" -#: keystone/common/sql/core.py:416 +#: keystone/common/sql/core.py:417 #, python-format msgid "An unexpected error occurred when trying to store %s" msgstr "" @@ -1002,7 +1018,7 @@ msgstr "Credential belongs to another user" msgid "Endpoint %(endpoint_id)s not found in project %(project_id)s" msgstr "Endpoint %(endpoint_id)s not found in project %(project_id)s" -#: keystone/contrib/endpoint_filter/backends/sql.py:178 +#: keystone/contrib/endpoint_filter/backends/sql.py:180 msgid "Endpoint Group Project Association not found" msgstr "" @@ -1137,7 +1153,7 @@ msgstr "" #: keystone/contrib/revoke/core.py:221 keystone/token/provider.py:234 #: keystone/token/provider.py:256 keystone/token/provider.py:354 -#: keystone/token/provider.py:361 keystone/token/providers/common.py:558 +#: keystone/token/provider.py:361 keystone/token/providers/common.py:576 msgid "Failed to validate token" msgstr "Failed to validate token" @@ -1159,30 +1175,30 @@ msgstr "Unable to remove user %(user)s from %(tenant)s." msgid "Unable to add user %(user)s to %(tenant)s." msgstr "Unable to add user %(user)s to %(tenant)s." -#: keystone/identity/core.py:101 +#: keystone/identity/core.py:118 #, python-format msgid "Invalid domain name (%s) found in config file name" msgstr "Invalid domain name (%s) found in config file name" -#: keystone/identity/core.py:125 +#: keystone/identity/core.py:144 #, python-format msgid "Unable to locate domain config directory: %s" msgstr "Unable to locate domain config directory: %s" -#: keystone/identity/core.py:200 keystone/identity/backends/kvs.py:75 -#: keystone/identity/backends/kvs.py:77 keystone/identity/backends/ldap.py:61 -#: keystone/identity/backends/ldap.py:63 keystone/identity/backends/ldap.py:69 -#: keystone/identity/backends/ldap.py:71 keystone/identity/backends/sql.py:101 -#: keystone/identity/backends/sql.py:103 +#: keystone/identity/core.py:220 keystone/identity/backends/kvs.py:75 +#: keystone/identity/backends/kvs.py:77 keystone/identity/backends/ldap.py:59 +#: keystone/identity/backends/ldap.py:61 keystone/identity/backends/ldap.py:67 +#: keystone/identity/backends/ldap.py:69 keystone/identity/backends/sql.py:112 +#: keystone/identity/backends/sql.py:114 msgid "Invalid user / password" msgstr "" -#: keystone/identity/core.py:574 keystone/token/core.py:64 +#: keystone/identity/core.py:594 keystone/token/core.py:64 #, python-format msgid "User is disabled: %s" msgstr "User is disabled: %s" -#: keystone/identity/core.py:616 +#: keystone/identity/core.py:636 msgid "Cannot change user ID" msgstr "" @@ -1190,17 +1206,17 @@ msgstr "" msgid "User not found in group" msgstr "User not found in group" -#: keystone/identity/backends/ldap.py:101 +#: keystone/identity/backends/ldap.py:99 msgid "Cannot change user name" msgstr "" -#: keystone/identity/backends/ldap.py:186 keystone/identity/backends/sql.py:185 -#: keystone/identity/backends/sql.py:203 +#: keystone/identity/backends/ldap.py:183 keystone/identity/backends/sql.py:196 +#: keystone/identity/backends/sql.py:214 #, python-format msgid "User '%(user_id)s' not found in group '%(group_id)s'" msgstr "" -#: keystone/identity/backends/ldap.py:323 +#: keystone/identity/backends/ldap.py:330 #, python-format msgid "User %(user_id)s is already a member of group %(group_id)s" msgstr "User %(user_id)s is already a member of group %(group_id)s" @@ -1263,6 +1279,47 @@ msgstr "Policy doesn't allow %s to be performed." msgid "Rules must be an instance of dict or Rules, got %s instead" msgstr "Rules must be an instance of dict or Rules, got %s instead" +#: keystone/openstack/common/processutils.py:59 +msgid "Unexpected error while running command." +msgstr "" + +#: keystone/openstack/common/processutils.py:62 +#, python-format +msgid "" +"%(description)s\n" +"Command: %(cmd)s\n" +"Exit code: %(exit_code)s\n" +"Stdout: %(stdout)r\n" +"Stderr: %(stderr)r" +msgstr "" + +#: keystone/openstack/common/processutils.py:143 +#, python-format +msgid "Got unknown keyword args: %r" +msgstr "" + +#: keystone/openstack/common/processutils.py:148 +msgid "Command requested root, but did not specify a root helper." +msgstr "" + +#: keystone/openstack/common/processutils.py:158 +#, python-format +msgid "Running cmd (subprocess): %s" +msgstr "" + +#: keystone/openstack/common/processutils.py:206 +#, python-format +msgid "%r failed. Retrying." +msgstr "" + +#: keystone/openstack/common/processutils.py:248 +msgid "Environment not supported over SSH" +msgstr "" + +#: keystone/openstack/common/processutils.py:252 +msgid "process_input not supported over SSH" +msgstr "" + #: keystone/openstack/common/strutils.py:114 #, python-format msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s" @@ -1377,44 +1434,44 @@ msgid "" "revocation list." msgstr "" -#: keystone/token/providers/common.py:190 -#: keystone/token/providers/common.py:293 +#: keystone/token/providers/common.py:195 +#: keystone/token/providers/common.py:300 #, python-format msgid "User %(user_id)s has no access to project %(project_id)s" msgstr "User %(user_id)s has no access to project %(project_id)s" -#: keystone/token/providers/common.py:195 -#: keystone/token/providers/common.py:298 +#: keystone/token/providers/common.py:200 +#: keystone/token/providers/common.py:305 #, python-format msgid "User %(user_id)s has no access to domain %(domain_id)s" msgstr "User %(user_id)s has no access to domain %(domain_id)s" -#: keystone/token/providers/common.py:220 +#: keystone/token/providers/common.py:227 msgid "Trustor is disabled." msgstr "Trustor is disabled." -#: keystone/token/providers/common.py:284 +#: keystone/token/providers/common.py:291 msgid "Trustee has no delegated roles." msgstr "Trustee has no delegated roles." -#: keystone/token/providers/common.py:337 +#: keystone/token/providers/common.py:344 #, python-format msgid "Invalid audit info data type: %(data)s (%(type)s)" msgstr "" -#: keystone/token/providers/common.py:358 +#: keystone/token/providers/common.py:365 msgid "User is not a trustee." msgstr "User is not a trustee." -#: keystone/token/providers/common.py:430 +#: keystone/token/providers/common.py:442 msgid "Oauth is disabled." msgstr "Oauth is disabled." -#: keystone/token/providers/common.py:487 +#: keystone/token/providers/common.py:499 msgid "Non-default domain is not supported" msgstr "Non-default domain is not supported" -#: keystone/token/providers/common.py:495 +#: keystone/token/providers/common.py:507 msgid "Domain scoped token is not supported" msgstr "Domain scoped token is not supported" diff --git a/keystone/locale/en_GB/LC_MESSAGES/keystone-log-warning.po b/keystone/locale/en_GB/LC_MESSAGES/keystone-log-warning.po index 70148fc6d0..b74a585e7e 100644 --- a/keystone/locale/en_GB/LC_MESSAGES/keystone-log-warning.po +++ b/keystone/locale/en_GB/LC_MESSAGES/keystone-log-warning.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:06+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: 2014-07-25 15:11+0000\n" "Last-Translator: Andi Chandler \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/" @@ -39,19 +39,26 @@ msgstr "" msgid "KVS lock released (timeout reached) for: %s" msgstr "" -#: keystone/common/ldap/core.py:989 +#: keystone/common/ldap/core.py:1002 msgid "" "LDAP Server does not support paging. Disable paging in keystone.conf to " "avoid this message." msgstr "" -#: keystone/common/ldap/core.py:1185 +#: keystone/common/ldap/core.py:1201 #, python-format msgid "" "Invalid additional attribute mapping: \"%s\". Format must be " ":" msgstr "" +#: keystone/common/ldap/core.py:1312 +#, python-format +msgid "" +"ID attribute %(id_attr)s for LDAP object %(dn)s has multiple values and " +"therefore cannot be used as an ID. Will get the ID from DN instead" +msgstr "" + #: keystone/contrib/endpoint_policy/core.py:91 #, python-format msgid "" diff --git a/keystone/locale/en_US/LC_MESSAGES/keystone.po b/keystone/locale/en_US/LC_MESSAGES/keystone.po index 0d57578bb2..37e5472418 100644 --- a/keystone/locale/en_US/LC_MESSAGES/keystone.po +++ b/keystone/locale/en_US/LC_MESSAGES/keystone.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:05+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: 2013-07-29 22:01+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: English (United States) " @@ -346,14 +346,21 @@ msgstr "" msgid "The Keystone configuration file %(config_file)s could not be found." msgstr "" -#: keystone/exception.py:403 +#: keystone/exception.py:402 +#, python-format +msgid "" +"The Keystone domain configuration file %(config_file)s defines an " +"additional SQL driver - only one is permitted." +msgstr "" + +#: keystone/exception.py:409 #, python-format msgid "" "%(mod_name)s doesn't provide database migrations. The migration " "repository path at %(path)s doesn't exist or isn't a directory." msgstr "" -#: keystone/exception.py:415 +#: keystone/exception.py:421 #, python-format msgid "" "Unable to sign SAML assertion. It is likely that this server does not " @@ -375,38 +382,38 @@ msgstr "" msgid "Failed to send %(res_id)s %(event_type)s notification" msgstr "" -#: keystone/notifications.py:457 +#: keystone/notifications.py:455 #, python-format msgid "Failed to send %(action)s %(event_type)s notification" msgstr "" -#: keystone/assignment/controllers.py:76 +#: keystone/assignment/controllers.py:77 #, python-format msgid "Authentication failed: %s" msgstr "" -#: keystone/assignment/controllers.py:109 -#: keystone/assignment/controllers.py:223 keystone/identity/controllers.py:67 +#: keystone/assignment/controllers.py:110 +#: keystone/assignment/controllers.py:224 keystone/identity/controllers.py:67 msgid "Name field is required and cannot be empty" msgstr "" -#: keystone/assignment/controllers.py:164 +#: keystone/assignment/controllers.py:165 msgid "Marker could not be found" msgstr "" -#: keystone/assignment/controllers.py:175 +#: keystone/assignment/controllers.py:176 msgid "Invalid limit value" msgstr "" -#: keystone/assignment/controllers.py:478 +#: keystone/assignment/controllers.py:479 msgid "Specify a domain or project, not both" msgstr "" -#: keystone/assignment/controllers.py:483 +#: keystone/assignment/controllers.py:484 msgid "Specify a user or group, not both" msgstr "" -#: keystone/assignment/controllers.py:702 +#: keystone/assignment/controllers.py:712 #, python-format msgid "" "Group %(group)s not found for role-assignment - %(target)s with Role: " @@ -424,36 +431,40 @@ msgstr "" msgid "Project is disabled: %s" msgstr "" -#: keystone/assignment/core.py:382 +#: keystone/assignment/core.py:325 +msgid "Multiple domains are not supported" +msgstr "" + +#: keystone/assignment/core.py:385 msgid "delete the default domain" msgstr "" -#: keystone/assignment/core.py:393 +#: keystone/assignment/core.py:396 msgid "cannot delete a domain that is enabled, please disable it first." msgstr "" -#: keystone/assignment/core.py:615 -#, python-format -msgid "Project (%s)" -msgstr "" - #: keystone/assignment/core.py:617 #, python-format -msgid "Domain (%s)" +msgid "Project (%s)" msgstr "" #: keystone/assignment/core.py:619 +#, python-format +msgid "Domain (%s)" +msgstr "" + +#: keystone/assignment/core.py:621 msgid "Unknown Target" msgstr "" -#: keystone/assignment/core.py:1105 keystone/common/controller.py:286 -#: keystone/identity/core.py:310 +#: keystone/assignment/core.py:1107 keystone/common/controller.py:286 +#: keystone/identity/core.py:330 #, python-format msgid "Expected dict or list: %s" msgstr "" #: keystone/assignment/backends/kvs.py:257 -#: keystone/assignment/backends/ldap.py:552 +#: keystone/assignment/backends/ldap.py:550 #: keystone/assignment/backends/sql.py:405 #, python-format msgid "Cannot remove role that has not been granted, %s" @@ -464,14 +475,14 @@ msgid "Domain metadata not supported by LDAP" msgstr "" #: keystone/assignment/backends/ldap.py:215 -#: keystone/assignment/backends/ldap.py:259 keystone/catalog/core.py:96 -#: keystone/common/ldap/core.py:1340 keystone/identity/backends/kvs.py:120 +#: keystone/assignment/backends/ldap.py:259 keystone/catalog/core.py:100 +#: keystone/common/ldap/core.py:1377 keystone/identity/backends/kvs.py:120 #: keystone/identity/backends/kvs.py:225 #, python-format msgid "Duplicate ID, %s." msgstr "" -#: keystone/assignment/backends/ldap.py:223 keystone/common/ldap/core.py:1330 +#: keystone/assignment/backends/ldap.py:223 keystone/common/ldap/core.py:1367 #: keystone/identity/backends/kvs.py:128 keystone/identity/backends/kvs.py:155 #: keystone/identity/backends/kvs.py:232 keystone/identity/backends/kvs.py:260 #, python-format @@ -484,22 +495,22 @@ msgstr "" msgid "Domains are read-only against LDAP" msgstr "" -#: keystone/assignment/backends/ldap.py:320 +#: keystone/assignment/backends/ldap.py:313 #: keystone/assignment/backends/sql.py:145 msgid "Inherited roles can only be assigned to domains" msgstr "" -#: keystone/assignment/backends/ldap.py:529 +#: keystone/assignment/backends/ldap.py:530 #, python-format msgid "User %(user_id)s already has role %(role_id)s in tenant %(tenant_id)s" msgstr "" -#: keystone/assignment/backends/ldap.py:535 +#: keystone/assignment/backends/ldap.py:536 #, python-format msgid "Role %s not found" msgstr "" -#: keystone/assignment/backends/ldap.py:646 +#: keystone/assignment/backends/ldap.py:644 #, python-format msgid "Cannot duplicate name %s" msgstr "" @@ -617,7 +628,7 @@ msgstr "" msgid "Conflicting region IDs specified: \"%(url_id)s\" != \"%(ref_id)s\"" msgstr "" -#: keystone/catalog/core.py:52 +#: keystone/catalog/core.py:56 #, python-format msgid "Malformed endpoint - %(url)r is not a string" msgstr "" @@ -869,66 +880,71 @@ msgstr "" msgid "`key_mangler` functions must be callable." msgstr "" -#: keystone/common/ldap/core.py:177 +#: keystone/common/ldap/core.py:186 #, python-format msgid "Invalid LDAP deref option: %(option)s. Choose one of: %(options)s" msgstr "" -#: keystone/common/ldap/core.py:187 +#: keystone/common/ldap/core.py:196 #, python-format msgid "Invalid LDAP TLS certs option: %(option)s. Choose one of: %(options)s" msgstr "" -#: keystone/common/ldap/core.py:199 +#: keystone/common/ldap/core.py:208 #, python-format msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s" msgstr "" -#: keystone/common/ldap/core.py:573 +#: keystone/common/ldap/core.py:583 msgid "Invalid TLS / LDAPS combination" msgstr "" -#: keystone/common/ldap/core.py:577 -#, python-format -msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available" -msgstr "" - #: keystone/common/ldap/core.py:587 #, python-format +msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available" +msgstr "" + +#: keystone/common/ldap/core.py:597 +#, python-format msgid "tls_cacertfile %s not found or is not a file" msgstr "" -#: keystone/common/ldap/core.py:599 +#: keystone/common/ldap/core.py:609 #, python-format msgid "tls_cacertdir %s not found or is not a directory" msgstr "" -#: keystone/common/ldap/core.py:1309 +#: keystone/common/ldap/core.py:1302 +#, python-format +msgid "ID attribute %(id_attr)s not found in LDAP object %(dn)s" +msgstr "" + +#: keystone/common/ldap/core.py:1346 #, python-format msgid "LDAP %s create" msgstr "" -#: keystone/common/ldap/core.py:1314 +#: keystone/common/ldap/core.py:1351 #, python-format msgid "LDAP %s update" msgstr "" -#: keystone/common/ldap/core.py:1319 +#: keystone/common/ldap/core.py:1356 #, python-format msgid "LDAP %s delete" msgstr "" -#: keystone/common/ldap/core.py:1462 +#: keystone/common/ldap/core.py:1498 #, python-format msgid "Cannot change %(option_name)s %(attr)s" msgstr "" -#: keystone/common/ldap/core.py:1529 +#: keystone/common/ldap/core.py:1585 #, python-format msgid "Member %(member)s is already a member of group %(group)s" msgstr "" -#: keystone/common/ldap/core.py:1587 +#: keystone/common/ldap/core.py:1634 #, python-format msgid "" "When deleting entries for %(search_base)s, could not delete nonexistent " @@ -941,11 +957,11 @@ msgid "" " self " msgstr "" -#: keystone/common/sql/core.py:400 +#: keystone/common/sql/core.py:401 msgid "Duplicate Entry" msgstr "" -#: keystone/common/sql/core.py:416 +#: keystone/common/sql/core.py:417 #, python-format msgid "An unexpected error occurred when trying to store %s" msgstr "" @@ -974,7 +990,7 @@ msgstr "" msgid "Endpoint %(endpoint_id)s not found in project %(project_id)s" msgstr "" -#: keystone/contrib/endpoint_filter/backends/sql.py:178 +#: keystone/contrib/endpoint_filter/backends/sql.py:180 msgid "Endpoint Group Project Association not found" msgstr "" @@ -1109,7 +1125,7 @@ msgstr "" #: keystone/contrib/revoke/core.py:221 keystone/token/provider.py:234 #: keystone/token/provider.py:256 keystone/token/provider.py:354 -#: keystone/token/provider.py:361 keystone/token/providers/common.py:558 +#: keystone/token/provider.py:361 keystone/token/providers/common.py:576 msgid "Failed to validate token" msgstr "" @@ -1131,30 +1147,30 @@ msgstr "" msgid "Unable to add user %(user)s to %(tenant)s." msgstr "" -#: keystone/identity/core.py:101 +#: keystone/identity/core.py:118 #, python-format msgid "Invalid domain name (%s) found in config file name" msgstr "" -#: keystone/identity/core.py:125 +#: keystone/identity/core.py:144 #, python-format msgid "Unable to locate domain config directory: %s" msgstr "" -#: keystone/identity/core.py:200 keystone/identity/backends/kvs.py:75 -#: keystone/identity/backends/kvs.py:77 keystone/identity/backends/ldap.py:61 -#: keystone/identity/backends/ldap.py:63 keystone/identity/backends/ldap.py:69 -#: keystone/identity/backends/ldap.py:71 keystone/identity/backends/sql.py:101 -#: keystone/identity/backends/sql.py:103 +#: keystone/identity/core.py:220 keystone/identity/backends/kvs.py:75 +#: keystone/identity/backends/kvs.py:77 keystone/identity/backends/ldap.py:59 +#: keystone/identity/backends/ldap.py:61 keystone/identity/backends/ldap.py:67 +#: keystone/identity/backends/ldap.py:69 keystone/identity/backends/sql.py:112 +#: keystone/identity/backends/sql.py:114 msgid "Invalid user / password" msgstr "" -#: keystone/identity/core.py:574 keystone/token/core.py:64 +#: keystone/identity/core.py:594 keystone/token/core.py:64 #, python-format msgid "User is disabled: %s" msgstr "" -#: keystone/identity/core.py:616 +#: keystone/identity/core.py:636 msgid "Cannot change user ID" msgstr "" @@ -1162,17 +1178,17 @@ msgstr "" msgid "User not found in group" msgstr "" -#: keystone/identity/backends/ldap.py:101 +#: keystone/identity/backends/ldap.py:99 msgid "Cannot change user name" msgstr "" -#: keystone/identity/backends/ldap.py:186 keystone/identity/backends/sql.py:185 -#: keystone/identity/backends/sql.py:203 +#: keystone/identity/backends/ldap.py:183 keystone/identity/backends/sql.py:196 +#: keystone/identity/backends/sql.py:214 #, python-format msgid "User '%(user_id)s' not found in group '%(group_id)s'" msgstr "" -#: keystone/identity/backends/ldap.py:323 +#: keystone/identity/backends/ldap.py:330 #, python-format msgid "User %(user_id)s is already a member of group %(group_id)s" msgstr "" @@ -1233,6 +1249,47 @@ msgstr "" msgid "Rules must be an instance of dict or Rules, got %s instead" msgstr "" +#: keystone/openstack/common/processutils.py:59 +msgid "Unexpected error while running command." +msgstr "" + +#: keystone/openstack/common/processutils.py:62 +#, python-format +msgid "" +"%(description)s\n" +"Command: %(cmd)s\n" +"Exit code: %(exit_code)s\n" +"Stdout: %(stdout)r\n" +"Stderr: %(stderr)r" +msgstr "" + +#: keystone/openstack/common/processutils.py:143 +#, python-format +msgid "Got unknown keyword args: %r" +msgstr "" + +#: keystone/openstack/common/processutils.py:148 +msgid "Command requested root, but did not specify a root helper." +msgstr "" + +#: keystone/openstack/common/processutils.py:158 +#, python-format +msgid "Running cmd (subprocess): %s" +msgstr "" + +#: keystone/openstack/common/processutils.py:206 +#, python-format +msgid "%r failed. Retrying." +msgstr "" + +#: keystone/openstack/common/processutils.py:248 +msgid "Environment not supported over SSH" +msgstr "" + +#: keystone/openstack/common/processutils.py:252 +msgid "process_input not supported over SSH" +msgstr "" + #: keystone/openstack/common/strutils.py:114 #, python-format msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s" @@ -1341,44 +1398,44 @@ msgid "" "revocation list." msgstr "" -#: keystone/token/providers/common.py:190 -#: keystone/token/providers/common.py:293 +#: keystone/token/providers/common.py:195 +#: keystone/token/providers/common.py:300 #, python-format msgid "User %(user_id)s has no access to project %(project_id)s" msgstr "" -#: keystone/token/providers/common.py:195 -#: keystone/token/providers/common.py:298 +#: keystone/token/providers/common.py:200 +#: keystone/token/providers/common.py:305 #, python-format msgid "User %(user_id)s has no access to domain %(domain_id)s" msgstr "" -#: keystone/token/providers/common.py:220 +#: keystone/token/providers/common.py:227 msgid "Trustor is disabled." msgstr "" -#: keystone/token/providers/common.py:284 +#: keystone/token/providers/common.py:291 msgid "Trustee has no delegated roles." msgstr "" -#: keystone/token/providers/common.py:337 +#: keystone/token/providers/common.py:344 #, python-format msgid "Invalid audit info data type: %(data)s (%(type)s)" msgstr "" -#: keystone/token/providers/common.py:358 +#: keystone/token/providers/common.py:365 msgid "User is not a trustee." msgstr "" -#: keystone/token/providers/common.py:430 +#: keystone/token/providers/common.py:442 msgid "Oauth is disabled." msgstr "" -#: keystone/token/providers/common.py:487 +#: keystone/token/providers/common.py:499 msgid "Non-default domain is not supported" msgstr "" -#: keystone/token/providers/common.py:495 +#: keystone/token/providers/common.py:507 msgid "Domain scoped token is not supported" msgstr "" diff --git a/keystone/locale/es/LC_MESSAGES/keystone-log-warning.po b/keystone/locale/es/LC_MESSAGES/keystone-log-warning.po index 678c63b6ec..94949ea270 100644 --- a/keystone/locale/es/LC_MESSAGES/keystone-log-warning.po +++ b/keystone/locale/es/LC_MESSAGES/keystone-log-warning.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:06+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: 2014-06-20 20:10+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/keystone/" @@ -38,19 +38,26 @@ msgstr "" msgid "KVS lock released (timeout reached) for: %s" msgstr "" -#: keystone/common/ldap/core.py:989 +#: keystone/common/ldap/core.py:1002 msgid "" "LDAP Server does not support paging. Disable paging in keystone.conf to " "avoid this message." msgstr "" -#: keystone/common/ldap/core.py:1185 +#: keystone/common/ldap/core.py:1201 #, python-format msgid "" "Invalid additional attribute mapping: \"%s\". Format must be " ":" msgstr "" +#: keystone/common/ldap/core.py:1312 +#, python-format +msgid "" +"ID attribute %(id_attr)s for LDAP object %(dn)s has multiple values and " +"therefore cannot be used as an ID. Will get the ID from DN instead" +msgstr "" + #: keystone/contrib/endpoint_policy/core.py:91 #, python-format msgid "" diff --git a/keystone/locale/fr/LC_MESSAGES/keystone-log-error.po b/keystone/locale/fr/LC_MESSAGES/keystone-log-error.po index 27c562b510..3359e3844d 100644 --- a/keystone/locale/fr/LC_MESSAGES/keystone-log-error.po +++ b/keystone/locale/fr/LC_MESSAGES/keystone-log-error.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the keystone project. # # Translators: +# Bruno Cornec , 2014 msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:06+0000\n" -"PO-Revision-Date: 2014-06-20 20:11+0000\n" -"Last-Translator: openstackjenkins \n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" +"PO-Revision-Date: 2014-09-17 17:40+0000\n" +"Last-Translator: Bruno Cornec \n" "Language-Team: French (http://www.transifex.com/projects/p/keystone/language/" "fr/)\n" "Language: fr\n" @@ -22,35 +23,39 @@ msgstr "" #: keystone/notifications.py:176 #, python-format msgid "Method not callable: %s" -msgstr "" +msgstr "Impossible d'appeler la méthode %s" -#: keystone/catalog/core.py:56 +#: keystone/catalog/core.py:60 #, python-format msgid "Malformed endpoint %(url)s - unknown key %(keyerror)s" -msgstr "" +msgstr "Noeud final incorrect %(url)s - clé inconnue %(keyerror)s" -#: keystone/catalog/core.py:61 +#: keystone/catalog/core.py:65 #, python-format msgid "" "Malformed endpoint '%(url)s'. The following type error occurred during " "string substitution: %(typeerror)s" msgstr "" +"Noeud final incorrect '%(url)s'. L'erreur suivante est survenue pendant la " +"substitution de chaine : %(typeerror)s" -#: keystone/catalog/core.py:67 +#: keystone/catalog/core.py:71 #, python-format msgid "" "Malformed endpoint %s - incomplete format (are you missing a type notifier ?)" msgstr "" +"Noeud final incorrect '%s - Format incomplet (un type de notification manque-" +"t-il ?)" #: keystone/common/openssl.py:90 #, python-format msgid "Command %(to_exec)s exited with %(retcode)s- %(output)s" -msgstr "" +msgstr "La commande %(to_exec)s a retourné %(retcode)s- %(output)s" #: keystone/common/environment/eventlet_server.py:100 #, python-format msgid "Could not bind to %(host)s:%(port)s" -msgstr "" +msgstr "Impossible de s'attacher à %(host)s:%(port)s" #: keystone/contrib/endpoint_policy/core.py:129 #: keystone/contrib/endpoint_policy/core.py:228 @@ -58,11 +63,13 @@ msgstr "" msgid "" "Circular reference or a repeated entry found in region tree - %(region_id)s." msgstr "" +"Référence circulaire ou entrée dupliquée trouvée dans l'arbre de la région - " +"%(region_id)s." #: keystone/contrib/federation/idp.py:404 #, python-format msgid "Error when signing assertion, reason: %(reason)s" -msgstr "" +msgstr "Erreur lors de la signature d'une assertion : %(reason)s" #: keystone/openstack/common/excutils.py:76 #, python-format diff --git a/keystone/locale/fr/LC_MESSAGES/keystone-log-info.po b/keystone/locale/fr/LC_MESSAGES/keystone-log-info.po index d136448c7d..0a52fc7a04 100644 --- a/keystone/locale/fr/LC_MESSAGES/keystone-log-info.po +++ b/keystone/locale/fr/LC_MESSAGES/keystone-log-info.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the keystone project. # # Translators: +# Bruno Cornec , 2014 # Andrew_Melim , 2014 msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:06+0000\n" -"PO-Revision-Date: 2014-08-04 01:37+0000\n" -"Last-Translator: openstackjenkins \n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" +"PO-Revision-Date: 2014-09-17 17:50+0000\n" +"Last-Translator: Bruno Cornec \n" "Language-Team: French (http://www.transifex.com/projects/p/keystone/language/" "fr/)\n" "Language: fr\n" @@ -23,11 +24,11 @@ msgstr "" #: keystone/assignment/core.py:263 #, python-format msgid "Creating the default role %s because it does not exist." -msgstr "" +msgstr "Création du rôle par défaut %s, car il n'existe pas" #: keystone/auth/controllers.py:64 msgid "Loading auth-plugins by class-name is deprecated." -msgstr "" +msgstr "Chargement de auth-plugins par class-name est déprécié" #: keystone/auth/controllers.py:106 #, python-format @@ -35,62 +36,69 @@ msgid "" "\"expires_at\" has conflicting values %(existing)s and %(new)s. Will use " "the earliest value." msgstr "" +"\"expires_at\" a des valeurs conflictuelles %(existing)s et %(new)s. " +"Utilsation de la première valeur." #: keystone/common/openssl.py:78 #, python-format msgid "Running command - %s" -msgstr "" +msgstr "Exécution de la commande %s" #: keystone/common/wsgi.py:76 msgid "No bind information present in token" -msgstr "" +msgstr "Aucune information d'attachement n'est présente dans le jeton" #: keystone/common/wsgi.py:80 #, python-format msgid "Named bind mode %s not in bind information" msgstr "" +"Le mode d'attachement nommé %s n'est pas dans l'information d'attachement" #: keystone/common/wsgi.py:87 msgid "Kerberos credentials required and not present" -msgstr "" +msgstr "L'identitification Kerberos est requise mais non présente" #: keystone/common/wsgi.py:91 msgid "Kerberos credentials do not match those in bind" -msgstr "" +msgstr "L'identification Kerberos ne correspond pas à celle de l'attachement" #: keystone/common/wsgi.py:95 msgid "Kerberos bind authentication successful" -msgstr "" +msgstr "Attachement Kerberos identifié correctement" #: keystone/common/wsgi.py:102 #, python-format msgid "Couldn't verify unknown bind: {%(bind_type)s: %(identifier)s}" msgstr "" +"Impossible de vérifier l'attachement inconnu: {%(bind_type)s: " +"%(identifier)s}" #: keystone/common/environment/eventlet_server.py:104 #, python-format msgid "Starting %(arg0)s on %(host)s:%(port)s" -msgstr "" +msgstr "Démarrage de %(arg0)s sur %(host)s:%(port)s" #: keystone/common/kvs/core.py:138 #, python-format msgid "Adding proxy '%(proxy)s' to KVS %(name)s." -msgstr "" +msgstr "Ahour du mandataire '%(proxy)s' au KVS %(name)s." #: keystone/common/kvs/core.py:188 #, python-format msgid "Using %(func)s as KVS region %(name)s key_mangler" -msgstr "" +msgstr "Utilise %(func)s comme région KVS %(name)s key_mangler" #: keystone/common/kvs/core.py:200 #, python-format msgid "Using default dogpile sha1_mangle_key as KVS region %s key_mangler" msgstr "" +"Utilisation du dogpile sha1_mangle_key par défaut comme région KVS %s " +"key_mangler" #: keystone/common/kvs/core.py:210 #, python-format msgid "KVS region %s key_mangler disabled." -msgstr "" +msgstr "Région KVS %s key_mangler désactivée" #: keystone/openstack/common/eventlet_backdoor.py:140 #, python-format @@ -109,7 +117,7 @@ msgstr "Processus parent arrêté de manière inattendue, sortie" #: keystone/openstack/common/service.py:271 #, python-format msgid "Child caught %s, exiting" -msgstr "" +msgstr "L'enfant a reçu %s, sortie" #: keystone/openstack/common/service.py:310 msgid "Forking too fast, sleeping" @@ -152,9 +160,9 @@ msgstr "En attente %d enfants pour sortie" #: keystone/token/persistence/backends/sql.py:61 #, python-format msgid "Token expiration batch size: %d" -msgstr "" +msgstr "Taille du batch du jeton d'expiration : %d" #: keystone/token/persistence/backends/sql.py:277 #, python-format msgid "Total expired tokens removed: %d" -msgstr "" +msgstr "Total des jetons expirés effacés: %d" diff --git a/keystone/locale/fr/LC_MESSAGES/keystone-log-warning.po b/keystone/locale/fr/LC_MESSAGES/keystone-log-warning.po index bf26f24ac4..df7954fbea 100644 --- a/keystone/locale/fr/LC_MESSAGES/keystone-log-warning.po +++ b/keystone/locale/fr/LC_MESSAGES/keystone-log-warning.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:06+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: 2014-06-20 20:10+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: French (http://www.transifex.com/projects/p/keystone/language/" @@ -38,19 +38,26 @@ msgstr "" msgid "KVS lock released (timeout reached) for: %s" msgstr "" -#: keystone/common/ldap/core.py:989 +#: keystone/common/ldap/core.py:1002 msgid "" "LDAP Server does not support paging. Disable paging in keystone.conf to " "avoid this message." msgstr "" -#: keystone/common/ldap/core.py:1185 +#: keystone/common/ldap/core.py:1201 #, python-format msgid "" "Invalid additional attribute mapping: \"%s\". Format must be " ":" msgstr "" +#: keystone/common/ldap/core.py:1312 +#, python-format +msgid "" +"ID attribute %(id_attr)s for LDAP object %(dn)s has multiple values and " +"therefore cannot be used as an ID. Will get the ID from DN instead" +msgstr "" + #: keystone/contrib/endpoint_policy/core.py:91 #, python-format msgid "" diff --git a/keystone/locale/it/LC_MESSAGES/keystone-log-warning.po b/keystone/locale/it/LC_MESSAGES/keystone-log-warning.po index 57e7d8bf64..f170a8d9f1 100644 --- a/keystone/locale/it/LC_MESSAGES/keystone-log-warning.po +++ b/keystone/locale/it/LC_MESSAGES/keystone-log-warning.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:06+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: 2014-06-20 20:10+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Italian (http://www.transifex.com/projects/p/keystone/" @@ -38,19 +38,26 @@ msgstr "" msgid "KVS lock released (timeout reached) for: %s" msgstr "" -#: keystone/common/ldap/core.py:989 +#: keystone/common/ldap/core.py:1002 msgid "" "LDAP Server does not support paging. Disable paging in keystone.conf to " "avoid this message." msgstr "" -#: keystone/common/ldap/core.py:1185 +#: keystone/common/ldap/core.py:1201 #, python-format msgid "" "Invalid additional attribute mapping: \"%s\". Format must be " ":" msgstr "" +#: keystone/common/ldap/core.py:1312 +#, python-format +msgid "" +"ID attribute %(id_attr)s for LDAP object %(dn)s has multiple values and " +"therefore cannot be used as an ID. Will get the ID from DN instead" +msgstr "" + #: keystone/contrib/endpoint_policy/core.py:91 #, python-format msgid "" diff --git a/keystone/locale/ja/LC_MESSAGES/keystone-log-warning.po b/keystone/locale/ja/LC_MESSAGES/keystone-log-warning.po index f6a50ec356..fe4f788ab8 100644 --- a/keystone/locale/ja/LC_MESSAGES/keystone-log-warning.po +++ b/keystone/locale/ja/LC_MESSAGES/keystone-log-warning.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:06+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: 2014-06-20 20:10+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/keystone/" @@ -38,19 +38,26 @@ msgstr "" msgid "KVS lock released (timeout reached) for: %s" msgstr "" -#: keystone/common/ldap/core.py:989 +#: keystone/common/ldap/core.py:1002 msgid "" "LDAP Server does not support paging. Disable paging in keystone.conf to " "avoid this message." msgstr "" -#: keystone/common/ldap/core.py:1185 +#: keystone/common/ldap/core.py:1201 #, python-format msgid "" "Invalid additional attribute mapping: \"%s\". Format must be " ":" msgstr "" +#: keystone/common/ldap/core.py:1312 +#, python-format +msgid "" +"ID attribute %(id_attr)s for LDAP object %(dn)s has multiple values and " +"therefore cannot be used as an ID. Will get the ID from DN instead" +msgstr "" + #: keystone/contrib/endpoint_policy/core.py:91 #, python-format msgid "" diff --git a/keystone/locale/keystone-log-warning.pot b/keystone/locale/keystone-log-warning.pot index 4cd0349edd..b571758968 100644 --- a/keystone/locale/keystone-log-warning.pot +++ b/keystone/locale/keystone-log-warning.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: keystone 2014.2.dev28.g7e410ae\n" +"Project-Id-Version: keystone 2014.2.dev132.gb2c5082\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:06+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -36,19 +36,26 @@ msgstr "" msgid "KVS lock released (timeout reached) for: %s" msgstr "" -#: keystone/common/ldap/core.py:989 +#: keystone/common/ldap/core.py:1002 msgid "" "LDAP Server does not support paging. Disable paging in keystone.conf to " "avoid this message." msgstr "" -#: keystone/common/ldap/core.py:1185 +#: keystone/common/ldap/core.py:1201 #, python-format msgid "" "Invalid additional attribute mapping: \"%s\". Format must be " ":" msgstr "" +#: keystone/common/ldap/core.py:1312 +#, python-format +msgid "" +"ID attribute %(id_attr)s for LDAP object %(dn)s has multiple values and " +"therefore cannot be used as an ID. Will get the ID from DN instead" +msgstr "" + #: keystone/contrib/endpoint_policy/core.py:91 #, python-format msgid "" diff --git a/keystone/locale/keystone.pot b/keystone/locale/keystone.pot index 6a8b440c7b..cfbb2cc320 100644 --- a/keystone/locale/keystone.pot +++ b/keystone/locale/keystone.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: keystone 2014.2.dev28.g7e410ae\n" +"Project-Id-Version: keystone 2014.2.dev132.gb2c5082\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:05+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -345,14 +345,21 @@ msgstr "" msgid "The Keystone configuration file %(config_file)s could not be found." msgstr "" -#: keystone/exception.py:403 +#: keystone/exception.py:402 +#, python-format +msgid "" +"The Keystone domain configuration file %(config_file)s defines an " +"additional SQL driver - only one is permitted." +msgstr "" + +#: keystone/exception.py:409 #, python-format msgid "" "%(mod_name)s doesn't provide database migrations. The migration " "repository path at %(path)s doesn't exist or isn't a directory." msgstr "" -#: keystone/exception.py:415 +#: keystone/exception.py:421 #, python-format msgid "" "Unable to sign SAML assertion. It is likely that this server does not " @@ -374,38 +381,38 @@ msgstr "" msgid "Failed to send %(res_id)s %(event_type)s notification" msgstr "" -#: keystone/notifications.py:457 +#: keystone/notifications.py:455 #, python-format msgid "Failed to send %(action)s %(event_type)s notification" msgstr "" -#: keystone/assignment/controllers.py:76 +#: keystone/assignment/controllers.py:77 #, python-format msgid "Authentication failed: %s" msgstr "" -#: keystone/assignment/controllers.py:109 -#: keystone/assignment/controllers.py:223 keystone/identity/controllers.py:67 +#: keystone/assignment/controllers.py:110 +#: keystone/assignment/controllers.py:224 keystone/identity/controllers.py:67 msgid "Name field is required and cannot be empty" msgstr "" -#: keystone/assignment/controllers.py:164 +#: keystone/assignment/controllers.py:165 msgid "Marker could not be found" msgstr "" -#: keystone/assignment/controllers.py:175 +#: keystone/assignment/controllers.py:176 msgid "Invalid limit value" msgstr "" -#: keystone/assignment/controllers.py:478 +#: keystone/assignment/controllers.py:479 msgid "Specify a domain or project, not both" msgstr "" -#: keystone/assignment/controllers.py:483 +#: keystone/assignment/controllers.py:484 msgid "Specify a user or group, not both" msgstr "" -#: keystone/assignment/controllers.py:702 +#: keystone/assignment/controllers.py:712 #, python-format msgid "" "Group %(group)s not found for role-assignment - %(target)s with Role: " @@ -423,36 +430,40 @@ msgstr "" msgid "Project is disabled: %s" msgstr "" -#: keystone/assignment/core.py:382 +#: keystone/assignment/core.py:325 +msgid "Multiple domains are not supported" +msgstr "" + +#: keystone/assignment/core.py:385 msgid "delete the default domain" msgstr "" -#: keystone/assignment/core.py:393 +#: keystone/assignment/core.py:396 msgid "cannot delete a domain that is enabled, please disable it first." msgstr "" -#: keystone/assignment/core.py:615 -#, python-format -msgid "Project (%s)" -msgstr "" - #: keystone/assignment/core.py:617 #, python-format -msgid "Domain (%s)" +msgid "Project (%s)" msgstr "" #: keystone/assignment/core.py:619 +#, python-format +msgid "Domain (%s)" +msgstr "" + +#: keystone/assignment/core.py:621 msgid "Unknown Target" msgstr "" -#: keystone/assignment/core.py:1105 keystone/common/controller.py:286 -#: keystone/identity/core.py:310 +#: keystone/assignment/core.py:1107 keystone/common/controller.py:286 +#: keystone/identity/core.py:330 #, python-format msgid "Expected dict or list: %s" msgstr "" #: keystone/assignment/backends/kvs.py:257 -#: keystone/assignment/backends/ldap.py:552 +#: keystone/assignment/backends/ldap.py:550 #: keystone/assignment/backends/sql.py:405 #, python-format msgid "Cannot remove role that has not been granted, %s" @@ -463,14 +474,14 @@ msgid "Domain metadata not supported by LDAP" msgstr "" #: keystone/assignment/backends/ldap.py:215 -#: keystone/assignment/backends/ldap.py:259 keystone/catalog/core.py:96 -#: keystone/common/ldap/core.py:1340 keystone/identity/backends/kvs.py:120 +#: keystone/assignment/backends/ldap.py:259 keystone/catalog/core.py:100 +#: keystone/common/ldap/core.py:1377 keystone/identity/backends/kvs.py:120 #: keystone/identity/backends/kvs.py:225 #, python-format msgid "Duplicate ID, %s." msgstr "" -#: keystone/assignment/backends/ldap.py:223 keystone/common/ldap/core.py:1330 +#: keystone/assignment/backends/ldap.py:223 keystone/common/ldap/core.py:1367 #: keystone/identity/backends/kvs.py:128 keystone/identity/backends/kvs.py:155 #: keystone/identity/backends/kvs.py:232 keystone/identity/backends/kvs.py:260 #, python-format @@ -483,22 +494,22 @@ msgstr "" msgid "Domains are read-only against LDAP" msgstr "" -#: keystone/assignment/backends/ldap.py:320 +#: keystone/assignment/backends/ldap.py:313 #: keystone/assignment/backends/sql.py:145 msgid "Inherited roles can only be assigned to domains" msgstr "" -#: keystone/assignment/backends/ldap.py:529 +#: keystone/assignment/backends/ldap.py:530 #, python-format msgid "User %(user_id)s already has role %(role_id)s in tenant %(tenant_id)s" msgstr "" -#: keystone/assignment/backends/ldap.py:535 +#: keystone/assignment/backends/ldap.py:536 #, python-format msgid "Role %s not found" msgstr "" -#: keystone/assignment/backends/ldap.py:646 +#: keystone/assignment/backends/ldap.py:644 #, python-format msgid "Cannot duplicate name %s" msgstr "" @@ -616,7 +627,7 @@ msgstr "" msgid "Conflicting region IDs specified: \"%(url_id)s\" != \"%(ref_id)s\"" msgstr "" -#: keystone/catalog/core.py:52 +#: keystone/catalog/core.py:56 #, python-format msgid "Malformed endpoint - %(url)r is not a string" msgstr "" @@ -868,66 +879,71 @@ msgstr "" msgid "`key_mangler` functions must be callable." msgstr "" -#: keystone/common/ldap/core.py:177 +#: keystone/common/ldap/core.py:186 #, python-format msgid "Invalid LDAP deref option: %(option)s. Choose one of: %(options)s" msgstr "" -#: keystone/common/ldap/core.py:187 +#: keystone/common/ldap/core.py:196 #, python-format msgid "Invalid LDAP TLS certs option: %(option)s. Choose one of: %(options)s" msgstr "" -#: keystone/common/ldap/core.py:199 +#: keystone/common/ldap/core.py:208 #, python-format msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s" msgstr "" -#: keystone/common/ldap/core.py:573 +#: keystone/common/ldap/core.py:583 msgid "Invalid TLS / LDAPS combination" msgstr "" -#: keystone/common/ldap/core.py:577 -#, python-format -msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available" -msgstr "" - #: keystone/common/ldap/core.py:587 #, python-format +msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available" +msgstr "" + +#: keystone/common/ldap/core.py:597 +#, python-format msgid "tls_cacertfile %s not found or is not a file" msgstr "" -#: keystone/common/ldap/core.py:599 +#: keystone/common/ldap/core.py:609 #, python-format msgid "tls_cacertdir %s not found or is not a directory" msgstr "" -#: keystone/common/ldap/core.py:1309 +#: keystone/common/ldap/core.py:1302 +#, python-format +msgid "ID attribute %(id_attr)s not found in LDAP object %(dn)s" +msgstr "" + +#: keystone/common/ldap/core.py:1346 #, python-format msgid "LDAP %s create" msgstr "" -#: keystone/common/ldap/core.py:1314 +#: keystone/common/ldap/core.py:1351 #, python-format msgid "LDAP %s update" msgstr "" -#: keystone/common/ldap/core.py:1319 +#: keystone/common/ldap/core.py:1356 #, python-format msgid "LDAP %s delete" msgstr "" -#: keystone/common/ldap/core.py:1462 +#: keystone/common/ldap/core.py:1498 #, python-format msgid "Cannot change %(option_name)s %(attr)s" msgstr "" -#: keystone/common/ldap/core.py:1529 +#: keystone/common/ldap/core.py:1585 #, python-format msgid "Member %(member)s is already a member of group %(group)s" msgstr "" -#: keystone/common/ldap/core.py:1587 +#: keystone/common/ldap/core.py:1634 #, python-format msgid "" "When deleting entries for %(search_base)s, could not delete nonexistent " @@ -940,11 +956,11 @@ msgid "" " self " msgstr "" -#: keystone/common/sql/core.py:400 +#: keystone/common/sql/core.py:401 msgid "Duplicate Entry" msgstr "" -#: keystone/common/sql/core.py:416 +#: keystone/common/sql/core.py:417 #, python-format msgid "An unexpected error occurred when trying to store %s" msgstr "" @@ -973,7 +989,7 @@ msgstr "" msgid "Endpoint %(endpoint_id)s not found in project %(project_id)s" msgstr "" -#: keystone/contrib/endpoint_filter/backends/sql.py:178 +#: keystone/contrib/endpoint_filter/backends/sql.py:180 msgid "Endpoint Group Project Association not found" msgstr "" @@ -1108,7 +1124,7 @@ msgstr "" #: keystone/contrib/revoke/core.py:221 keystone/token/provider.py:234 #: keystone/token/provider.py:256 keystone/token/provider.py:354 -#: keystone/token/provider.py:361 keystone/token/providers/common.py:558 +#: keystone/token/provider.py:361 keystone/token/providers/common.py:576 msgid "Failed to validate token" msgstr "" @@ -1130,30 +1146,30 @@ msgstr "" msgid "Unable to add user %(user)s to %(tenant)s." msgstr "" -#: keystone/identity/core.py:101 +#: keystone/identity/core.py:118 #, python-format msgid "Invalid domain name (%s) found in config file name" msgstr "" -#: keystone/identity/core.py:125 +#: keystone/identity/core.py:144 #, python-format msgid "Unable to locate domain config directory: %s" msgstr "" -#: keystone/identity/core.py:200 keystone/identity/backends/kvs.py:75 -#: keystone/identity/backends/kvs.py:77 keystone/identity/backends/ldap.py:61 -#: keystone/identity/backends/ldap.py:63 keystone/identity/backends/ldap.py:69 -#: keystone/identity/backends/ldap.py:71 keystone/identity/backends/sql.py:101 -#: keystone/identity/backends/sql.py:103 +#: keystone/identity/core.py:220 keystone/identity/backends/kvs.py:75 +#: keystone/identity/backends/kvs.py:77 keystone/identity/backends/ldap.py:59 +#: keystone/identity/backends/ldap.py:61 keystone/identity/backends/ldap.py:67 +#: keystone/identity/backends/ldap.py:69 keystone/identity/backends/sql.py:112 +#: keystone/identity/backends/sql.py:114 msgid "Invalid user / password" msgstr "" -#: keystone/identity/core.py:574 keystone/token/core.py:64 +#: keystone/identity/core.py:594 keystone/token/core.py:64 #, python-format msgid "User is disabled: %s" msgstr "" -#: keystone/identity/core.py:616 +#: keystone/identity/core.py:636 msgid "Cannot change user ID" msgstr "" @@ -1161,17 +1177,17 @@ msgstr "" msgid "User not found in group" msgstr "" -#: keystone/identity/backends/ldap.py:101 +#: keystone/identity/backends/ldap.py:99 msgid "Cannot change user name" msgstr "" -#: keystone/identity/backends/ldap.py:186 keystone/identity/backends/sql.py:185 -#: keystone/identity/backends/sql.py:203 +#: keystone/identity/backends/ldap.py:183 keystone/identity/backends/sql.py:196 +#: keystone/identity/backends/sql.py:214 #, python-format msgid "User '%(user_id)s' not found in group '%(group_id)s'" msgstr "" -#: keystone/identity/backends/ldap.py:323 +#: keystone/identity/backends/ldap.py:330 #, python-format msgid "User %(user_id)s is already a member of group %(group_id)s" msgstr "" @@ -1232,6 +1248,47 @@ msgstr "" msgid "Rules must be an instance of dict or Rules, got %s instead" msgstr "" +#: keystone/openstack/common/processutils.py:59 +msgid "Unexpected error while running command." +msgstr "" + +#: keystone/openstack/common/processutils.py:62 +#, python-format +msgid "" +"%(description)s\n" +"Command: %(cmd)s\n" +"Exit code: %(exit_code)s\n" +"Stdout: %(stdout)r\n" +"Stderr: %(stderr)r" +msgstr "" + +#: keystone/openstack/common/processutils.py:143 +#, python-format +msgid "Got unknown keyword args: %r" +msgstr "" + +#: keystone/openstack/common/processutils.py:148 +msgid "Command requested root, but did not specify a root helper." +msgstr "" + +#: keystone/openstack/common/processutils.py:158 +#, python-format +msgid "Running cmd (subprocess): %s" +msgstr "" + +#: keystone/openstack/common/processutils.py:206 +#, python-format +msgid "%r failed. Retrying." +msgstr "" + +#: keystone/openstack/common/processutils.py:248 +msgid "Environment not supported over SSH" +msgstr "" + +#: keystone/openstack/common/processutils.py:252 +msgid "process_input not supported over SSH" +msgstr "" + #: keystone/openstack/common/strutils.py:114 #, python-format msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s" @@ -1340,44 +1397,44 @@ msgid "" "revocation list." msgstr "" -#: keystone/token/providers/common.py:190 -#: keystone/token/providers/common.py:293 +#: keystone/token/providers/common.py:195 +#: keystone/token/providers/common.py:300 #, python-format msgid "User %(user_id)s has no access to project %(project_id)s" msgstr "" -#: keystone/token/providers/common.py:195 -#: keystone/token/providers/common.py:298 +#: keystone/token/providers/common.py:200 +#: keystone/token/providers/common.py:305 #, python-format msgid "User %(user_id)s has no access to domain %(domain_id)s" msgstr "" -#: keystone/token/providers/common.py:220 +#: keystone/token/providers/common.py:227 msgid "Trustor is disabled." msgstr "" -#: keystone/token/providers/common.py:284 +#: keystone/token/providers/common.py:291 msgid "Trustee has no delegated roles." msgstr "" -#: keystone/token/providers/common.py:337 +#: keystone/token/providers/common.py:344 #, python-format msgid "Invalid audit info data type: %(data)s (%(type)s)" msgstr "" -#: keystone/token/providers/common.py:358 +#: keystone/token/providers/common.py:365 msgid "User is not a trustee." msgstr "" -#: keystone/token/providers/common.py:430 +#: keystone/token/providers/common.py:442 msgid "Oauth is disabled." msgstr "" -#: keystone/token/providers/common.py:487 +#: keystone/token/providers/common.py:499 msgid "Non-default domain is not supported" msgstr "" -#: keystone/token/providers/common.py:495 +#: keystone/token/providers/common.py:507 msgid "Domain scoped token is not supported" msgstr "" diff --git a/keystone/locale/ko_KR/LC_MESSAGES/keystone-log-warning.po b/keystone/locale/ko_KR/LC_MESSAGES/keystone-log-warning.po index d184eabce1..265e5b7776 100644 --- a/keystone/locale/ko_KR/LC_MESSAGES/keystone-log-warning.po +++ b/keystone/locale/ko_KR/LC_MESSAGES/keystone-log-warning.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:06+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: 2014-06-20 20:10+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/keystone/" @@ -38,19 +38,26 @@ msgstr "" msgid "KVS lock released (timeout reached) for: %s" msgstr "" -#: keystone/common/ldap/core.py:989 +#: keystone/common/ldap/core.py:1002 msgid "" "LDAP Server does not support paging. Disable paging in keystone.conf to " "avoid this message." msgstr "" -#: keystone/common/ldap/core.py:1185 +#: keystone/common/ldap/core.py:1201 #, python-format msgid "" "Invalid additional attribute mapping: \"%s\". Format must be " ":" msgstr "" +#: keystone/common/ldap/core.py:1312 +#, python-format +msgid "" +"ID attribute %(id_attr)s for LDAP object %(dn)s has multiple values and " +"therefore cannot be used as an ID. Will get the ID from DN instead" +msgstr "" + #: keystone/contrib/endpoint_policy/core.py:91 #, python-format msgid "" diff --git a/keystone/locale/pt_BR/LC_MESSAGES/keystone-log-warning.po b/keystone/locale/pt_BR/LC_MESSAGES/keystone-log-warning.po index aa6e644b7d..ea53a1659c 100644 --- a/keystone/locale/pt_BR/LC_MESSAGES/keystone-log-warning.po +++ b/keystone/locale/pt_BR/LC_MESSAGES/keystone-log-warning.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:06+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: 2014-06-20 20:10+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" @@ -38,19 +38,26 @@ msgstr "" msgid "KVS lock released (timeout reached) for: %s" msgstr "" -#: keystone/common/ldap/core.py:989 +#: keystone/common/ldap/core.py:1002 msgid "" "LDAP Server does not support paging. Disable paging in keystone.conf to " "avoid this message." msgstr "" -#: keystone/common/ldap/core.py:1185 +#: keystone/common/ldap/core.py:1201 #, python-format msgid "" "Invalid additional attribute mapping: \"%s\". Format must be " ":" msgstr "" +#: keystone/common/ldap/core.py:1312 +#, python-format +msgid "" +"ID attribute %(id_attr)s for LDAP object %(dn)s has multiple values and " +"therefore cannot be used as an ID. Will get the ID from DN instead" +msgstr "" + #: keystone/contrib/endpoint_policy/core.py:91 #, python-format msgid "" diff --git a/keystone/locale/pt_BR/LC_MESSAGES/keystone.po b/keystone/locale/pt_BR/LC_MESSAGES/keystone.po index 370ef032ef..1d99a6b86e 100644 --- a/keystone/locale/pt_BR/LC_MESSAGES/keystone.po +++ b/keystone/locale/pt_BR/LC_MESSAGES/keystone.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:05+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: 2014-04-19 01:30+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Portuguese (Brazil) " @@ -358,14 +358,21 @@ msgstr "" msgid "The Keystone configuration file %(config_file)s could not be found." msgstr "" -#: keystone/exception.py:403 +#: keystone/exception.py:402 +#, python-format +msgid "" +"The Keystone domain configuration file %(config_file)s defines an " +"additional SQL driver - only one is permitted." +msgstr "" + +#: keystone/exception.py:409 #, python-format msgid "" "%(mod_name)s doesn't provide database migrations. The migration " "repository path at %(path)s doesn't exist or isn't a directory." msgstr "" -#: keystone/exception.py:415 +#: keystone/exception.py:421 #, python-format msgid "" "Unable to sign SAML assertion. It is likely that this server does not " @@ -387,38 +394,38 @@ msgstr "" msgid "Failed to send %(res_id)s %(event_type)s notification" msgstr "Falha ao enviar notificação %(res_id)s %(event_type)s" -#: keystone/notifications.py:457 +#: keystone/notifications.py:455 #, python-format msgid "Failed to send %(action)s %(event_type)s notification" msgstr "" -#: keystone/assignment/controllers.py:76 +#: keystone/assignment/controllers.py:77 #, python-format msgid "Authentication failed: %s" msgstr "Autenticação falhou: %s" -#: keystone/assignment/controllers.py:109 -#: keystone/assignment/controllers.py:223 keystone/identity/controllers.py:67 +#: keystone/assignment/controllers.py:110 +#: keystone/assignment/controllers.py:224 keystone/identity/controllers.py:67 msgid "Name field is required and cannot be empty" msgstr "Campo nome é requerido e não pode ser vazio" -#: keystone/assignment/controllers.py:164 +#: keystone/assignment/controllers.py:165 msgid "Marker could not be found" msgstr "Marcador não pôde ser encontrado" -#: keystone/assignment/controllers.py:175 +#: keystone/assignment/controllers.py:176 msgid "Invalid limit value" msgstr "Valor limite inválido" -#: keystone/assignment/controllers.py:478 +#: keystone/assignment/controllers.py:479 msgid "Specify a domain or project, not both" msgstr "Especifique um domínio ou projeto, não ambos" -#: keystone/assignment/controllers.py:483 +#: keystone/assignment/controllers.py:484 msgid "Specify a user or group, not both" msgstr "Epecifique um usuário ou grupo, não ambos" -#: keystone/assignment/controllers.py:702 +#: keystone/assignment/controllers.py:712 #, python-format msgid "" "Group %(group)s not found for role-assignment - %(target)s with Role: " @@ -438,36 +445,40 @@ msgstr "O domínio está desativado: %s" msgid "Project is disabled: %s" msgstr "O projeto está desativado: %s" -#: keystone/assignment/core.py:382 +#: keystone/assignment/core.py:325 +msgid "Multiple domains are not supported" +msgstr "" + +#: keystone/assignment/core.py:385 msgid "delete the default domain" msgstr "" -#: keystone/assignment/core.py:393 +#: keystone/assignment/core.py:396 msgid "cannot delete a domain that is enabled, please disable it first." msgstr "" -#: keystone/assignment/core.py:615 +#: keystone/assignment/core.py:617 #, python-format msgid "Project (%s)" msgstr "Projeto (%s)" -#: keystone/assignment/core.py:617 +#: keystone/assignment/core.py:619 #, python-format msgid "Domain (%s)" msgstr "Domínio (%s)" -#: keystone/assignment/core.py:619 +#: keystone/assignment/core.py:621 msgid "Unknown Target" msgstr "Alvo Desconhecido" -#: keystone/assignment/core.py:1105 keystone/common/controller.py:286 -#: keystone/identity/core.py:310 +#: keystone/assignment/core.py:1107 keystone/common/controller.py:286 +#: keystone/identity/core.py:330 #, python-format msgid "Expected dict or list: %s" msgstr "Esperado dict ou list: %s" #: keystone/assignment/backends/kvs.py:257 -#: keystone/assignment/backends/ldap.py:552 +#: keystone/assignment/backends/ldap.py:550 #: keystone/assignment/backends/sql.py:405 #, python-format msgid "Cannot remove role that has not been granted, %s" @@ -478,14 +489,14 @@ msgid "Domain metadata not supported by LDAP" msgstr "" #: keystone/assignment/backends/ldap.py:215 -#: keystone/assignment/backends/ldap.py:259 keystone/catalog/core.py:96 -#: keystone/common/ldap/core.py:1340 keystone/identity/backends/kvs.py:120 +#: keystone/assignment/backends/ldap.py:259 keystone/catalog/core.py:100 +#: keystone/common/ldap/core.py:1377 keystone/identity/backends/kvs.py:120 #: keystone/identity/backends/kvs.py:225 #, python-format msgid "Duplicate ID, %s." msgstr "ID duplicado, %s." -#: keystone/assignment/backends/ldap.py:223 keystone/common/ldap/core.py:1330 +#: keystone/assignment/backends/ldap.py:223 keystone/common/ldap/core.py:1367 #: keystone/identity/backends/kvs.py:128 keystone/identity/backends/kvs.py:155 #: keystone/identity/backends/kvs.py:232 keystone/identity/backends/kvs.py:260 #, python-format @@ -498,22 +509,22 @@ msgstr "Nome duplicado, %s." msgid "Domains are read-only against LDAP" msgstr "" -#: keystone/assignment/backends/ldap.py:320 +#: keystone/assignment/backends/ldap.py:313 #: keystone/assignment/backends/sql.py:145 msgid "Inherited roles can only be assigned to domains" msgstr "Roles herdados podem ser atribuídos somente à domínios" -#: keystone/assignment/backends/ldap.py:529 +#: keystone/assignment/backends/ldap.py:530 #, python-format msgid "User %(user_id)s already has role %(role_id)s in tenant %(tenant_id)s" msgstr "" -#: keystone/assignment/backends/ldap.py:535 +#: keystone/assignment/backends/ldap.py:536 #, python-format msgid "Role %s not found" msgstr "Role %s não localizada" -#: keystone/assignment/backends/ldap.py:646 +#: keystone/assignment/backends/ldap.py:644 #, python-format msgid "Cannot duplicate name %s" msgstr "" @@ -631,7 +642,7 @@ msgstr "Nome de usuário ou senha inválidos" msgid "Conflicting region IDs specified: \"%(url_id)s\" != \"%(ref_id)s\"" msgstr "" -#: keystone/catalog/core.py:52 +#: keystone/catalog/core.py:56 #, python-format msgid "Malformed endpoint - %(url)r is not a string" msgstr "" @@ -888,68 +899,73 @@ msgstr "" msgid "`key_mangler` functions must be callable." msgstr "" -#: keystone/common/ldap/core.py:177 +#: keystone/common/ldap/core.py:186 #, python-format msgid "Invalid LDAP deref option: %(option)s. Choose one of: %(options)s" msgstr "" -#: keystone/common/ldap/core.py:187 +#: keystone/common/ldap/core.py:196 #, python-format msgid "Invalid LDAP TLS certs option: %(option)s. Choose one of: %(options)s" msgstr "" "Opção de certificado LADP TLS inválida: %(option)s. Escolha uma de: " "%(options)s" -#: keystone/common/ldap/core.py:199 +#: keystone/common/ldap/core.py:208 #, python-format msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s" msgstr "Escopo LDAP inválido: %(scope)s. Escolha um de: %(options)s" -#: keystone/common/ldap/core.py:573 +#: keystone/common/ldap/core.py:583 msgid "Invalid TLS / LDAPS combination" msgstr "Combinação TLS / LADPS inválida" -#: keystone/common/ldap/core.py:577 +#: keystone/common/ldap/core.py:587 #, python-format msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available" msgstr "Opção LDAP TLS_AVAIL inválida: %s. TLS não dsponível" -#: keystone/common/ldap/core.py:587 +#: keystone/common/ldap/core.py:597 #, python-format msgid "tls_cacertfile %s not found or is not a file" msgstr "tls_cacertfile %s não encontrada ou não é um arquivo" -#: keystone/common/ldap/core.py:599 +#: keystone/common/ldap/core.py:609 #, python-format msgid "tls_cacertdir %s not found or is not a directory" msgstr "tls_cacertdir %s não encontrado ou não é um diretório" -#: keystone/common/ldap/core.py:1309 +#: keystone/common/ldap/core.py:1302 +#, python-format +msgid "ID attribute %(id_attr)s not found in LDAP object %(dn)s" +msgstr "" + +#: keystone/common/ldap/core.py:1346 #, python-format msgid "LDAP %s create" msgstr "Criação de LDAP %s" -#: keystone/common/ldap/core.py:1314 +#: keystone/common/ldap/core.py:1351 #, python-format msgid "LDAP %s update" msgstr "Atualização de LDAP %s" -#: keystone/common/ldap/core.py:1319 +#: keystone/common/ldap/core.py:1356 #, python-format msgid "LDAP %s delete" msgstr "Exclusão de LDAP %s" -#: keystone/common/ldap/core.py:1462 +#: keystone/common/ldap/core.py:1498 #, python-format msgid "Cannot change %(option_name)s %(attr)s" msgstr "Não é possível alterar %(option_name)s %(attr)s" -#: keystone/common/ldap/core.py:1529 +#: keystone/common/ldap/core.py:1585 #, python-format msgid "Member %(member)s is already a member of group %(group)s" msgstr "" -#: keystone/common/ldap/core.py:1587 +#: keystone/common/ldap/core.py:1634 #, python-format msgid "" "When deleting entries for %(search_base)s, could not delete nonexistent " @@ -962,11 +978,11 @@ msgid "" " self " msgstr "" -#: keystone/common/sql/core.py:400 +#: keystone/common/sql/core.py:401 msgid "Duplicate Entry" msgstr "" -#: keystone/common/sql/core.py:416 +#: keystone/common/sql/core.py:417 #, python-format msgid "An unexpected error occurred when trying to store %s" msgstr "" @@ -995,7 +1011,7 @@ msgstr "A credencial pertence à outro usuário" msgid "Endpoint %(endpoint_id)s not found in project %(project_id)s" msgstr "Endpoint %(endpoint_id)s não encontrado no projeto %(project_id)s" -#: keystone/contrib/endpoint_filter/backends/sql.py:178 +#: keystone/contrib/endpoint_filter/backends/sql.py:180 msgid "Endpoint Group Project Association not found" msgstr "" @@ -1134,7 +1150,7 @@ msgstr "" #: keystone/contrib/revoke/core.py:221 keystone/token/provider.py:234 #: keystone/token/provider.py:256 keystone/token/provider.py:354 -#: keystone/token/provider.py:361 keystone/token/providers/common.py:558 +#: keystone/token/provider.py:361 keystone/token/providers/common.py:576 msgid "Failed to validate token" msgstr "Falha ao validar token" @@ -1156,32 +1172,32 @@ msgstr "Não é possível remover usuário %(user)s de %(tenant)s." msgid "Unable to add user %(user)s to %(tenant)s." msgstr "Não é possível adicionar usuário %(user)s em %(tenant)s." -#: keystone/identity/core.py:101 +#: keystone/identity/core.py:118 #, python-format msgid "Invalid domain name (%s) found in config file name" msgstr "" "nome de domínio inválido (%s) encontrado no nome do arquivo de " "configuração" -#: keystone/identity/core.py:125 +#: keystone/identity/core.py:144 #, python-format msgid "Unable to locate domain config directory: %s" msgstr "Não é possível localizar diretório de configuração de domínio: %s" -#: keystone/identity/core.py:200 keystone/identity/backends/kvs.py:75 -#: keystone/identity/backends/kvs.py:77 keystone/identity/backends/ldap.py:61 -#: keystone/identity/backends/ldap.py:63 keystone/identity/backends/ldap.py:69 -#: keystone/identity/backends/ldap.py:71 keystone/identity/backends/sql.py:101 -#: keystone/identity/backends/sql.py:103 +#: keystone/identity/core.py:220 keystone/identity/backends/kvs.py:75 +#: keystone/identity/backends/kvs.py:77 keystone/identity/backends/ldap.py:59 +#: keystone/identity/backends/ldap.py:61 keystone/identity/backends/ldap.py:67 +#: keystone/identity/backends/ldap.py:69 keystone/identity/backends/sql.py:112 +#: keystone/identity/backends/sql.py:114 msgid "Invalid user / password" msgstr "" -#: keystone/identity/core.py:574 keystone/token/core.py:64 +#: keystone/identity/core.py:594 keystone/token/core.py:64 #, python-format msgid "User is disabled: %s" msgstr "O usuário está desativado: %s" -#: keystone/identity/core.py:616 +#: keystone/identity/core.py:636 msgid "Cannot change user ID" msgstr "" @@ -1189,17 +1205,17 @@ msgstr "" msgid "User not found in group" msgstr "Usuário não localizado no grupo" -#: keystone/identity/backends/ldap.py:101 +#: keystone/identity/backends/ldap.py:99 msgid "Cannot change user name" msgstr "" -#: keystone/identity/backends/ldap.py:186 keystone/identity/backends/sql.py:185 -#: keystone/identity/backends/sql.py:203 +#: keystone/identity/backends/ldap.py:183 keystone/identity/backends/sql.py:196 +#: keystone/identity/backends/sql.py:214 #, python-format msgid "User '%(user_id)s' not found in group '%(group_id)s'" msgstr "" -#: keystone/identity/backends/ldap.py:323 +#: keystone/identity/backends/ldap.py:330 #, python-format msgid "User %(user_id)s is already a member of group %(group_id)s" msgstr "Usuário %(user_id)s já é membro do grupo %(group_id)s" @@ -1260,6 +1276,47 @@ msgstr "Política não permite a realização de %s." msgid "Rules must be an instance of dict or Rules, got %s instead" msgstr "Regras devem ser uma instância de dict ou Rules, recebeu %s em seu lugar" +#: keystone/openstack/common/processutils.py:59 +msgid "Unexpected error while running command." +msgstr "" + +#: keystone/openstack/common/processutils.py:62 +#, python-format +msgid "" +"%(description)s\n" +"Command: %(cmd)s\n" +"Exit code: %(exit_code)s\n" +"Stdout: %(stdout)r\n" +"Stderr: %(stderr)r" +msgstr "" + +#: keystone/openstack/common/processutils.py:143 +#, python-format +msgid "Got unknown keyword args: %r" +msgstr "" + +#: keystone/openstack/common/processutils.py:148 +msgid "Command requested root, but did not specify a root helper." +msgstr "" + +#: keystone/openstack/common/processutils.py:158 +#, python-format +msgid "Running cmd (subprocess): %s" +msgstr "" + +#: keystone/openstack/common/processutils.py:206 +#, python-format +msgid "%r failed. Retrying." +msgstr "" + +#: keystone/openstack/common/processutils.py:248 +msgid "Environment not supported over SSH" +msgstr "" + +#: keystone/openstack/common/processutils.py:252 +msgid "process_input not supported over SSH" +msgstr "" + #: keystone/openstack/common/strutils.py:114 #, python-format msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s" @@ -1374,44 +1431,44 @@ msgid "" "revocation list." msgstr "" -#: keystone/token/providers/common.py:190 -#: keystone/token/providers/common.py:293 +#: keystone/token/providers/common.py:195 +#: keystone/token/providers/common.py:300 #, python-format msgid "User %(user_id)s has no access to project %(project_id)s" msgstr "O usuário %(user_id)s não tem acesso ao projeto %(project_id)s" -#: keystone/token/providers/common.py:195 -#: keystone/token/providers/common.py:298 +#: keystone/token/providers/common.py:200 +#: keystone/token/providers/common.py:305 #, python-format msgid "User %(user_id)s has no access to domain %(domain_id)s" msgstr "O usuário %(user_id)s não tem acesso ao domínio %(domain_id)s" -#: keystone/token/providers/common.py:220 +#: keystone/token/providers/common.py:227 msgid "Trustor is disabled." msgstr "O fiador está desativado." -#: keystone/token/providers/common.py:284 +#: keystone/token/providers/common.py:291 msgid "Trustee has no delegated roles." msgstr "Fiador não possui roles delegados." -#: keystone/token/providers/common.py:337 +#: keystone/token/providers/common.py:344 #, python-format msgid "Invalid audit info data type: %(data)s (%(type)s)" msgstr "" -#: keystone/token/providers/common.py:358 +#: keystone/token/providers/common.py:365 msgid "User is not a trustee." msgstr "Usuário não é confiável." -#: keystone/token/providers/common.py:430 +#: keystone/token/providers/common.py:442 msgid "Oauth is disabled." msgstr "Oauth está desabilitado." -#: keystone/token/providers/common.py:487 +#: keystone/token/providers/common.py:499 msgid "Non-default domain is not supported" msgstr "O domínio não padrão não é suportado" -#: keystone/token/providers/common.py:495 +#: keystone/token/providers/common.py:507 msgid "Domain scoped token is not supported" msgstr "O token de escopo de domínio não é suportado" diff --git a/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-warning.po b/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-warning.po index 6a0f46d64e..b24083b7b2 100644 --- a/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-warning.po +++ b/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-warning.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:06+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: 2014-06-20 20:10+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/keystone/" @@ -38,19 +38,26 @@ msgstr "" msgid "KVS lock released (timeout reached) for: %s" msgstr "" -#: keystone/common/ldap/core.py:989 +#: keystone/common/ldap/core.py:1002 msgid "" "LDAP Server does not support paging. Disable paging in keystone.conf to " "avoid this message." msgstr "" -#: keystone/common/ldap/core.py:1185 +#: keystone/common/ldap/core.py:1201 #, python-format msgid "" "Invalid additional attribute mapping: \"%s\". Format must be " ":" msgstr "" +#: keystone/common/ldap/core.py:1312 +#, python-format +msgid "" +"ID attribute %(id_attr)s for LDAP object %(dn)s has multiple values and " +"therefore cannot be used as an ID. Will get the ID from DN instead" +msgstr "" + #: keystone/contrib/endpoint_policy/core.py:91 #, python-format msgid "" diff --git a/keystone/locale/zh_TW/LC_MESSAGES/keystone-log-warning.po b/keystone/locale/zh_TW/LC_MESSAGES/keystone-log-warning.po index 2eab231f71..9df818d31b 100644 --- a/keystone/locale/zh_TW/LC_MESSAGES/keystone-log-warning.po +++ b/keystone/locale/zh_TW/LC_MESSAGES/keystone-log-warning.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Keystone\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n" -"POT-Creation-Date: 2014-09-07 06:06+0000\n" +"POT-Creation-Date: 2014-09-19 06:36+0000\n" "PO-Revision-Date: 2014-06-20 20:10+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/" @@ -38,19 +38,26 @@ msgstr "" msgid "KVS lock released (timeout reached) for: %s" msgstr "" -#: keystone/common/ldap/core.py:989 +#: keystone/common/ldap/core.py:1002 msgid "" "LDAP Server does not support paging. Disable paging in keystone.conf to " "avoid this message." msgstr "" -#: keystone/common/ldap/core.py:1185 +#: keystone/common/ldap/core.py:1201 #, python-format msgid "" "Invalid additional attribute mapping: \"%s\". Format must be " ":" msgstr "" +#: keystone/common/ldap/core.py:1312 +#, python-format +msgid "" +"ID attribute %(id_attr)s for LDAP object %(dn)s has multiple values and " +"therefore cannot be used as an ID. Will get the ID from DN instead" +msgstr "" + #: keystone/contrib/endpoint_policy/core.py:91 #, python-format msgid ""