diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-25 09:10:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-25 09:10:51 +0300 |
| commit | c1ccb69fc9b1f07a00d3310f5fbd2e4622db9482 (patch) | |
| tree | 1b8edbc6540c554c4d9878fa3e8b7c4f2102baea /locale | |
| parent | e66e16c73cda415ccd03ac0a1818a58ddc4429d7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/gitlab.pot | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index e73a8f3ed0c..92ee07da74c 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -27387,7 +27387,7 @@ msgid_plural "Showing %d events" msgstr[0] "" msgstr[1] "" -msgid "Showing %{conflict_start}%{conflicts_text}%{strong_end} between %{ref_start}%{source_branch}%{strong_end} and %{ref_start}%{target_branch}%{strong_end}" +msgid "Showing %{conflict} between %{sourceBranch} and %{targetBranch}" msgstr "" msgid "Showing %{count} of %{total} projects" @@ -32776,9 +32776,6 @@ msgstr "" msgid "View file @ %{commitSha}" msgstr "" -msgid "View file @%{commit_sha}" -msgstr "" - msgid "View full dashboard" msgstr "" |