Skip to content

G
gitlab-ce
Commit 83330822 authored by Michel Engelen's avatar Michel Engelen
Browse files
Options

Merge remote-tracking branch 'origin/issue/55953' into issue/55953 

# Conflicts:
#	locale/gitlab.pot
#	spec/features/discussion_comments/commit_spec.rb
parents f02544a9 60797e9e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
locale/gitlab.pot
View file @ 83330822
...@@ -11096,6 +11096,9 @@ msgstr "" ...@@ -11096,6 +11096,9 @@ msgstr ""
msgid "Toggle thread" msgid "Toggle thread"
msgstr "" msgstr ""
msgid "Toggle thread"
msgstr ""
msgid "ToggleButton|Toggle Status: OFF" msgid "ToggleButton|Toggle Status: OFF"
msgstr "" msgstr ""
...@@ -11309,6 +11312,9 @@ msgstr "" ...@@ -11309,6 +11312,9 @@ msgstr ""
msgid "Unresolve thread" msgid "Unresolve thread"
msgstr "" msgstr ""
msgid "Unresolve thread"
msgstr ""
msgid "Unschedule job" msgid "Unschedule job"
msgstr "" msgstr ""
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7