diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-11-26 17:02:23 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-11-26 17:02:23 +0000 |
| commit | f92bc7b10d35624bda7ae7db0e9034955587c9a1 (patch) | |
| tree | d11a8a7a3dfd9b3e6fd434a4dd66cfcabb6a4d2f /locale | |
| parent | 088c3f9ab42089cf1913a3a52f0d275947e57d43 (diff) | |
| parent | b1dad8b2525b81f473bafbe69a3e2dfe24d90f49 (diff) | |
| download | gitlab-ce-f92bc7b10d35624bda7ae7db0e9034955587c9a1.tar.gz | |
Merge branch 'security-28802-respect-fork-parent-visibility' into 'master'
Check permissions before showing a forked project's source
See merge request gitlab/gitlabhq!3554
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/gitlab.pot | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 799612af9cd..fa8f36220f1 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -7699,7 +7699,7 @@ msgstr "" msgid "ForkedFromProjectPath|Forked from" msgstr "" -msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgid "ForkedFromProjectPath|Forked from an inaccessible project" msgstr "" msgid "Forking in progress" @@ -17909,7 +17909,10 @@ msgstr "" msgid "This will redirect you to an external sign in page." msgstr "" -msgid "This will remove the fork relationship to source project" +msgid "This will remove the fork relationship between this project and %{fork_source}." +msgstr "" + +msgid "This will remove the fork relationship between this project and other projects in the fork network." msgstr "" msgid "Those emails automatically become issues (with the comments becoming the email conversation) listed here." @@ -19825,7 +19828,7 @@ msgstr "" msgid "You are going to remove %{project_full_name}. Removed project CANNOT be restored! Are you ABSOLUTELY sure?" msgstr "" -msgid "You are going to remove the fork relationship to source project %{forked_from_project}. Are you ABSOLUTELY sure?" +msgid "You are going to remove the fork relationship from %{project_full_name}. Are you ABSOLUTELY sure?" msgstr "" msgid "You are going to transfer %{project_full_name} to another owner. Are you ABSOLUTELY sure?" |