diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-06 17:46:05 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-06 17:46:05 +0000 |
| commit | 2007ee31ab68ebd93e52b401e6ec4296541d4f2c (patch) | |
| tree | 922be81a92a4502fdaa345289c7e2a33df88020f | |
| parent | 52fc2b6e37c6c435a8281b4df9b9914057417e1e (diff) | |
| parent | e4babed7f2208b0f6f558e1baa5319be5c0adce3 (diff) | |
| download | gitlab-ce-2007ee31ab68ebd93e52b401e6ec4296541d4f2c.tar.gz | |
Merge branch 'master' into 'master'
Fix some typos
See merge request gitlab-org/gitlab-ce!29286
| -rw-r--r-- | doc/development/i18n/externalization.md | 4 | ||||
| -rw-r--r-- | doc/development/i18n/proofreader.md | 2 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/index.md | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/development/i18n/externalization.md b/doc/development/i18n/externalization.md index 8f23ad4732a..9fb8ea542d9 100644 --- a/doc/development/i18n/externalization.md +++ b/doc/development/i18n/externalization.md @@ -174,7 +174,7 @@ For example use `%{created_at}` in Ruby but `%{createdAt}` in JavaScript. # => When size == 2: 'There are 2 mice.' ``` - Avoid using `%d` or count variables in sigular strings. This allows more natural translation in some languages. + Avoid using `%d` or count variables in singular strings. This allows more natural translation in some languages. - In JavaScript: @@ -332,7 +332,7 @@ Errors in `locale/zh_HK/gitlab.po`: Syntax error in msgstr Syntax error in message_line There should be only whitespace until the end of line after the double quote character of a message text. - Parseing result before error: '{:msgid=>["", "You are going to remove %{project_name_with_namespace}.\\n", "Removed project CANNOT be restored!\\n", "Are you ABSOLUTELY sure?"]}' + Parsing result before error: '{:msgid=>["", "You are going to remove %{project_name_with_namespace}.\\n", "Removed project CANNOT be restored!\\n", "Are you ABSOLUTELY sure?"]}' SimplePoParser filtered backtrace: SimplePoParser::ParserError Errors in `locale/zh_TW/gitlab.po`: 1 pipeline diff --git a/doc/development/i18n/proofreader.md b/doc/development/i18n/proofreader.md index fb5cfb6c157..35c5b155594 100644 --- a/doc/development/i18n/proofreader.md +++ b/doc/development/i18n/proofreader.md @@ -130,7 +130,7 @@ are very appreciative of the work done by translators and proofreaders! your previous translations by [GitLab team members](https://about.gitlab.com/team/) or [Core team members](https://about.gitlab.com/core-team/) who are fluent in the language or current proofreaders. - - When a request is made for the first proofreader for a lanuguage and there are no [GitLab team members](https://about.gitlab.com/team/) + - When a request is made for the first proofreader for a language and there are no [GitLab team members](https://about.gitlab.com/team/) or [Core team members](https://about.gitlab.com/core-team/) who speak the language, we will request links to previous translation work in other communities or projects. diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index c6f4798e0d2..86e06c2ea55 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -511,7 +511,7 @@ seconds and the status will update automatically. Merge Request pipeline statuses can't be retrieved when the following occurs: -1. A Merge Requst is created +1. A Merge Request is created 1. The Merge Request is closed 1. Changes are made in the project 1. The Merge Request is reopened |