From 147f4a9d5d2fe94dbf0acc0c33bfcf44926c1780 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mar 25 2024 22:35:37 +0000 Subject: English improvements Signed-off-by: Jerry James --- diff --git a/pagure/templates/_access_levels_descriptions.html b/pagure/templates/_access_levels_descriptions.html index c4fba2a..a930bf9 100644 --- a/pagure/templates/_access_levels_descriptions.html +++ b/pagure/templates/_access_levels_descriptions.html @@ -2,17 +2,17 @@

Ticket: A user or a group with this level of access can only edit metadata of an issue. This includes changing the status of an issue, adding/removing - tags from them, adding/removing assignees and every other option which can - be accessed when you click "Edit Metadata" button in an issue page. However, - this user can not "create" a new tag or "delete" an existing tag because, - that would involve access to settings page of the project which this user - won't have. It also won't be able to "delete" the issue because, it falls + tags, adding/removing assignees and every other option which can be accessed + when you click "Edit Metadata" button in an issue page. However, this user + can not "create" a new tag or "delete" an existing tag because that requires + access to the settings page of the project, which this user cannot do. The + user also won't be able to "delete" the issue, because that action falls outside of "Edit Metadata".

-Collaborator: A user or a group with this level of access can do everything what +Collaborator: A user or a group with this level of access can do everything that a user/group with ticket access can do + it can commit to some branches in the project. - These branches are defined here using their name or a pattern and needs to be comma separated.
+ These branches are defined here using their name or a pattern and need to be comma separated.
Some examples:

-Commit: A user or a group with this level of access can do everything what - a user/group with ticket access can do + it can do everything on the project - which doesn't include access to settings page. It can "Edit Metadata" of an issue - just like a user with ticket access would do, can merge a pull request, can push +Commit: A user or a group with this level of access can do everything that + a user/group with ticket access can do + it can take any action on the project + that doesn't include access to the settings page. It can "Edit Metadata" of an + issue just like a user with ticket access, can merge a pull request, can push to the main repository directly, delete an issue, cancel a pull request etc.

-Admin: The user/group with this access has access to everything on the project. - All the "users" of the project that have been added till now are having this access. - They can change the settings of the project, add/remove users/groups on the project. +Admin: A user/group with this level of access has access to everything in the project. + All the "users" of the project that have been added until now have this access. + They can change the settings of the project and add/remove users/groups on the project.

