[JENKINS-43388] @cyrille-leclerc requested tweaks to message strings

jenkinsci · Apr 25, 2017 · 0633afc · 0633afc
1 parent a258fee
commit 0633afc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/src/main/resources/hudson/security/LDAPSecurityRealm/config.properties b/src/main/resources/hudson/security/LDAPSecurityRealm/config.properties
@@ -1,4 +1,4 @@
-validationBlurb=<p>Use your username and password to test your LDAP settings before saving.\
+validationBlurb=<p>Use your LDAP username and password to test your LDAP settings before saving.\
   This will validate your settings and prevent you from being accidentally locked out.</p>\
   <p>It is a good practice to verify a few other user accounts as well. You can use an empty \
   password if you don't know their password to validate that user lookup is working.</p>\

diff --git a/src/main/resources/jenkins/security/plugins/ldap/Messages.properties b/src/main/resources/jenkins/security/plugins/ldap/Messages.properties
@@ -1,5 +1,5 @@
-FromUserRecordLDAPGroupMembershipStrategy.DisplayName=Parse user attribute for list of groups
-FromGroupSearchLDAPGroupMembershipStrategy.DisplayName=Search for groups containing user
+FromUserRecordLDAPGroupMembershipStrategy.DisplayName=Parse user attribute for list of LDAP groups
+FromGroupSearchLDAPGroupMembershipStrategy.DisplayName=Search for LDAP groups containing user
 LDAPSecurityRealm.LoginHeader=Login
 LDAPSecurityRealm.AuthenticationSuccessful=Authentication: successful
 LDAPSecurityRealm.AuthenticationFailed=Authentication: failed for user "{0}"
@@ -8,7 +8,7 @@ LDAPSecurityRealm.UserId=User ID: {0}
 LDAPSecurityRealm.UserDn=User Dn: {0}
 LDAPSecurityRealm.UserDisplayName=User Display Name: {0}
 LDAPSecurityRealm.UserEmail=User email: {0}
-LDAPSecurityRealm.GroupMembership=Group membership:
+LDAPSecurityRealm.GroupMembership=LDAP Group membership:
 LDAPSecurityRealm.LookupHeader=Lookup
 LDAPSecurityRealm.UserLookupSuccessful=User lookup: successful
 LDAPSecurityRealm.UserLookupFailed=User lookup: failed for user "{0}"
@@ -17,29 +17,29 @@ LDAPSecurityRealm.UserLookupDoesNotExist=User lookup: user "{0}" does not exist.
 LDAPSecurityRealm.UserLookupBadCredentials=User lookup: bad credentials for user lookup.
 LDAPSecurityRealm.GroupMembershipMatch=User groups consistent (login and lookup)
 LDAPSecurityRealm.GroupMembershipMismatch=User groups inconsistent (login versus lookup)
-LDAPSecurityRealm.GroupLookupSuccessful=Group lookup: successful ({0,choice,1#{0} group|1<{0,number,integer} groups})
+LDAPSecurityRealm.GroupLookupSuccessful=LDAP Group lookup: successful ({0,choice,1#{0} group|1<{0,number,integer} groups})
 LDAPSecurityRealm.NoDisplayName=No display name specified for user!
 LDAPSecurityRealm.EmptyDisplayName=Retrieved display name was empty!
 LDAPSecurityRealm.CouldNotRetrieveDisplayName=Could not retrieve the display name attribute.
 LDAPSecurityRealm.NoEmailAddress=No email address specified for user!
 LDAPSecurityRealm.EmptyEmailAddress=Retrieved email address was empty!
 LDAPSecurityRealm.CouldNotRetrieveEmailAddress=Could not retrieve the email address attribute.
-LDAPSecurityRealm.IsAttributeNameCorrect=Is the attribute name "{0}" correct?
-LDAPSecurityRealm.AvailableAttributes=Available attributes are:
-LDAPSecurityRealm.UserLookupManagerDnRequired=Is a Manager DN and password required to lookup user details?
-LDAPSecurityRealm.UserLookupManagerDnCorrect=Is a Manager DN and password correct?
-LDAPSecurityRealm.UserLookupManagerDnPermissions=Does the Manager DN have permissions to perform user lookup?
-LDAPSecurityRealm.GroupLookupManagerDnPermissions=Does the Manager DN have permissions to perform group lookup?
-LDAPSecurityRealm.GroupLookupManagerDnRequired=Is a Manager DN and password required to lookup group details?
+LDAPSecurityRealm.IsAttributeNameCorrect=Is the LDAP attribute name "{0}" correct?
+LDAPSecurityRealm.AvailableAttributes=Available LDAP attributes are:
+LDAPSecurityRealm.UserLookupManagerDnRequired=Does looking up user details require a Manager Dn and password?
+LDAPSecurityRealm.UserLookupManagerDnCorrect=Are the Manager Dn and password correct?
+LDAPSecurityRealm.UserLookupManagerDnPermissions=Does the Manager Dn have permissions to perform user lookup?
+LDAPSecurityRealm.GroupLookupManagerDnPermissions=Does the Manager Dn have permissions to perform group lookup?
+LDAPSecurityRealm.GroupLookupManagerDnRequired=Does looking up group details require a Manager Dn and password?
 LDAPSecurityRealm.UserLookupSettingsCorrect=Are the user search base and user search filter settings correct?
 LDAPSecurityRealm.GroupLookupSettingsCorrect=Are the group search base and group search filter settings correct?
 LDAPSecurityRealm.NoGroupMembership=No group membership reported
 LDAPSecurityRealm.BasicGroupMembership=No LDAP group membership reported.
 LDAPSecurityRealm.BasicGroupMembershipDetail=If the user is a member of some LDAP groups then the group membership \
   settings are probably configured incorrectly.
-LDAPSecurityRealm.GroupLookupNotPossible=Group lookup: could not verify.
-LDAPSecurityRealm.GroupLookupNotPossibleDetail=Please try with a user that is a member of at least one group.
-LDAPSecurityRealm.GroupLookupFailed=Group lookup: failed for {0,choice,1#{0} group|1<{0,number,integer} groups}:
+LDAPSecurityRealm.GroupLookupNotPossible=LDAP Group lookup: could not verify.
+LDAPSecurityRealm.GroupLookupNotPossibleDetail=Please try with a user that is a member of at least one LDAP group.
+LDAPSecurityRealm.GroupLookupFailed=LDAP Group lookup: failed for {0,choice,1#{0} group|1<{0,number,integer} groups}:
 LDAPSecurityRealm.UsernameMismatch=Username inconsistent (login {0} versus lookup {1})
 LDAPSecurityRealm.DnMismatch=Dn inconsistent (login {0} versus lookup {1})
 LDAPSecurityRealm.DisplayNameMismatch=Display name inconsistent (login {0} versus lookup {1})