Fix some mistakes #1833
Merged
Fix some mistakes #1833
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
LGTM |
tboerger
added
the
lgtm/need 1
ethantkoenig
suggested changes
May 29, 2017
options/locale/locale_en-US.ini
Outdated
| @@ -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_content = Hook Content | |||
| 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 recieve 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>. | |||
There was a problem hiding this comment.
If you decapitalize "webhooks guide" in settings.hooks_desc you need to do it here also.
There was a problem hiding this comment.
OK, I forgot about that too. I was rushing.
There was a problem hiding this comment.
We always forgot something (me first) ^^
options/locale/locale_en-US.ini
Outdated
| @@ -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.user_is_org_member = User is organization member who cannot be added as a collaborator. | |||
| 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>. | |||
There was a problem hiding this comment.
If you're going to decapitalize "webhooks" (in "webhooks guide" at the end of the line), I would also decapitalize "guide"
|
Fixed |
ethantkoenig
approved these changes
May 31, 2017
|
LGTM |
tboerger
added
lgtm/done
sapk
reviewed
May 31, 2017
options/locale/locale_en-US.ini
Outdated
| @@ -189,8 +189,8 @@ verify = Verify | |||
| scratch_code = 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_passcode_incorrect = Your passcode is not correct. If you misplaced your device, use your scratch code to login. | |||
| twofa_scratch_token_incorrect = Your scratch code is not correct. | |||
| twofa_passcode_incorrect = Your passcode is incorrect. If you misplaced your device, you can use your scratch code to login. | |||
There was a problem hiding this comment.
I would not add "you can use" since it is the only solution "If you misplaced your device"
|
LGTM |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Just noticed some mistakes while using Gitea.