Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve multiple strings in en-US locale #26213

Merged
merged 44 commits into from
Aug 8, 2023
Merged
Changes from 11 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
8d85589
Improve multiple strings in en-US locale
n0toose Jul 28, 2023
6c03a40
Fix mistake, improve wording in two other strings
n0toose Jul 29, 2023
5edb210
Just one improvement.
n0toose Jul 29, 2023
49658e0
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
5512eff
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
3fe1184
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
3c72fe7
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
68fb2d3
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
be23fc7
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
ac34d7e
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
5fbaaf5
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
79de8c2
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
120be75
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
8fc9f79
Address comments by wxiaoguang
n0toose Jul 29, 2023
73740e9
Put Gitea issues URL in parameters
delvh Jul 29, 2023
6853fce
Address (some) comments by wxiaoguang
n0toose Jul 29, 2023
7fa1786
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
d27d5af
Remove you've in detailed, formal-sounding strings
n0toose Jul 29, 2023
251ddfa
Actually add that new parameter to template
n0toose Jul 29, 2023
32ce04c
Make purpose of primary email much more explicit
n0toose Jul 29, 2023
70ba259
Additional set of string improvements
n0toose Jul 29, 2023
1c24fe7
Remove John Smith example entirely.
n0toose Jul 29, 2023
b99767b
Update options/locale/locale_en-US.ini
n0toose Jul 29, 2023
7069d0d
Merge branch 'main' into string-improvements
n0toose Jul 29, 2023
c52d4b7
(User feedback) Add new string for Mirror Settings
n0toose Jul 29, 2023
40c02f0
Fix tests
n0toose Jul 29, 2023
3e8b38a
Consistent capitalization in Repository Settings
n0toose Jul 29, 2023
2672036
Replace 'Re-Type' with 'Confirm'
n0toose Jul 29, 2023
95ab0ed
Make 'Private' visibility's tooltip more clear
n0toose Jul 30, 2023
1e61c11
Be explicit on how OAuth secrets disappear
n0toose Jul 30, 2023
ff67ca4
Fix Private visibility tooltip, 'that' sounds too unnatural
n0toose Jul 30, 2023
85d2b9b
Address comment
n0toose Jul 30, 2023
607941d
Merge branch 'main' into string-improvements
n0toose Jul 31, 2023
0a04406
Add periods in signing notice in PRs
n0toose Aug 4, 2023
d51db06
Undo parameter thing
n0toose Aug 4, 2023
da755b4
Do not repeat 'How do I mirror repositories?' title
n0toose Aug 4, 2023
3903db3
Improve 'Packages' menu
n0toose Aug 5, 2023
60eb6d2
Use email description in profile section as well
n0toose Aug 6, 2023
9a85c89
Improve language around what hidden emails do
n0toose Aug 6, 2023
faf68dc
Address delvh's comments
n0toose Aug 6, 2023
0b87ed3
Fix inconsistency in Visibility options
n0toose Aug 6, 2023
98440f2
Make owner.settings.chef.keypair.description more explicit
n0toose Aug 6, 2023
696975d
Fix grammar error in oauth2_application_remove_description
n0toose Aug 8, 2023
c29d08c
Merge branch 'main' into string-improvements
GiteaBot Aug 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ string.desc = Z - A

[error]
occurred = An error occurred
report_message = If believe that this is a Gitea bug, please search for issues on <a href="https://github.com/go-gitea/gitea/issues" target="_blank">GitHub</a> or open a new issue if necessary.
report_message = If you believe that this is a Gitea bug, please search for issues on <a href="%[1]s" target="_blank">GitHub</a> or open a new issue if necessary.
missing_csrf = Bad Request: no CSRF token present
invalid_csrf = Bad Request: invalid CSRF token
not_found = The target couldn't be found.
Expand Down Expand Up @@ -360,7 +360,7 @@ remember_me = Remember This Device
forgot_password_title= Forgot Password
forgot_password = Forgot password?
sign_up_now = Need an account? Register now.
sign_up_successful = Account successfully created. Welcome!
sign_up_successful = Account was successfully created. Welcome!
confirmation_mail_sent_prompt = A new confirmation email has been sent to <b>%s</b>. Please check your inbox within the next %s to complete the registration process.
must_change_password = Update your password
allow_password_change = Require user to change password (recommended)
Expand Down Expand Up @@ -609,7 +609,7 @@ form.name_chars_not_allowed = User name "%s" contains invalid characters.
[settings]
profile = Profile
account = Account
appearance = Interface
appearance = Appearance
password = Password
security = Security
avatar = Avatar
Expand All @@ -626,7 +626,7 @@ uid = UID
webauthn = Security Keys

public_profile = Public Profile
biography_placeholder = Tell us a little bit about yourself! (Markdown enabled)
biography_placeholder = Tell us a little bit about yourself! (You can use Markdown)
profile_desc = Your email address will be used for notifications and other operations.
password_username_disabled = Non-local users are not allowed to change their username. Please contact your site administrator for more details.
full_name = Full Name
Expand Down Expand Up @@ -849,7 +849,7 @@ oauth2_application_create_description = OAuth2 applications gives your third-par
oauth2_application_remove_description = Removing an OAuth2 application will prevent it to access authorized user accounts on this instance. Continue?

