fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 01:05:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'forgejo/forgejo-development' into wip-forgejo

Browse source
This commit is contained in:
Earl Warren 2024-02-09 18:58:05 +01:00
parent 3c31c92efb 859020409e
commit 16794897bc
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
options/locale/locale_en-US.ini
View file

@ -448,7 +448,7 @@ activate_email.text = Please click the following link to verify your email addre
admin.new_user.subject = New user %s just signed up
admin.new_user.user_info = User Information
admin.new_user.text = Please <a href="%s">click here</a> to manage the user from the admin panel.
admin.new_user.text = Please <a href="%s">click here</a> to manage this user from the admin panel.
register_notify = Welcome to Forgejo
register_notify.title = %[1]s, welcome to %[2]s
@ -658,7 +658,7 @@ blocked_users = Blocked Users
public_profile = Public Profile
biography_placeholder = Tell us a little bit about yourself! (You can use Markdown)
location_placeholder = Share your approximate location with others
profile_desc = Control how your profile is show to other users. Your primary email address will be used for notifications, password recovery and web-based Git operations.
profile_desc = Control how your profile is shown to other users. Your primary email address will be used for notifications, password recovery and web-based Git 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
website = Website
@ -1027,7 +1027,7 @@ mirror_sync = synced
mirror_sync_on_commit = Sync when commits are pushed
mirror_address = Clone From URL
mirror_address_desc = Put any required credentials in the Authorization section.
mirror_address_url_invalid = The provided URL is invalid. You must escape all components of the url correctly.
mirror_address_url_invalid = The provided URL is invalid. You must escape all components of the URL correctly.
mirror_address_protocol_invalid = The provided URL is invalid. Only http(s):// or git:// locations can be used for mirroring.
mirror_lfs = Large File Storage (LFS)
mirror_lfs_desc = Activate mirroring of LFS data.
@ -1789,7 +1789,7 @@ pulls.required_status_check_missing = Some required checks are missing.
pulls.required_status_check_administrator = As an administrator, you may still merge this pull request.
pulls.blocked_by_approvals = "This pull request doesn't have enough approvals yet. %d of %d approvals granted."
pulls.blocked_by_rejection = "This pull request has changes requested by an official reviewer."
pulls.blocked_by_official_review_requests = "This pull request has official review requests."
pulls.blocked_by_official_review_requests = "This pull request is blocked because it is missing approval from one or more official reviewers."
pulls.blocked_by_outdated_branch = "This pull request is blocked because it's outdated."
pulls.blocked_by_changed_protected_files_1= "This pull request is blocked because it changes a protected file:"
pulls.blocked_by_changed_protected_files_n= "This pull request is blocked because it changes protected files:"