diff --git a/core/src/main/java/jenkins/security/apitoken/ApiTokenPropertyConfiguration.java b/core/src/main/java/jenkins/security/apitoken/ApiTokenPropertyConfiguration.java
index 81c903ba4b0bf310137232b886107a482b090e45..2035843f02bfa9dfd2360540609f1add45e9722f 100644
--- a/core/src/main/java/jenkins/security/apitoken/ApiTokenPropertyConfiguration.java
+++ b/core/src/main/java/jenkins/security/apitoken/ApiTokenPropertyConfiguration.java
@@ -37,19 +37,19 @@ import org.jenkinsci.Symbol;
@Symbol("apiToken")
public class ApiTokenPropertyConfiguration extends GlobalConfiguration {
/**
- * When a user is created, this property determine if we create a legacy token for the user or not
- * For security reason, we do not recommend to enable this but we let that open to ease upgrade.
+ * When a user is created, this property determines whether or not we create a legacy token for the user.
+ * For security reasons, we do not recommend you enable this but we left that open to ease upgrades.
*/
private boolean tokenGenerationOnCreationEnabled = false;
/**
- * When a user has a legacy token, this property determine if the user can request a new legacy token or not
- * For security reason, we do not recommend to enable this but we let that open to ease upgrade.
+ * When a user has a legacy token, this property determines whether or not the user can request a new legacy token.
+ * For security reasons, we do not recommend you enable this but we left that open to ease upgrades.
*/
private boolean creationOfLegacyTokenEnabled = false;
/**
- * Each time an API Token is used, its usage counter is incremented and the last usage date is updated.
+ * Each time an API Token is used, its usage counter is incremented and the last used date is updated.
* You can disable this feature using this property.
*/
private boolean usageStatisticsEnabled = true;
diff --git a/core/src/main/resources/hudson/model/User/index.jelly b/core/src/main/resources/hudson/model/User/index.jelly
index d4895ca5a119095265cdee1d4a5d6417197327e8..b16f2b3e63761c7db7856335bafe3e1a2b7a0043 100644
--- a/core/src/main/resources/hudson/model/User/index.jelly
+++ b/core/src/main/resources/hudson/model/User/index.jelly
@@ -32,7 +32,7 @@ THE SOFTWARE.
- ${%Jenkins User Id}: ${it.id}
+ ${%Jenkins User ID}: ${it.id}
diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly b/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly
index 8bcfe21fc7debdf881861869da12e1f0eb483697..ffdcd6d2f351a75f4e1fe6ecc9912259dbfe8ed6 100644
--- a/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly
+++ b/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly
@@ -101,7 +101,7 @@ THE SOFTWARE.
|
- ${%User Id} |
+ ${%User ID} |
${%Name} |
${%Last Commit Activity} |
${%On} |
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
index 9b7fe9d0fae2be471385ab3aecdaddf90f254aa0..a7cad84726f1fda839af513793310c15b4aff4e3 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
@@ -33,7 +33,7 @@ THE SOFTWARE.
|
- ${%User Id} |
+ ${%User ID} |
${%Name} |
|
diff --git a/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.properties b/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.properties
index 3ada4c71859c8188b798c05c8ee420e61055609e..409151e541706424f84b322d6240b16c3a18abd6 100644
--- a/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.properties
+++ b/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.properties
@@ -4,24 +4,24 @@ contextMessage=The following users have a legacy API token. \
Additionally, in previous versions of Jenkins, API tokens were automatically created for every new user. \
Often, users did not use the token, resulting in a larger attack surface than necessary. \
Automatic token generation must now be enabled explicitly.
-recommendationMessage=For such reasons, we recommend to: \
+recommendationMessage=For such reasons, we recommend you: \
\
- revoke the tokens that were never used and
\
- ask users that are currently using their legacy token to generate a token using the new system and revoke their legacy token
\
-UserId=User Id
+UserId=User ID
UserFullName=User full name
TokenName=Token name
NumDaysSinceCreation=Days since creation
-NumOfUse=# of use
+NumOfUse=# of uses
NumDaysSinceLastUse=Days since last use
HasFreshToken=Fresh token?
HasFreshToken_tooltip=A fresh token is one that was created using the new system \
after the most recent use of the user''s legacy token. \n\
Note: the creation date of legacy tokens which have never been used are reset every time Jenkins is restarted, \
- which means that the date may be inaccurate.
-HasFreshToken_ok_tooltip=A fresh token exist for that user
-HasFreshToken_warning_tooltip=No fresh token exist for that user
+ which means that the date for those tokens will be inaccurate.
+HasFreshToken_ok_tooltip=A fresh token exists for this user
+HasFreshToken_warning_tooltip=No fresh token exists for this user
HasMoreRecentlyUsedToken=Recent token?
HasMoreRecentlyUsedToken_tooltip=A recently used token is one that was created using the new system \
and used more recently than the user''s legacy token. \n\