Address Devin's rewording points

2026-11-15 13:02:19 +00:00 · 2018-05-25 11:50:40 +02:00
1 parent 0ca6238d66
commit eac53dcf72
@@ -4,12 +4,12 @@ GenerateNewToken=Generate
 NoTokenYet=There is no registered token for this user
 TokenLastUse=Used <b>{0}</b> time(s), last time was <b>{1}</b> day(s) ago
 StatisticsDisabled=No statistics available
-StatisticsDisabled.Title=The current configuration disables the statistics about token usage
+StatisticsDisabled.Title=Token usage statistics are currently disabled
 TokenNeverUsed=Never used
-TokenNeverUsed.Title=If you do not plan to use it, we strongly advice you to revoke it for security reasons
+TokenNeverUsed.Title=We strongly recommend that you revoke tokens which you do not plan to use
 ConfirmRevokeSingle=Are you sure you want to revoke this token ? Applications that are using it will be not able to connect anymore.
 CurrentTokens=Current token(s)
 TokenCreation=Created {0} day(s) ago
 RenameToken=Save the new name of the token
-LegacyToken=We strongly recommend you to revoke this Legacy API Token as it is not as secure as the others
+LegacyToken=We strongly recommend that you revoke this legacy token and replace it with a newly generated token for increased security.
 NoLegacyToken=The user does not have a legacy token
@@ -1,11 +1,11 @@
 <div>
-    The API tokens can be used for authenticating yourself in the REST API call.
+    API tokens offer a way to make authenticated CLI or REST API calls.
    See <a href="https://jenkins.io/redirect/api-token">our wiki</a> for more details.<br/>
    The username associated with each token is your Jenkins username.<br/>
    <br/>
    Some good practices for keeping your API tokens secure are:
    <ul>
-        <li>Use a different token for each application (if one application is compromised, you do not lose data from other)</li>
+        <li>Use a different token for each application so that if an application is compromised you can revoke its token individually.</li>
        <li>Regenerate the tokens every 6 months (depending on your context). We put an indicator concerning the age of the token.</li>
        <li>Protect it like your password, as it allows other people to access Jenkins as you.</li>
    </ul>
@@ -25,7 +25,6 @@ ApiTokenProperty.ChangeToken.TokenIsHidden=Token is hidden
 ApiTokenProperty.ChangeToken.Success=<div>Updated. See the new token in the field above</div>
 ApiTokenProperty.ChangeToken.SuccessHidden=<div>Updated. You need to login as the user to see the token</div>
 ApiTokenProperty.ChangeToken.CapabilityNotAllowed=<div>Capability to generate a legacy token without an existing one is currently disabled in the security configuration</div>
-ApiTokenProperty.NewTokenGenerated=<div class="success">Token generated! <code>The value will not be displayed </code>anymore, please save it.</div>
 ApiTokenProperty.LegacyTokenName=Legacy Token
 ApiTokenProperty.NoLegacyToken=This user currently does not have a legacy token
 RekeySecretAdminMonitor.DisplayName=Re-keying
@@ -27,13 +27,13 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
    <f:section title="${%API Token}">
        <f:entry field="tokenGenerationOnCreationEnabled">
-            <f:checkbox title="${%Enable generation of Legacy API Token on user creation}"/>
+            <f:checkbox title="${%tokenGenerationOnCreationEnabled}"/>
        </f:entry>
        <f:entry field="creationOfLegacyTokenEnabled">
-            <f:checkbox title="${%Enable capability of user without Legacy API Token to create new one}"/>
+            <f:checkbox title="${%creationOfLegacyTokenEnabled}"/>
        </f:entry>
        <f:entry field="usageStatisticsEnabled">
-            <f:checkbox title="${%Enable usage statistics on the API Token to help users knowing if they have unused / old token}"/>
+            <f:checkbox title="${%usageStatisticsEnabled}"/>
        </f:entry>
    </f:section>
 </j:jelly>
@@ -0,0 +1,3 @@
+tokenGenerationOnCreationEnabled=Generate a legacy API token for each newly created user (Not recommended)
+creationOfLegacyTokenEnabled=Allow users to manually create a legacy API token (Not recommended)
+usageStatisticsEnabled=Enable API Token usage statistics
@@ -1,5 +1,5 @@
 <div>
-    Even if this is disabled (recommended for security reasons), the users are still able to generate new tokens
-    themselves on their configure page using the new system.<br/>
-    It affects only the legacy tokens that are now <strong>deprecated</strong>.
+    This option allows users to generate a legacy API token if they do not already have one. 
+    Because legacy tokens are <strong>deprecated</strong>, we recommend disabling it and having users instead generate 
+    new API tokens from the user configuration page.
 </div>
@@ -1,5 +1,5 @@
 <div>
-    If this capability is disabled (recommended for security reasons), the users will be forced to use the new system of API token. <br/>
-    This behavior was the legacy one used until the new system was implemented.
-    It affects only the legacy tokens that are now <strong>deprecated</strong>.
+    This option causes a legacy API token to be generated automatically for newly created users. 
+    Because legacy tokens are <strong>deprecated</strong>, we recommend disabling it and having users instead generate 
+    new API tokens from the user configuration page as needed.
 </div>
@@ -1,7 +1,8 @@
 <div>
