finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix Various Grammar Issues and Adjust Unnatural Wording (#2737)

Browse source 
* Fix Comma Splices

Replace comma splices with more fitting punctuation—usually semicolons.

Signed-off-by: Omar Assadi <omar@assadi.ru>

* Turn Some Conjunctions into Sentences

Turn conjunctions—which are capable of standing on their own—into their standalone sentences.

Signed-off-by: Omar Assadi <omar@assadi.ru>

* Reword Sections and Fix Issues in Docs

Reword sections of the contributing docs and readme file to be more
natural and clear. Additionally, fix the majority of the grammar
mistakes.

Signed-off-by: Omar Assadi <omar@assadi.co.il>
This commit is contained in:
Omar Assadi 2017-10-28 11:22:44 -04:00 • committed by Lauris BH
parent 5866eb2321
commit 1da17db717
3 changed files with 50 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,7 @@ sign_in_with = Sign in with
sign_out = Sign Out
sign_up = Sign Up
link_account = Link Account
link_account_signin_or_signup = Login with existing credentials to link your existing account to this account, or sign up for a new one
link_account_signin_or_signup = Login with existing credentials to link your existing account to this account. Or, sign up for a new one
register = Register
website = Website
version = Version
@ -91,7 +91,7 @@ run_user_helper = The user must have access to Repository Root Path and run Gite
domain = Domain
domain_helper = This affects SSH clone URLs.
ssh_port = SSH Port
ssh_port_helper = Port number which your SSH server is using, leave it empty to disable.
ssh_port_helper = Port number which your SSH server is using. Leave it empty to disable.
http_port = HTTP Port
http_port_helper = Port number which application will listen on.
app_url = Application URL
@ -116,7 +116,7 @@ disable_gravatar_popup = Disable Gravatar and custom sources. All avatars must b
federated_avatar_lookup = Enable Federated Avatars Lookup
federated_avatar_lookup_popup = Enable federated avatar lookup using Libravatar.
disable_registration = Disable Self-registration
disable_registration_popup = Disable user self-registration, only admin can create accounts.
disable_registration_popup = "Disable self-registration; only admins will be able to create accounts."
openid_signin = Enable OpenID Sign-In
openid_signin_popup = Enable user login via OpenID
openid_signup = Enable OpenID Self-registration
@ -124,7 +124,7 @@ openid_signup_popup = Enable OpenID based Self-registration
enable_captcha = Enable Captcha
enable_captcha_popup = Require a CAPTCHA for user self-registration.
require_sign_in_view = Enable Require Sign In to View Pages
require_sign_in_view_popup = Only signed in users can view pages, visitors will only be able to see sign in/up pages.
require_sign_in_view_popup = "Only signed in users can view pages; visitors will only be able to see the sign in and up pages."
admin_setting_desc = You do not need to create an admin account right now. The first user who registers on the site will gain admin access automatically.
admin_title = Admin Account Settings
admin_name = Username
@ -139,7 +139,7 @@ invalid_repo_path = Repository root path is invalid: %v
run_user_not_match = Run user is not the current user: %s -> %s
save_config_failed = Failed to save configuration: %v
invalid_admin_setting = Admin account setting is invalid: %v
install_success = Welcome! Thank you for choosing Gitea, have fun and take care.
install_success = Welcome! Thank you for choosing Gitea. Have fun. And, take care!
invalid_log_root_path = Log root path is invalid: %v
default_keep_email_private = Default Value for Keep Email Private
default_keep_email_private_popup = This is the default value for the visibility of the user's email address. If set to true the email address of all new users will be hidden until the user changes his setting.
@ -277,12 +277,12 @@ cannot_add_org_to_team = Organization cannot be added as a team member.
invalid_ssh_key = Sorry, we were not able to verify your SSH key: %s
invalid_gpg_key = Sorry, we were not able to verify your GPG key: %s
unable_verify_ssh_key = The ssh key could not be verified, please double-check it for any mistakes.
unable_verify_ssh_key = "The ssh key could not be verified; please double-check it for any mistakes."
auth_failed = Authentication failed: %v
still_own_repo = Your account still has ownership of at least one repository, you need to delete or transfer them first.
still_has_org = Your account still is still a member of least one organization, you need to leave them first.
org_still_own_repo = This organization still owns repositories, you need to delete or transfer them first.
still_own_repo = "Your account still has ownership of at least one repository; you need to delete or transfer them first."
still_has_org = "Your account still is still a member of least one organization; you need to leave them first."
org_still_own_repo = "This organization still owns repositories; you need to delete or transfer them first."
target_branch_not_exist = Target branch does not exist.
@ -451,7 +451,7 @@ orgs_none = You are not a member of any organizations.
repos_none = You do not own any repositories
delete_account = Delete Your Account
delete_prompt = The operation will delete your account permanently, and <strong>CANNOT</strong> be undone!
delete_prompt = The operation will delete your account permanently. And, this <strong>CANNOT</strong> be undone!
confirm_delete_account = Confirm Deletion
delete_account_title = Account Deletion
delete_account_desc = Are you sure you want to permanently delete this account?
@ -501,7 +501,7 @@ migrate.clone_address = Clone Address
migrate.clone_address_desc = This can be a HTTP/HTTPS/GIT URL
migrate.clone_local_path = or local server path
migrate.permission_denied = You are not allowed to import local repositories.
migrate.invalid_local_path = Invalid local path, it does not exist or not a directory.
migrate.invalid_local_path = "Invalid local path; it does not exist or is not a directory."
migrate.failed = Migration failed: %v
migrate.lfs_mirror_unsupported = Mirroring LFS objects is not supported - use 'git lfs fetch --all' and 'git lfs push --all' instead.
@ -747,7 +747,7 @@ pulls.reopen_to_merge = Please reopen this pull request to perform a merge.
pulls.merged = Merged
pulls.has_merged = This pull request has been merged successfully.
pulls.data_broken = Data of this pull request has been broken due to deletion of fork information.
pulls.is_checking = The conflict checking is still in progress, please refresh page in few moments.
pulls.is_checking = "The conflict checking is still in progress; please refresh page in few moments."
pulls.can_auto_merge_desc = This pull request can be merged automatically.
pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically because there are conflicts.
pulls.cannot_auto_merge_helper = Please merge manually in order to resolve the conflicts.
@ -767,7 +767,7 @@ milestones.title = Title
milestones.desc = Description
milestones.due_date = Due Date (optional)
milestones.clear = Clear
milestones.invalid_due_date_format = Due date format is invalid, must be 'yyyy-mm-dd'.
milestones.invalid_due_date_format = "Due date format is invalid; must be 'yyyy-mm-dd'."
milestones.create_success = Milestone '%s' has been created successfully!
milestones.edit = Edit Milestone
milestones.edit_subheader = Use a good description for milestones so people won't be confused.
@ -938,7 +938,7 @@ settings.webhook.response = Response
settings.webhook.headers = Headers
settings.webhook.payload = Payload
settings.webhook.body = Body
settings.githooks_desc = Git Hooks are powered by Git itself, you can edit files of supported hooks in the list below to perform custom operations.
settings.githooks_desc = "Git Hooks are powered by Git itself. You can edit files of supported hooks in the list below to perform custom operations."
settings.githook_edit_desc = If the hook is inactive, sample content will be presented. Leaving content to an empty value will disable this hook.
settings.githook_name = Hook Name
settings.githook_content = Hook Content
@ -1117,7 +1117,7 @@ settings.change_orgname_prompt = This change will change the links to the organi
settings.update_avatar_success = The organization avatar has been updated.
settings.delete = Delete Organization
settings.delete_account = Delete This Organization
settings.delete_prompt = The organization will be permanently removed, and this <strong>CANNOT</strong> be undone!
settings.delete_prompt = The organization will be permanently removed. And, this <strong>CANNOT</strong> be undone!
settings.confirm_delete_account = Confirm Deletion
settings.delete_org_title = Organization Deletion
settings.delete_org_desc = This organization is going to be deleted permanently, are you sure you want to continue?
@ -1161,7 +1161,7 @@ teams.repositories = Team Repositories
teams.search_repo_placeholder = Search repository...
teams.add_team_repository = Add Team Repository
teams.remove_repo = Remove
teams.add_nonexistent_repo = The repository you're trying to add does not exist, please create it first.
teams.add_nonexistent_repo = "The repository you're trying to add does not exist; please create it first."
[admin]
dashboard = Dashboard