Updated text translations

backend/src/main/resources/i18n/messages.properties

@@ -69,6 +69,10 @@ value.signing=Signing
 value.encryption=Encryption
 value.both=Both
 
+value.entity=Entity
+value.condition-ref=ConditionRef
+value.condition-script=ConditionScript
+
 value.file-backed-http-metadata-provider=FileBackedHttpMetadataProvider
 value.file-system-metadata-provider=FileSystemMetadataProvider
 value.local-dynamic-metadata-provider=LocalDynamicMetadataProvider
@@ -130,6 +134,7 @@ label.clear-all-attributes=Clear All Attributes
 label.protocol-support-enumeration=Protocol Support Enumeration
 label.select-protocol=Select Protocol
 label.nameid-format=NameID Format
+label.nameid-formats=NameID Formats
 label.name-and-entity-id=Name and Entity ID
 label.organization-information=Organization Information
 label.contact-information=Contact Information
@@ -181,9 +186,9 @@ label.authentication-methods-to-use=Authentication Methods to Use
 label.auth-method-indexed=Authentication Method
 label.preview-provider=Preview XML
 label.search-entity-id=Search Entity Id
-label.edit-filter=Edit EntityAttributesFilter
+label.edit-filter=Edit Filter
 label.min-4-chars=Minimum 4 characters.
-label.new-filter=New Filter - EntityAttributes
+label.new-filter=New Filter
 label.service-provider=Metadata Source Name:
 label.created-date=Created Date:
 label.service-entity-id=Metadata Source Entity ID:
@@ -299,7 +304,7 @@ label.metadata-provider-type=Metadata Provider Type
 label.metadata-provider-name=Metadata Provider Name
 label.select-metadata-type=Select a metadata provider type
 label.metadata-provider-status=Metadata Provider Status
-label.enable-provider-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP
+label.enable-provider-upon-saving=Enable Metadata Provider?
 label.certificate-type=Type
 
 label.metadata-file=Metadata File
@@ -365,11 +370,34 @@ label.encoding-style=Encoding Style
 label.velocity-engine=Velocity Engine
 label.match=Match
 
+label.remove-existing-formats=Remove Existing Formats?
+label.nameid-formats-format=NameID Format
+label.nameid-formats-value=NameID Value
+label.nameid-formats-type=NameID Type
+
+label.select-filter-type=Select Filter Type
+
+label.admin=Admin
+label.user-maintenance=User Maintenance
+label.user-id=UserId
+label.email=Email
+label.role=Role
+label.delete=Delete?
 
 message.must-be-unique=Must be unique.
 message.name-must-be-unique=Name must be unique.
 message.uri-valid-format=URI must be valid format.
 message.id-unique=ID must be unique.
+message.array-items-must-be-unique=Items in list must be unique.
+
+message.org-name-required=Organization Name is required.
+message.org-displayName-required=Organization Name is required.
+message.org-url-required=Organization Name is required.
+message.org-incomplete=These three fields must all be entered if any single field has a value.
+
+message.type-required=Missing required property: Type
+message.match-required=Missing required property: Match
+message.value-required=Missing required property: Value
 
 message.conflict=Conflict
 message.data-version-contention=Data Version Contention
@@ -416,8 +444,8 @@ tooltip.assertion-consumer-service-location=Assertion Consumer Service Location
 tooltip.assertion-consumer-service-location-binding=Assertion Consumer Service Location Binding
 tooltip.mark-as-default=Mark as Default
 tooltip.protocol-support-enumeration=Protocol Support Enumeration
-tooltip.nameid-format=Add NameID Format
-tooltip.enable-this-service-upon-saving=Enable this service upon saving
+tooltip.nameid-format=Content is name identifier format which is added to all the applicable roles of the entities which match any of the following <Entity> or {{<ConditionRef>}}elements.
+tooltip.enable-this-service-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP
 tooltip.authentication-requests-signed=Authentication Requests Signed
 tooltip.want-assertions-signed=Want Assertions Signed
 tooltip.certificate-name=Certificate Name
@@ -477,9 +505,9 @@ tooltip.enable-provider-upon-saving=If checkbox is clicked, the metadata provide
 tooltip.max-validity-interval=Defines the window within which the metadata is valid.
 tooltip.require-signed-root=If true, this fails to load metadata with no signature on the root XML element.
 tooltip.certificate-file=A key used to verify the signature. Conflicts with trustEngineRef and both of the child elements.
