Skip to content

Commit

Permalink
Merge pull request '[v7.0/forgejo] Minor improvements to English loca…
Browse files Browse the repository at this point in the history
…le' (go-gitea#4114) from 0ko/forgejo:i18n-backport-20240612 into v7.0/forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4114
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
  • Loading branch information
Earl Warren committed Jun 12, 2024
2 parents d497551 + 4c5d049 commit 5c59a13
Showing 1 changed file with 23 additions and 24 deletions.
47 changes: 23 additions & 24 deletions options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ page = Page
template = Template
language = Language
notifications = Notifications
active_stopwatch = Active Time Tracker
active_stopwatch = Active time tracker
tracked_time_summary = Summary of tracked time based on filters of issue list
create_new = Create…
user_profile_and_more = Profile and Settings
user_profile_and_more = Profile and settings
signed_in_as = Signed in as
enable_javascript = This website requires JavaScript.
toc = Table of Contents
licenses = Licenses
return_to_gitea = Return to Forgejo
toggle_menu = Toggle Menu
toggle_menu = Toggle menu
more_items = More items

username = Username
Expand Down Expand Up @@ -87,9 +87,9 @@ rerun = Re-run
rerun_all = Re-run all jobs
save = Save
add = Add
add_all = Add All
add_all = Add all
remove = Remove
remove_all = Remove All
remove_all = Remove all
remove_label_str = Remove item "%s"
edit = Edit
view = View
Expand Down Expand Up @@ -120,7 +120,7 @@ invalid_data = Invalid data: %v
never = Never
unknown = Unknown

rss_feed = RSS Feed
rss_feed = RSS feed

pin = Pin
unpin = Unpin
Expand Down Expand Up @@ -181,9 +181,9 @@ no_results = No matching results found.
keyword_search_unavailable = Searching by keyword is currently not available. Please contact the site administrator.

[aria]
navbar = Navigation Bar
navbar = Navigation bar
footer = Footer
footer.software = About Software
footer.software = About this software
footer.links = Links

[heatmap]
Expand Down Expand Up @@ -457,7 +457,7 @@ email_domain_blacklisted = You cannot register with your email address.
authorize_application = Authorize Application
authorize_redirect_notice = You will be redirected to %s if you authorize this application.
authorize_application_created_by = This application was created by %s.
authorize_application_description = If you grant the access, it will be able to access and write to all your account information, including private repos and organisations.
authorize_application_description = If you grant the access, it will be able to access and write to all your account information, including private repos and organizations.
authorize_title = Authorize "%s" to access your account?
authorization_failed = Authorization failed
authorization_failed_desc = The authorization failed because we detected an invalid request. Please contact the maintainer of the app you have tried to authorize.
Expand Down Expand Up @@ -1273,8 +1273,8 @@ invisible_runes_header = `This file contains invisible Unicode characters`
invisible_runes_description = `This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.`
ambiguous_runes_header = `This file contains ambiguous Unicode characters`
ambiguous_runes_description = `This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.`
invisible_runes_line = `This line has invisible unicode characters`
ambiguous_runes_line = `This line has ambiguous unicode characters`
invisible_runes_line = `This line has invisible Unicode characters`
ambiguous_runes_line = `This line has ambiguous Unicode characters`
ambiguous_character = `%[1]c [U+%04[1]X] can be confused with %[2]c [U+%04[2]X]`