-    When a user is authenticated by an API Token, its usage counter is incremented and its last usage date updated.
+    If this option is enabled, then the date of the most recent use of each API token and the total number of times 
+    it has been used are stored in Jenkins. 
+    This allows users to see if they have unused or outdated API tokens which should be revoked.
    <br />
    
-    This allows users to have better understanding on which token are often used or potentially was never used or too long ago. 
-    This could be a good signal for revocation.
+    This data is stored in your Jenkins instance and will not be used for any other purpose.
 </div>
@@ -25,7 +25,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
    <div class="alert alert-warning">
        <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-            <f:submit name="yes" value="${%Disable legacy generation by default}"/>
+            <f:submit name="yes" value="${%Disable automatic generation of legacy API tokens}"/>
            <f:submit name="no" value="${%Dismiss}"/>
        </form>
        ${%warningMessage}
@@ -1,2 +1,4 @@
-warningMessage=A Legacy API Token is currently generated when a new user is created. <br />\
-  This behavior is just implemented to help users migrate at their own pace but not meant for long-term use.
+warningMessage=A legacy API token will be generated automatically for newly created users.<br/>\
+  This behavior is supported for backwards compatibility, but legacy API tokens are deprecated and \
+  are not recommended for long-term use.<br/>\
+  Users should instead generate API tokens as needed from the user configuration page.
@@ -25,7 +25,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
    <div class="alert alert-warning">
        <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-            <f:submit name="yes" value="${%Disable that capability}"/>
+            <f:submit name="yes" value="${%Prevent users from manually creating legacy API tokens}"/>
            <f:submit name="no" value="${%Dismiss}"/>
        </form>
        ${%warningMessage}
@@ -1,2 +1,4 @@
-warningMessage=Users without Legacy API Token have the capability to create new Legacy API Token. <br />\
-  This behavior is just implemented to help users migrate at their own pace but not meant for long-term use.
+warningMessage=Users without legacy API tokens are able to generate a new legacy token.<br/>\
+  This behavior is supported for backwards compatibility, but legacy API tokens are deprecated and \
+  are not recommended for long-term use.<br/>\
+  Users should instead generate API tokens as needed from the user configuration page.
@@ -1,13 +1,13 @@
 title=Manage Legacy API Token usage
-contextMessage=The following users are using Legacy API Token. \
-As that old system stores the credentials in a recoverable format, it is strongly advised to migrate to the new system.<br /> \
-In previous versions of Jenkins, the creation of a new user implied to the generation of an Legacy API Token. \
-Often majority of users are not using that token and so provide a larger potential attack surface than required.<br /> \
-From now, the automatic generation of token is determined by configuration.
+contextMessage=The following users have a legacy API token. \
+  Because legacy tokens are stored in a recoverable format, we recommend migrating to the new API token system. \
+  Additionally, in previous version 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: \
 <ul>\
  <li>revoke the tokens that were never used and</li>\
-  <li>ask users that are effectively using their legacy token to generate a new token using the new system and revoking the legacy one</li>\
+  <li>ask users that are currently using their legacy token to generate a token using the new system and revoke their legacy token</li>\
 </ul>
 UserId=User Id
 UserFullName=User full name
@@ -16,18 +16,18 @@ NumDaysSinceCreation=Days since creation
 NumOfUse=# of use
 NumDaysSinceLastUse=Days since last use
 HasFreshToken=Fresh token?
-HasFreshToken_tooltip=A fresh token is a token from the new system \
-that was created after the last use of the legacy token. \n\n\
-Also it is important to notice that legacy token's creation date is reset \n\
-every time the instance is restarted if they were never saved before. So it was never used, the date is not really accurate.
+HasFreshToken_tooltip=A fresh token is one that was created using the new system\n\
+  after the most recent use of the user's legacy token. \n\n\
+  Note: the creation date of legacy tokens which have never been used are reset every time Jenkins is restarted, \n\
+  which means that the date may be inaccurate.
 HasMoreRecentlyUsedToken=Recent token?
-HasMoreRecentlyUsedToken_tooltip=A recently used token is a token from the new system \
-that was used the last time after the last use of the legacy token. \n\n\
-Also it is important to notice that legacy token's creation date is reset \n\
-every time the instance is restarted if they were never saved before.
-NoImpactedUser=There are no users with legacy token
+HasMoreRecentlyUsedToken_tooltip=A recently used token is one that was created using the new system \n\
+  and used more recently than the user's legacy token. \n\n\
+  Note: the creation date of legacy tokens which have never been used are reset every time Jenkins is restarted, \n\
+  which means that the date may be inaccurate.
+NoImpactedUser=There are no users with a legacy token
 NoCreationDate=There is no creation date for that token
 NoLastUse=There is no last use date for that token
 RevokeAllSelected=Revoke the selected token(s)
 RevokeAllSelected_confirm=Are you sure about revoking all %num% selected token(s)
-RevokeAllSelected_nothing=No token is selected, please select at least one to do the revocation
+RevokeAllSelected_nothing=No token is selected, please select at least one to revoke
@@ -1,3 +1,3 @@
-warningMessage=There are users that are still using Legacy API Token. \
-  That system is not as secured as the new one because it stores the token in a recoverable manner on the disk. <br />\
+warningMessage=There are users that are still using a legacy API token. \
+  That system is not as secure as the new one because it stores the token in a recoverable manner on the disk. <br />\
  See <a href="{0}/{1}/manage">list of impacted users</a>.