summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2018-11-07 11:00:21 +0000
committerTiago Botelho <tiagonbotelho@hotmail.com>2018-11-07 12:24:14 +0000
commitc239452b47f2819e3ed2fdaf4679737b3e1a456e (patch)
treebfaee22cd6c0f180faa2a9f83a97375efd804fff /locale
parentc81d4a65a255146619ccf52ece16757c7db622ae (diff)
downloadgitlab-ce-c239452b47f2819e3ed2fdaf4679737b3e1a456e.tar.gz
User can keep their commit email private43521-keep-personal-emails-private
The private commit email is automatically generated in the format: id-username@noreply.HOSTNAME GitLab instance admins are able to change the HOSTNAME portion, that defaults to Gitlab's hostname, to whatever they prefer.
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot15
1 files changed, 15 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 45fc072900a..7d15d6a11fd 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2094,6 +2094,9 @@ msgstr ""
msgid "Custom CI config path"
msgstr ""
+msgid "Custom hostname (for private commit emails)"
+msgstr ""
+
msgid "Custom notification events"
msgstr ""
@@ -4701,6 +4704,9 @@ msgstr ""
msgid "Profiles|Invalid username"
msgstr ""
+msgid "Profiles|Learn more"
+msgstr ""
+
msgid "Profiles|Made a private contribution"
msgstr ""
@@ -4743,6 +4749,9 @@ msgstr ""
msgid "Profiles|This email will be displayed on your public profile."
msgstr ""
+msgid "Profiles|This email will be used for web based operations, such as edits and merges. %{learn_more}"
+msgstr ""
+
msgid "Profiles|This emoji and message will appear on your profile and throughout the interface."
msgstr ""
@@ -4767,6 +4776,9 @@ msgstr ""
msgid "Profiles|Upload new avatar"
msgstr ""
+msgid "Profiles|Use a private email - %{email}"
+msgstr ""
+
msgid "Profiles|Username change failed - %{message}"
msgstr ""
@@ -6296,6 +6308,9 @@ msgstr ""
msgid "This setting can be overridden in each project."
msgstr ""
+msgid "This setting will update the hostname that is used to generate private commit emails. %{learn_more}"
+msgstr ""
+
msgid "This source diff could not be displayed because it is too large."
msgstr ""