Commit 2007ee31 authored by Stan Hu's avatar Stan Hu

Merge branch 'master' into 'master'

Fix some typos

See merge request gitlab-org/gitlab-ce!29286
parents 52fc2b6e e4babed7
...@@ -174,7 +174,7 @@ For example use `%{created_at}` in Ruby but `%{createdAt}` in JavaScript. ...@@ -174,7 +174,7 @@ For example use `%{created_at}` in Ruby but `%{createdAt}` in JavaScript.
# => When size == 2: 'There are 2 mice.' # => 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: - In JavaScript:
...@@ -332,7 +332,7 @@ Errors in `locale/zh_HK/gitlab.po`: ...@@ -332,7 +332,7 @@ Errors in `locale/zh_HK/gitlab.po`:
Syntax error in msgstr Syntax error in msgstr
Syntax error in message_line Syntax error in message_line
There should be only whitespace until the end of line after the double quote character of a message text. 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 SimplePoParser filtered backtrace: SimplePoParser::ParserError
Errors in `locale/zh_TW/gitlab.po`: Errors in `locale/zh_TW/gitlab.po`:
1 pipeline 1 pipeline
......
...@@ -130,7 +130,7 @@ are very appreciative of the work done by translators and proofreaders! ...@@ -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/) 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 or [Core team members](https://about.gitlab.com/core-team/) who are fluent in
the language or current proofreaders. 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. 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.
......
...@@ -511,7 +511,7 @@ seconds and the status will update automatically. ...@@ -511,7 +511,7 @@ seconds and the status will update automatically.
Merge Request pipeline statuses can't be retrieved when the following occurs: 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. The Merge Request is closed
1. Changes are made in the project 1. Changes are made in the project
1. The Merge Request is reopened 1. The Merge Request is reopened
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment