femsci/forgejo
femsci/forgejo
1
0
Fork 0
forked from NYANDEV/forgejo
Code Pull requests Activity

Fix some mistakes (#1833)

Browse source 
* Fix some mistakes

* Fixes

* Not correct -> incorrect or invalid

* Update according to comments
This commit is contained in:
Patrick G 2017-06-01 20:41:52 -04:00 committed by Lunny Xiao
parent 04c6c31f8e
commit 5ca6867aaf
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -123,7 +123,7 @@ admin_email = Admin Email
install_btn_confirm = Install Gitea install_btn_confirm = Install Gitea
test_git_failed = Could not test 'git' command: %v test_git_failed = Could not test 'git' command: %v
sqlite3_not_available = Your current version does not support SQLite3, please download the official binary version from %s, NOT the gobuild version. sqlite3_not_available = Your current version does not support SQLite3, please download the official binary version from %s, NOT the gobuild version.
invalid_db_setting = Database setting is not correct: %v invalid_db_setting = Database setting is invalid: %v
invalid_repo_path = Repository root path is invalid: %v invalid_repo_path = Repository root path is invalid: %v
run_user_not_match = Run user is not the current user: %s -> %s run_user_not_match = Run user is not the current user: %s -> %s
save_config_failed = Failed to save configuration: %v save_config_failed = Failed to save configuration: %v
@ -189,8 +189,8 @@ verify = Verify
scratch_code = Scratch code scratch_code = Scratch code
use_scratch_code = Use a scratch code use_scratch_code = Use a scratch code
twofa_scratch_used = You have used your scratch code. You have been redirected to the two-factor settings page so you may remove your device enrollment or generate a new scratch code. twofa_scratch_used = You have used your scratch code. You have been redirected to the two-factor settings page so you may remove your device enrollment or generate a new scratch code.
twofa_passcode_incorrect = Your passcode is not correct. If you misplaced your device, use your scratch code to login. twofa_passcode_incorrect = Your passcode is incorrect. If you misplaced your device, use your scratch code to login.
twofa_scratch_token_incorrect = Your scratch code is not correct. twofa_scratch_token_incorrect = Your scratch code is incorrect.
login_userpass = User / Password login_userpass = User / Password
login_openid = OpenID login_openid = OpenID
openid_connect_submit = Connect openid_connect_submit = Connect
@ -326,7 +326,7 @@ change_password = Change Password
old_password = Current Password old_password = Current Password
new_password = New Password new_password = New Password
retype_new_password = Retype New Password retype_new_password = Retype New Password
password_incorrect = Current password is not correct. password_incorrect = Current password is incorrect.
change_password_success = Your password was successfully changed. You can now sign using your new password. change_password_success = Your password was successfully changed. You can now sign using your new password.
password_change_disabled = Non-local users are not allowed to change their password through the web interface. password_change_disabled = Non-local users are not allowed to change their password through the web interface.
@ -837,7 +837,7 @@ settings.search_user_placeholder = Search user...
settings.org_not_allowed_to_be_collaborator = Organization is not allowed to be added as a collaborator. settings.org_not_allowed_to_be_collaborator = Organization is not allowed to be added as a collaborator.
settings.user_is_org_member = User is organization member who cannot be added as a collaborator. settings.user_is_org_member = User is organization member who cannot be added as a collaborator.
settings.add_webhook = Add Webhook settings.add_webhook = Add Webhook
settings.hooks_desc = Webhooks are much like basic HTTP POST event triggers. Whenever something occurs in Gitea, we will handle the notification to the target host you specify. Learn more in this <a target="_blank" rel="noopener" href="%s">Webhooks Guide</a>. settings.hooks_desc = Webhooks are much like basic HTTP POST event triggers. Whenever something occurs in Gitea, we will send a notification to the target host. Learn more in the <a target="_blank" rel="noopener" href="%s">webhooks guide</a>.
settings.webhook_deletion = Delete Webhook settings.webhook_deletion = Delete Webhook
settings.webhook_deletion_desc = Deleting this webhook will remove its information and all delivery history. Are you sure you want to continue? settings.webhook_deletion_desc = Deleting this webhook will remove its information and all delivery history. Are you sure you want to continue?
settings.webhook_deletion_success = Webhook has been deleted successfully! settings.webhook_deletion_success = Webhook has been deleted successfully!
@ -854,7 +854,7 @@ settings.githook_edit_desc = If the hook is inactive, sample content will be pre
settings.githook_name = Hook Name settings.githook_name = Hook Name
settings.githook_content = Hook Content settings.githook_content = Hook Content
settings.update_githook = Update Hook settings.update_githook = Update Hook
settings.add_webhook_desc = Gitea will send a <code>POST</code> request to the URL you specify, along with regarding the event that occurred. You can also specify what kind of data format you'd like to get upon triggering the hook (JSON, x-www-form-urlencoded, XML, etc). More information can be found in our <a target="_blank" rel="noopener" href="%s">Webhooks Guide</a>. settings.add_webhook_desc = Gitea will send a <code>POST</code> request to the URL you specify, along with information about the event that occurred. You can also specify what data format you would like to receive upon triggering the hook (JSON, x-www-form-urlencoded, XML, etc). More information can be found in our <a target="_blank" rel="noopener" href="%s">webhooks guide</a>.
settings.payload_url = Payload URL settings.payload_url = Payload URL
settings.content_type = Content Type settings.content_type = Content Type
settings.secret = Secret settings.secret = Secret
@ -872,7 +872,7 @@ settings.event_pull_request_desc = Pull request opened, closed, reopened, edited
settings.event_push = Push settings.event_push = Push
settings.event_push_desc = Git push to a repository settings.event_push_desc = Git push to a repository
settings.active = Active settings.active = Active
settings.active_helper = Details regarding the event which triggered the hook will be delivered as well. settings.active_helper = Information about the event which triggered the hook will be sent as well.
settings.add_hook_success = New webhook has been added. settings.add_hook_success = New webhook has been added.
settings.update_webhook = Update Webhook settings.update_webhook = Update Webhook
settings.update_hook_success = Webhook has been updated. settings.update_hook_success = Webhook has been updated.