diff --git a/pagure/templates/edit_group.html b/pagure/templates/edit_group.html index 3db287c..e54ba38 100644 --- a/pagure/templates/edit_group.html +++ b/pagure/templates/edit_group.html @@ -99,7 +99,7 @@ $('#user').selectize({ }); $('.give_group_btn').click(function() { - return confirm('Are you sure to give {{ group.group_name }}? \nThis is final and cannot be un-done.'); + return confirm('Are you sure you want to give {{ group.group_name }}? \nThis is final and cannot be undone.'); }) {% endblock %} diff --git a/pagure/templates/group_info.html b/pagure/templates/group_info.html index 1e6088f..395a35b 100644 --- a/pagure/templates/group_info.html +++ b/pagure/templates/group_info.html @@ -128,7 +128,7 @@ return confirm('Are you sure you want to delete the group `{{ group.group_name }}`?'); }) $('.remove-user-btn').click(function() { - return confirm('Are you sure to remove user `' + $(this).attr('data-username') + '` from the group `{{ group.group_name }}`?'); + return confirm('Are you sure you want to remove user `' + $(this).attr('data-username') + '` from the group `{{ group.group_name }}`?'); }) $('#headerSearch').on('keypress keydown keyup', function(e) { if (e.which == 13) { diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html index 56802e7..9070bfe 100644 --- a/pagure/templates/issue.html +++ b/pagure/templates/issue.html @@ -845,7 +845,7 @@ $(document).ready(function() { 'value': '{{ form.csrf_token.current_token }}', 'type': 'hidden' })).appendTo('body'); - if (confirm('Are you sure to delete this ticket? \nThis is final and cannot be un-done.')){ + if (confirm('Are you sure you want to delete this ticket? \nThis is final and cannot be undone.')){ closeForm.submit(); } return false; @@ -1009,7 +1009,7 @@ function take_issue(){ setup_btn_take_drop(); } ).fail(function() { - alert( "An error occured, could not assign this ticket to you." ); + alert( "An error occurred, could not assign this ticket to you." ); }) return false; } @@ -1034,7 +1034,7 @@ function drop_issue(){ setup_btn_take_drop(); } ).fail(function() { - alert( "An error occured, could not drop the current assignee." ); + alert( "An error occurred, could not drop the current assignee." ); }) return false; } diff --git a/pagure/templates/repo_branches.html b/pagure/templates/repo_branches.html index d2f2afa..726b82c 100644 --- a/pagure/templates/repo_branches.html +++ b/pagure/templates/repo_branches.html @@ -120,7 +120,7 @@ $(function() { $(".delete-branch-form").submit(function() { console.log($(this)); - return confirm('Are you sure you want to remove the branch: ' + $(this).attr("data-branch-name") + '?\nThis cannot be un-done!'); + return confirm('Are you sure you want to remove the branch: ' + $(this).attr("data-branch-name") + '?\nThis cannot be undone!'); }); var _cnt = 0; diff --git a/pagure/templates/settings.html b/pagure/templates/settings.html index 1719dc0..22195bb 100644 --- a/pagure/templates/settings.html +++ b/pagure/templates/settings.html @@ -146,7 +146,7 @@ - Tags for project itself, as a comma-separated list. Tags + Tags for the project itself, as a comma-separated list. Tags for issues are managed further down on this page. @@ -187,11 +187,11 @@

- Each message sent to the web-hook are signed via hmac and SHA1 using + Each message sent to the web-hook is signed via hmac and SHA1 using this private key.

- This key is private to your project, make sure to store in a safe place + This key is private to your project. Be sure to store it in a safe place and do not share it.

@@ -208,7 +208,7 @@ method="post" class="icon"> {{ form.csrf_token }} @@ -234,7 +234,7 @@

The email addresses entered below will receive all the notifications related to {% if g.issues_enabled %} - (public) issues and {% endif %}pull-requests, this includes + (public) issues and {% endif %}pull-requests. This includes notifications about {% if g.issues_enabled %} new issue or {% endif %} new pull-request, new comment and status change. @@ -506,7 +506,7 @@

Below are the priorities you may assign to a ticket, allowing you to sort them with it. The Weight determines the ordering. Higher - priority should correspond to lower weight. + priority corresponds to lower weight. To remove an entry, simply clean the Weight and Title @@ -571,7 +571,7 @@

- The default priority will be set to all issues created after + The default priority will be set on all issues created after it has been set.

- Here is the list of all the status that can be used when closing + Here is the list of all statuses that can be used when closing an issue.

Set some custom fields for your issues. Field Values are currently - only used for Lists, and it accepts a comma separated list of items + only used for Lists, and consist of a comma separated list of items for the drop down list.

-

Quick replies will be offered in a new comment form on Issue or +

Quick replies will be offered in a new comment form on the Issue or Pull Request page. This allows you to reply to common problems with a click of a button.

The reply can use the same Markdown formatting as regular @@ -1127,21 +1127,21 @@ $(document).ready(function() { updateform(); $('#generate_new_hook_token').click(function() { - return confirm('Are you sure to generate a new token for ' - + 'this project/fork? \nThis will break all web hook in place and ' - + 'cannot be un-done.'); + return confirm('Are you sure you want to generate a new token for ' + + 'this project/fork? \nThis will break all web hooks in place and ' + + 'cannot be undone.'); }); $('.remove_user_btn').click(function(){ - return confirm('You sure you want to remove this user from this project?'); + return confirm('Are you sure you want to remove this user from this project?'); }); $('.remove_group_btn').click(function(){ - return confirm('You sure you want to remove this group from this project?'); + return confirm('Are you sure you want to remove this group from this project?'); }); $('.remove_deploy_key_btn').click(function(){ - return confirm('You sure you want to remove this deploy key from this project?'); + return confirm('Are you sure you want to remove this deploy key from this project?'); }); $('.delete_report_btn').click(function(){ @@ -1154,21 +1154,21 @@ $(document).ready(function() { }); $('.give_project_btn').click(function(){ - return confirm('Are you sure to give {{ repo.fullname }}? \nThis is final and cannot be un-done.'); + return confirm('Are you sure you want to give {{ repo.fullname }}? \nThis is final and cannot be undone.'); }); $('.delete_project_btn').click(function(){ - return confirm('Are you sure to delete {{ repo.fullname }}? \nThis is final and cannot be un-done.'); + return confirm('Are you sure you want to delete {{ repo.fullname }}? \nThis is final and cannot be undone.'); }); $('.revoke_token_btn').click(function(){ - return confirm('Are you sure to revoke this token ?' - + '\nThis will break all application using it and ' - + 'cannot be un-done.'); + return confirm('Are you sure you want to revoke this token ?' + + '\nThis will break all applications using it and ' + + 'cannot be undone.'); }); $('.renew_token_btn').click(function(){ - return confirm('Are you sure to renew this token ?' + return confirm('Are you sure you want to renew this token ?' + '\nIt will have the same ACL but will be a different key.'); }); diff --git a/pagure/templates/settings_api_keys.html b/pagure/templates/settings_api_keys.html index 4323f51..0422ac1 100644 --- a/pagure/templates/settings_api_keys.html +++ b/pagure/templates/settings_api_keys.html @@ -29,16 +29,16 @@

API keys are tokens used to authenticate you on pagure. They can also - be used to grant access to 3rd party application to behave on this - project on your name. + be used to grant access to 3rd party applications to act on this + project on your behalf.

These are your personal tokens; they are not visible to the other admins of this repository.

- These keys are private to your project, make sure to store in a safe - place and do not share it. + These keys are private to your project. Be sure to store them in a safe + place and do not share them.

{% if repo.tokens %} {% for token in repo.tokens %} diff --git a/pagure/templates/user_settings.html b/pagure/templates/user_settings.html index f051fb4..9302587 100644 --- a/pagure/templates/user_settings.html +++ b/pagure/templates/user_settings.html @@ -148,15 +148,15 @@

API keys are tokens used to authenticate you on pagure. They can also - be used to grant access to 3rd party application to behave on all + be used to grant access to 3rd party applications to act on all {{projectstring(plural=True)}} in your name.

These are your personal tokens; they are not visible to others.

- These keys are private, make sure to store in a safe place and - do not share it. + These keys are private. Be sure to store them in a safe place and + do not share them.

{% if user.tokens %} {% for token in user.tokens %} @@ -274,7 +274,7 @@

- Forcefully log out from every current open session. + Forcefully log out from every currently open session.

{{ form.csrf_token }}