diff --git a/app/views/jira_connect/subscriptions/index.html.haml b/app/views/jira_connect/subscriptions/index.html.haml index c7873991010807e2b5ecafb2b385af3b712c84f5..8ce46a282520d070aeea79d3f2802f44392bd865 100644 --- a/app/views/jira_connect/subscriptions/index.html.haml +++ b/app/views/jira_connect/subscriptions/index.html.haml @@ -39,13 +39,13 @@ - else .gl-text-center %h4= s_('Integrations|No linked namespaces') - %p= s_('Integrations|Namespaces are your GitLab groups and subgroups that will be linked to this Jira instance.') + %p= s_('Integrations|Namespaces are the GitLab groups and subgroups you link to this Jira instance.') %p.jira-connect-app-body.gl-mt-7.gl-font-base.gl-text-center %strong= s_('Integrations|Browser limitations') - firefox_link_url = 'https://www.mozilla.org/en-US/firefox/' - firefox_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: firefox_link_url } - = s_('Integrations|Adding a namespace currently works only in browsers that allow cross‑site cookies. Please make sure to use %{firefox_link_start}Firefox%{firefox_link_end} or enable cross‑site cookies in your browser when adding a namespace.').html_safe % { firefox_link_start: firefox_link_start, firefox_link_end: '</a>'.html_safe } + = s_('Integrations|Adding a namespace works only in browsers that allow cross‑site cookies. Use %{firefox_link_start}Firefox%{firefox_link_end}, or enable cross‑site cookies in your browser, when adding a namespace.').html_safe % { firefox_link_start: firefox_link_start, firefox_link_end: '</a>'.html_safe } = link_to _('Learn more'), 'https://gitlab.com/gitlab-org/gitlab/-/issues/284211', target: '_blank', rel: 'noopener noreferrer' = webpack_bundle_tag 'performance_bar' if performance_bar_enabled? diff --git a/app/views/jira_connect/users/show.html.haml b/app/views/jira_connect/users/show.html.haml index 2ff92ab0dc8f67191b37e2b7519ec6cbf4446720..9cc2b41e5c85c7cf0bfa9465a408470f73a9617f 100644 --- a/app/views/jira_connect/users/show.html.haml +++ b/app/views/jira_connect/users/show.html.haml @@ -1,6 +1,6 @@ .jira-connect-users-container.gl-text-center - user_link = link_to(current_user.to_reference, user_path(current_user), target: '_blank', rel: 'noopener noreferrer') - %h2= _('You are signed into GitLab as %{user_link}').html_safe % { user_link: user_link } + %h2= _('You are signed in to GitLab as %{user_link}').html_safe % { user_link: user_link } %p= s_('Integrations|You can now close this window and return to the GitLab for Jira application.') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index e48164cd2059e20303faff82d6816c7df7fccdd0..6e53001aaed01e6a928ab73b47cb0e906461a421 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -16862,7 +16862,7 @@ msgstr "" msgid "Integrations|Add namespace" msgstr "" -msgid "Integrations|Adding a namespace currently works only in browsers that allow cross‑site cookies. Please make sure to use %{firefox_link_start}Firefox%{firefox_link_end} or enable cross‑site cookies in your browser when adding a namespace." +msgid "Integrations|Adding a namespace works only in browsers that allow cross‑site cookies. Use %{firefox_link_start}Firefox%{firefox_link_end}, or enable cross‑site cookies in your browser, when adding a namespace." msgstr "" msgid "Integrations|All details" @@ -16922,7 +16922,7 @@ msgstr "" msgid "Integrations|Namespace successfully linked" msgstr "" -msgid "Integrations|Namespaces are your GitLab groups and subgroups that will be linked to this Jira instance." +msgid "Integrations|Namespaces are the GitLab groups and subgroups you link to this Jira instance." msgstr "" msgid "Integrations|No available namespaces." @@ -35272,7 +35272,7 @@ msgstr "" msgid "You are receiving this message because you are a GitLab administrator for %{url}." msgstr "" -msgid "You are signed into GitLab as %{user_link}" +msgid "You are signed in to GitLab as %{user_link}" msgstr "" msgid "You are trying to upload something other than an image. Please upload a .png, .jpg, .jpeg, .gif, .bmp, .tiff or .ico."