authorized_oauth2_applications = Authorized OAuth2 Applications
authorized_oauth2_applications_description = You have granted access to your personal Gitea account to these third party applications. Please revoke access for applications no longer needed.
authorized_oauth2_applications_description = You have granted access to your personal Gitea account to these third party applications. Please revoke access for applications you no longer need.
revoke_key = Revoke
revoke_oauth2_grant = Revoke Access
revoke_oauth2_grant_description = Revoking access for this third party application will prevent this application from accessing your data. Are you sure?
Expand All @@ -860,7 +860,7 @@ twofa_is_enrolled = Your account is currently <strong>enrolled</strong> in two-f
twofa_not_enrolled = Your account is not currently enrolled in two-factor authentication.
twofa_disable = Disable Two-Factor Authentication
twofa_scratch_token_regenerate = Regenerate Scratch Token
twofa_scratch_token_regenerated = Your scratch token is now %s. Please store it in a safe place now, as it will not be shown again later.
twofa_scratch_token_regenerated = Your scratch token is now %s. Store it in a safe place, it will never be shown again.
twofa_enroll = Enroll into Two-Factor Authentication
twofa_disable_note = You can disable two-factor authentication if needed.
twofa_disable_desc = Disabling two-factor authentication will make your account less secure. Continue?
Expand Down Expand Up @@ -1027,8 +1027,8 @@ template.issue_labels = Issue Labels
template.one_item = Must select at least one template item
template.invalid = Must select a template repository

archive.title = This repo is archived. You can view files and clone it, but cannot push or open issues and pull requests.
archive.title_date = This repository has been archived on %s. You can view files and clone it, but cannot push or open issues and pull requests.
archive.title = This repo is archived. You can view files and clone it, but cannot push or open issues or pull requests.
archive.title_date = This repository has been archived on %s. You can view files and clone it, but cannot push or open issues or pull requests.
archive.issue.nocomment = This repo is archived. You cannot comment on issues.
archive.pull.nocomment = This repo is archived. You cannot comment on pull requests.

Expand Down Expand Up @@ -1564,7 +1564,7 @@ issues.due_date_form = "yyyy-mm-dd"
issues.due_date_form_add = "Add due date"
issues.due_date_form_edit = "Edit"
issues.due_date_form_remove = "Remove"
issues.due_date_not_writer = "You need write access to this repository in order to update an issue's due date."
issues.due_date_not_writer = "You need write access to this repository in order to update the due date of an issue."
issues.due_date_not_set = "No due date set."
issues.due_date_added = "added the due date %s %s"
issues.due_date_modified = "modified the due date from %[2]s to %[1]s %[3]s"
Expand Down Expand Up @@ -1723,7 +1723,7 @@ pulls.no_merge_desc = This pull request cannot be merged because all repository
pulls.no_merge_helper = Enable merge options in the repository settings or merge the pull request manually.
pulls.no_merge_wip = This pull request cannot be merged because it is marked as being a work in progress.
pulls.no_merge_not_ready = This pull request is not ready to be merged, check review status and status checks.
pulls.no_merge_access = You are not authorized to merge This pull request.
pulls.no_merge_access = You are not authorized to merge this pull request.
pulls.merge_pull_request = Create merge commit
pulls.rebase_merge_pull_request = Rebase then fast-forward
pulls.rebase_merge_commit_pull_request = Rebase then create merge commit
Expand Down Expand Up @@ -2308,14 +2308,14 @@ settings.matrix.room_id = Room ID
settings.matrix.message_type = Message Type
settings.archive.button = Archive Repo
settings.archive.header = Archive This Repo
settings.archive.text = Archiving the repo will make it entirely read-only. It will be hidden from the dashboard. Nobody (not even you!) will be able to make new commits, issues and pull requests.
settings.archive.text = Archiving the repo will make it entirely read-only. It will be hidden from the dashboard. Nobody (not even you!) will be able to make new commits, or open any issues or pull requests.
settings.archive.success = The repo was successfully archived.
settings.archive.error = An error occurred while trying to archive the repo. See the log for more details.
settings.archive.error_ismirror = You cannot archive a mirrored repo.
settings.archive.branchsettings_unavailable = Branch settings are not available if the repo is archived.
settings.archive.tagsettings_unavailable = Tag settings are not available if the repo is archived.
settings.unarchive.button = Unarchive Repo
settings.unarchive.header = Unarchive This Repo
settings.unarchive.button = Unarchive repo
settings.unarchive.header = Unarchive this repo
settings.unarchive.text = Unarchiving the repo will restore its ability to receive commits and pushes, as well as new issues and pull-requests.
settings.unarchive.success = The repo was successfully unarchived.
settings.unarchive.error = An error occurred while trying to unarchive the repo. See the log for more details.
Expand Down Expand Up @@ -2442,7 +2442,7 @@ release.edit_release = Update Release
release.delete_release = Delete Release
release.delete_tag = Delete Tag
release.deletion = Delete Release
release.deletion_desc = Deleting a release only removes it from Gitea. The Git tag, your repository's contents and its history will not be affected. Continue?
release.deletion_desc = Deleting a release only removes it from Gitea. It will not affect the Git tag, the contents of your repository or its history. Continue?
release.deletion_success = The release has been deleted.
release.deletion_tag_desc = Will delete this tag from repository. Repository contents and history remain unchanged. Continue?
release.deletion_tag_success = The tag has been deleted.
Expand Down