Resolve conflicts in locale/gitlab.pot (!9104) · Merge requests · GitLab.org / GitLab · GitLab

Stan Hu requested to merge sh-fix-locale-pot into master Jan 10, 2019

Introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24282.