escape_control_characters = Escape
Expand Down Expand Up @@ -1773,7 +1773,6 @@ issues.review.hide_resolved = Hide resolved
issues.review.resolve_conversation = Resolve conversation
issues.review.un_resolve_conversation = Unresolve conversation
issues.review.resolved_by = marked this conversation as resolved
issues.assignee.error = Not all assignees was added due to an unexpected error.
issues.reference_issue.body = Body
issues.content_history.deleted = deleted
issues.content_history.edited = edited
Expand Down Expand Up @@ -2411,7 +2410,7 @@ settings.deploy_key_content = Content
settings.key_been_used = A deploy key with identical content is already in use.
settings.key_name_used = A deploy key with the same name already exists.
settings.add_key_success = The deploy key "%s" has been added.
settings.deploy_key_deletion = Remove reploy key
settings.deploy_key_deletion = Remove deploy key
settings.deploy_key_deletion_desc = Removing a deploy key will revoke its access to this repository. Continue?
settings.deploy_key_deletion_success = The deploy key has been removed.
settings.branches = Branches
Expand Down Expand Up @@ -2525,7 +2524,7 @@ settings.lfs=LFS
settings.lfs_filelist=LFS files stored in this repository
settings.lfs_no_lfs_files=No LFS files stored in this repository
settings.lfs_findcommits=Find commits
settings.lfs_lfs_file_no_commits=No Commits found for this LFS file
settings.lfs_lfs_file_no_commits=No commits found for this LFS file
settings.lfs_noattribute=This path does not have the lockable attribute in the default branch
settings.lfs_delete=Delete LFS file with OID %s
settings.lfs_delete_warning=Deleting an LFS file may cause "object does not exist" errors on checkout. Are you sure?
Expand All @@ -2536,15 +2535,15 @@ settings.lfs_invalid_lock_directory=Cannot lock directory: %s
settings.lfs_lock_already_exists=Lock already exists: %s
settings.lfs_lock=Lock
settings.lfs_lock_path=Filepath to lock...
settings.lfs_locks_no_locks=No Locks
settings.lfs_locks_no_locks=No locks
settings.lfs_lock_file_no_exist=Locked file does not exist in default branch
settings.lfs_force_unlock=Force Unlock
settings.lfs_force_unlock=Force unlock
settings.lfs_pointers.found=Found %d blob pointer(s) - %d associated, %d unassociated (%d missing from store)
settings.lfs_pointers.sha=Blob SHA
settings.lfs_pointers.sha=Blob hash
settings.lfs_pointers.oid=OID
settings.lfs_pointers.inRepo=In Repo
settings.lfs_pointers.inRepo=In repo
settings.lfs_pointers.exists=Exists in store
settings.lfs_pointers.accessible=Accessible to User
settings.lfs_pointers.accessible=Accessible to user
settings.lfs_pointers.associateAccessible=Associate accessible %d OIDs
settings.rename_branch_failed_protected=Cannot rename branch %s because it is a protected branch.
settings.rename_branch_failed_exist=Cannot rename branch because target branch %s exists.
Expand Down Expand Up @@ -2747,7 +2746,7 @@ team_access_desc = Repository access
team_permission_desc = Permission
team_unit_desc = Allow access to repository sections
team_unit_disabled = (Disabled)
follow_blocked_user = You cannot follow this organisation because this organisation has blocked you.
follow_blocked_user = You cannot follow this organization because this organization has blocked you.
form.name_reserved = The organization name "%s" is reserved.
form.name_pattern_not_allowed = The pattern "%s" is not allowed in an organization name.
Expand Down Expand Up @@ -3041,11 +3040,11 @@ repos.name = Name
repos.private = Private
repos.issues = Issues
repos.size = Size
repos.lfs_size = LFS Size
repos.lfs_size = LFS size
packages.package_manage_panel = Manage packages
packages.total_size = Total Size: %s
packages.unreferenced_size = Unreferenced Size: %s
packages.total_size = Total size: %s
packages.unreferenced_size = Unreferenced size: %s
packages.cleanup = Clean up expired data
packages.cleanup.success = Cleaned up expired data successfully
packages.owner = Owner
Expand Down Expand Up @@ -3341,7 +3340,7 @@ monitor.start = Start Time
monitor.execute_time = Execution Time
monitor.last_execution_result = Result
monitor.process.cancel = Cancel process
monitor.process.cancel_desc = Cancelling a process may cause data loss
monitor.process.cancel_desc = Canceling a process may cause data loss
monitor.process.cancel_notices = Cancel: <strong>%s</strong>?
monitor.process.children = Children

Expand Down

0 comments on commit 5c59a13

Please sign in to comment.