Skip to content
代码片段 群组 项目
提交 27eb72d2 编辑于 作者: Miguel Rincon's avatar Miguel Rincon
浏览文件

Merge branch '349161-follow-up-from-adds-noopener-noreferrer-to-target-_blank-links' into 'master'

Localize "What is squashing" help text

See merge request gitlab-org/gitlab!90594
No related branches found
No related tags found
无相关合并请求
......@@ -5,7 +5,7 @@
%b= s_('ProjectSettings|Squash commits when merging')
%p.text-secondary
= s_('ProjectSettings|Set the default behavior of this option in merge requests. Changes to this are also applied to existing merge requests.')
= link_to "What is squashing?", help_page_path('user/project/merge_requests/squash_and_merge.md'), target: '_blank', rel: 'noopener noreferrer'
= link_to s_('ProjectSettings|What is squashing?'), help_page_path('user/project/merge_requests/squash_and_merge.md'), target: '_blank', rel: 'noopener noreferrer'
= settings.gitlab_ui_radio_component :squash_option,
:never,
......
......@@ -30331,6 +30331,9 @@ msgstr ""
msgid "ProjectSettings|What are merge trains?"
msgstr ""
 
msgid "ProjectSettings|What is squashing?"
msgstr ""
msgid "ProjectSettings|When merge request pipelines are enabled in the CI/CD configuration file, pipelines validate the combined results of the source and target branches. %{link_start}How to configure merge request pipelines?%{link_end}"
msgstr ""
 
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册