-tooltip.retained-roles=Controls whether to keep entity descriptors that contain no roles
-tooltip.remove-roleless-entity-descriptors=Controls whether to keep entity descriptors that contain no roles.
-tooltip.remove-empty-entities-descriptors=Controls whether to keep entities descriptors that contain no entity descriptors.
+tooltip.retained-roles=Note that property replacement cannot be used on this element.
+tooltip.remove-roleless-entity-descriptors=Controls whether to keep entity descriptors that contain no roles. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntityDescriptor> element must include at least one role descriptor.
+tooltip.remove-empty-entities-descriptors=Controls whether to keep entities descriptors that contain no entity descriptors. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntitiesDescriptor> element must include at least one child element, either an <md:EntityDescriptor> element or an <md:EntitiesDescriptor> element.
 
 tooltip.min-refresh-delay=Lower bound on the next refresh from the time calculated based on the metadata\u0027s expiration.
 tooltip.max-refresh-delay=Upper bound on the next refresh from the time calculated based on the metadata\u0027s expiration.
@@ -503,9 +531,14 @@ tooltip.source-directory=Convenience mechanism for wiring a FilesystemLoadSaveMa
 tooltip.remove-idle-entity-data=Flag indicating whether idle metadata should be removed.
 
 tooltip.do-resolver-initialization=Initialize this resolver? In the case of Filesystem resolvers, this will cause the system to read the file and index the resolver.
-tooltip.md-request-type=Options are 1) Metadata Query Protocol, 2) Template, 3) Regex.
+tooltip.md-request-type=Options are 1) Metadata Query Protocol, 2) Regex.
 tooltip.md-request-value=Content of the element.
 tooltip.transform-ref=A reference to a transform function for the entityID. If used, the child element must be empty.
 tooltip.encoding-style=Determines whether and how the entityID value will be URL encoded prior to replacement.  Allowed values are: 1) "none" - no encoding is performed, 2) "form" - encoded using URL form parameter encoding (for query parameters), 3) "path" - encoded using URL path encoding, or 4) "fragment" - encoded using URL fragment encoding. The precise definition of these terms is defined in the documentation for the methods of the Guava library\u0027s UrlEscapers class.
 tooltip.velocity-engine=This attribute may be used to specify the name of the Velocity engine defined within the application.
-tooltip.match=A regular expression against which the entityID is evaluated.
+tooltip.match=A regular expression against which the entityID is evaluated.
+
+tooltip.remove-existing-formats=Whether to remove any existing formats from a role if any are added by the filter (unmodified roles will be untouched regardless of this setting)
+tooltip.nameid-formats-format=Format
+tooltip.nameid-formats-value=Value
+tooltip.nameid-formats-type=Type

backend/src/main/resources/i18n/messages_en.properties

@@ -378,7 +378,11 @@ label.nameid-formats-type=NameID Type
 label.select-filter-type=Select Filter Type
 
 label.admin=Admin
-label.admin-management=User Maintenance
+label.user-maintenance=User Maintenance
+label.user-id=UserId
+label.email=Email
+label.role=Role
+label.delete=Delete?
 
 message.must-be-unique=Must be unique.
 message.name-must-be-unique=Name must be unique.

ui/src/app/user/admin/container/admin-management.component.html

@@ -3,19 +3,19 @@
         <div class="section-header bg-primary p-2 text-light">
             <div class="row justify-content-between">
                 <div class="col-12">
-                    <span class="lead" translate="label.admin-management">User Maintenance</span>
+                    <span class="lead" translate="label.user-maintenance">User Maintenance</span>
                 </div>
             </div>
         </div>
         <div class="p-3">
             <table class="table table-striped">
                 <thead class="thead-primary">
                     <tr>
-                        <th scope="col">UserId</th>
-                        <th scope="col">Name</th>
-                        <th scope="col">Email</th>
-                        <th scope="col">Role</th>
-                        <th scope="col">Delete?</th>
+                        <th scope="col" translate="label.user-id">UserId</th>
+                        <th scope="col" translate="label.name">Name</th>
+                        <th scope="col" translate="label.email">Email</th>
+                        <th scope="col" translate="label.role">Role</th>
+                        <th scope="col" translate="label.delete">Delete?</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -30,7 +30,9 @@
                         </td>
                         <td>
                             <button class="btn btn-link" (click)="deleteUser(user.username)">
-                                <span class="sr-only">Delete User</span>
+                                <span class="sr-only" translate="label.delete-user">
+                                    Delete User
+                                </span>
                                 <i class="fa fa-trash fa-lg text-danger"></i>
                             </button>
                         </td>