summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-08-01 15:21:24 +0000
committerRémy Coutable <remy@rymai.me>2018-08-01 15:21:24 +0000
commit83a0db0c551236518bdec1a7ae3a1ed1d05f5aaa (patch)
treee13ad022ea223e7bde5202a31ee81169225fec99 /locale
parentea6fc714bb0306ac8ca56b5dafe4b6777aafe5fc (diff)
parent12095251c3777c5231cab97854d5dca69d31cc5d (diff)
downloadgitlab-ce-83a0db0c551236518bdec1a7ae3a1ed1d05f5aaa.tar.gz
Merge branch 'bvl-user-status-message-35463' into 'master'
Allow users to set a status Closes #35463 See merge request gitlab-org/gitlab-ce!20614
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot6
1 files changed, 6 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index a767c179dea..2d700fe8773 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -4081,6 +4081,9 @@ msgstr ""
msgid "Profiles|This doesn't look like a public SSH key, are you sure you want to add it?"
msgstr ""
+msgid "Profiles|This emoji and message will appear on your profile and throughout the interface. The message can contain emoji codes, too."
+msgstr ""
+
msgid "Profiles|Type your %{confirmationValue} to confirm:"
msgstr ""
@@ -5624,6 +5627,9 @@ msgstr ""
msgid "Users"
msgstr ""
+msgid "User|Current Status"
+msgstr ""
+
msgid "Variables"
msgstr ""