Commit 2d6d8702 authored by Brandon Labuschagne's avatar Brandon Labuschagne

Merge branch...

Merge branch 'dreedy-make-skip-trial-copy-consistent-with-itself-and-with-the-account-dropdown' into 'master'

Make skip trial copy consistent with itself & the account dropdown

See merge request gitlab-org/gitlab!57624
parents 40d289f7 a6e28fe1
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
- else - else
= link_to s_('Trials|Skip Trial'), dashboard_projects_path, class: 'block center py-2' = link_to s_('Trials|Skip Trial'), dashboard_projects_path, class: 'block center py-2'
.label .label
= s_("Trials|You won't get a free trial right now but you can always resume this process by clicking on your avatar and choosing 'Start a free trial'") = s_("Trials|You won't get a free trial right now but you can always resume this process by selecting your avatar and choosing 'Start an Ultimate trial'")
...@@ -32190,7 +32190,7 @@ msgstr "" ...@@ -32190,7 +32190,7 @@ msgstr ""
msgid "Trials|You can apply your trial to a new group or an existing group." msgid "Trials|You can apply your trial to a new group or an existing group."
msgstr "" msgstr ""
msgid "Trials|You won't get a free trial right now but you can always resume this process by clicking on your avatar and choosing 'Start a free trial'" msgid "Trials|You won't get a free trial right now but you can always resume this process by selecting your avatar and choosing 'Start an Ultimate trial'"
msgstr "" msgstr ""
msgid "Trials|Your trial ends on %{boldStart}%{trialEndDate}%{boldEnd}. We hope you’re enjoying the features of GitLab %{planName}. To keep those features after your trial ends, you’ll need to buy a subscription. (You can also choose GitLab Premium if it meets your needs.)" msgid "Trials|Your trial ends on %{boldStart}%{trialEndDate}%{boldEnd}. We hope you’re enjoying the features of GitLab %{planName}. To keep those features after your trial ends, you’ll need to buy a subscription. (You can also choose GitLab Premium if it meets your needs.)"
......
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