summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-14 21:09:03 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-14 21:09:03 +0000
commitf9cda7671cfb07795d9ea01a7117f7d6c6511d0d (patch)
tree71233af70149f655249c475e764a8c2cd560b096 /locale
parent18ffa5e88194d8f3fd63bee0221de5bc1fbdfe94 (diff)
downloadgitlab-ce-f9cda7671cfb07795d9ea01a7117f7d6c6511d0d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot10
1 files changed, 8 insertions, 2 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 9ed4f23293b..cc506ebae86 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -15820,7 +15820,7 @@ msgstr ""
msgid "Note parameters are invalid: %{errors}"
msgstr ""
-msgid "Note that PostgreSQL 11 will become the minimum required PostgreSQL version in GitLab 13.0 (May 2020). PostgreSQL 9.6 and PostgreSQL 10 will no longer be supported in GitLab 13.0. Please consider upgrading your PostgreSQL version (%{db_version}) soon."
+msgid "Note that PostgreSQL %{pg_version_upcoming} will become the minimum required version in GitLab %{gl_version_upcoming} (%{gl_version_upcoming_date}). Please consider upgrading your environment to a supported PostgreSQL version soon, see <a href=\"%{pg_version_upcoming_url}\">the related epic</a> for details."
msgstr ""
msgid "Note that this invitation was sent to %{mail_to_invite_email}, but you are signed in as %{link_to_current_user} with email %{mail_to_current_user}."
@@ -16707,7 +16707,7 @@ msgstr ""
msgid "People without permission will never get a notification."
msgstr ""
-msgid "Percent rollout (logged in users)"
+msgid "Percent of users"
msgstr ""
msgid "Percentage"
@@ -25502,6 +25502,9 @@ msgstr ""
msgid "User IDs"
msgstr ""
+msgid "User List"
+msgstr ""
+
msgid "User Lists can only be created and modified with %{linkStart}the API%{linkEnd}"
msgstr ""
@@ -26648,6 +26651,9 @@ msgstr ""
msgid "You are trying to upload something other than an image. Please upload a .png, .jpg, .jpeg, .gif, .bmp, .tiff or .ico."
msgstr ""
+msgid "You are using PostgreSQL %{pg_version_current}, but PostgreSQL %{pg_version_minimum} is required for this version of GitLab. Please upgrade your environment to a supported PostgreSQL version, see %{pg_requirements_url} for details."
+msgstr ""
+
msgid "You can %{linkStart}view the blob%{linkEnd} instead."
msgstr ""