Skip to content

G
gitlab-ce
Commit 0724350f authored by Sean McGivern's avatar Sean McGivern
Browse files
Options

Merge branch 'ee-fix-typo-in-admin-intergration' into 'master' 

Fix a typo in Admin: intergration -> integration

See merge request gitlab-org/gitlab-ee!8444
parents cda018c2 d9ada542
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 32 deletions
ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
View file @ 0724350f
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.js-settings-toggle{ type: 'button' }
= expanded ? 'Collapse' : 'Expand' = expanded ? 'Collapse' : 'Expand'
%p %p
= _('Elasticsearch intergration. Elasticsearch AWS IAM.') = _('Elasticsearch integration. Elasticsearch AWS IAM.')
.settings-content .settings-content
= form_for @application_setting, url: admin_application_settings_path(anchor: 'js-elasticsearch-settings'), html: { class: 'fieldset-form' } do |f| = form_for @application_setting, url: admin_application_settings_path(anchor: 'js-elasticsearch-settings'), html: { class: 'fieldset-form' } do |f|
......
ee/changelogs/unreleased/vincentaubert-gitlab-ee-fix_typo.yml 0 → 100644
View file @ 0724350f
---
title: 'Fix a typo in Admin: intergration -> integration'
merge_request: 8444
author: Vincent AUBERT
type: fixed
locale/ar_SA/gitlab.po
View file @ 0724350f
...@@ -2913,7 +2913,7 @@ msgstr "" ...@@ -2913,7 +2913,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/bg/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "" ...@@ -2777,7 +2777,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/ca_ES/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "" ...@@ -2777,7 +2777,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/cs_CZ/gitlab.po
View file @ 0724350f
...@@ -2845,7 +2845,7 @@ msgstr "" ...@@ -2845,7 +2845,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/da_DK/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "" ...@@ -2777,7 +2777,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/de/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "" ...@@ -2777,7 +2777,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/eo/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "" ...@@ -2777,7 +2777,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/es/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "" ...@@ -2777,7 +2777,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/et_EE/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "" ...@@ -2777,7 +2777,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/fil_PH/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "" ...@@ -2777,7 +2777,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/fr/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "Modifier l’identité de %{user_name}" ...@@ -2777,7 +2777,7 @@ msgstr "Modifier l’identité de %{user_name}"
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "Elasticsearch" msgstr "Elasticsearch"
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "Intégration d’Elasticsearch. AWS Elasticsearch IAM." msgstr "Intégration d’Elasticsearch. AWS Elasticsearch IAM."
msgid "Email" msgid "Email"
......
locale/gitlab.pot
View file @ 0724350f
...@@ -2953,7 +2953,7 @@ msgstr "" ...@@ -2953,7 +2953,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/gl_ES/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "" ...@@ -2777,7 +2777,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/he_IL/gitlab.po
View file @ 0724350f
...@@ -2845,7 +2845,7 @@ msgstr "" ...@@ -2845,7 +2845,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/id_ID/gitlab.po
View file @ 0724350f
...@@ -2743,7 +2743,7 @@ msgstr "" ...@@ -2743,7 +2743,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/it/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "" ...@@ -2777,7 +2777,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/ja/gitlab.po
View file @ 0724350f
...@@ -2743,7 +2743,7 @@ msgstr "%{user_name} の ID を編集する" ...@@ -2743,7 +2743,7 @@ msgstr "%{user_name} の ID を編集する"
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "Elasticsearch" msgstr "Elasticsearch"
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "Elasticsearch の統合。Elasticsearch AWS IAM。" msgstr "Elasticsearch の統合。Elasticsearch AWS IAM。"
msgid "Email" msgid "Email"
......
locale/ko/gitlab.po
View file @ 0724350f
...@@ -2743,7 +2743,7 @@ msgstr "" ...@@ -2743,7 +2743,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "Elasticsearch" msgstr "Elasticsearch"
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/mn_MN/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "" ...@@ -2777,7 +2777,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/nb_NO/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "" ...@@ -2777,7 +2777,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/nl_NL/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "" ...@@ -2777,7 +2777,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/pl_PL/gitlab.po
View file @ 0724350f
...@@ -2845,7 +2845,7 @@ msgstr "" ...@@ -2845,7 +2845,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/pt_BR/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "Editar identidade para %{user_name}" ...@@ -2777,7 +2777,7 @@ msgstr "Editar identidade para %{user_name}"
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "Elasticsearch" msgstr "Elasticsearch"
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "Integração com Elasticsearch. Elasticsearch AWS IAM." msgstr "Integração com Elasticsearch. Elasticsearch AWS IAM."
msgid "Email" msgid "Email"
......
locale/ro_RO/gitlab.po
View file @ 0724350f
...@@ -2811,7 +2811,7 @@ msgstr "" ...@@ -2811,7 +2811,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/ru/gitlab.po
View file @ 0724350f
...@@ -2845,7 +2845,7 @@ msgstr "" ...@@ -2845,7 +2845,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/sq_AL/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "" ...@@ -2777,7 +2777,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/tr_TR/gitlab.po
View file @ 0724350f
...@@ -2777,7 +2777,7 @@ msgstr "" ...@@ -2777,7 +2777,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/uk/gitlab.po
View file @ 0724350f
...@@ -2845,7 +2845,7 @@ msgstr "Редагувати ідентифікацію для %{user_name}" ...@@ -2845,7 +2845,7 @@ msgstr "Редагувати ідентифікацію для %{user_name}"
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "Elasticsearch" msgstr "Elasticsearch"
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "Інтеграція з Elasticsearch. Elasticsearch AWS IAM." msgstr "Інтеграція з Elasticsearch. Elasticsearch AWS IAM."
msgid "Email" msgid "Email"
......
locale/zh_CN/gitlab.po
View file @ 0724350f
...@@ -2743,7 +2743,7 @@ msgstr "编辑 %{user_name} 的身份信息" ...@@ -2743,7 +2743,7 @@ msgstr "编辑 %{user_name} 的身份信息"
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "Elasticsearch" msgstr "Elasticsearch"
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "Elasticsearch集成及Elasticsearch AWS IAM。" msgstr "Elasticsearch集成及Elasticsearch AWS IAM。"
msgid "Email" msgid "Email"
......
locale/zh_HK/gitlab.po
View file @ 0724350f
...@@ -2743,7 +2743,7 @@ msgstr "" ...@@ -2743,7 +2743,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
......
locale/zh_TW/gitlab.po
View file @ 0724350f
...@@ -2743,7 +2743,7 @@ msgstr "編輯 %{user_name} 的身份" ...@@ -2743,7 +2743,7 @@ msgstr "編輯 %{user_name} 的身份"
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "Elasticsearch" msgstr "Elasticsearch"
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "Elasticsearch 整合。 Elasticsearch AWS IAM。" msgstr "Elasticsearch 整合。 Elasticsearch AWS IAM。"
msgid "Email" msgid "Email"
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7