From 07294d8157e78826f87b97f9c62db9d3ee973a04 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 9 Aug 2018 10:17:24 +0000 Subject: Port EE changes --- app/views/projects/mirrors/_instructions.html.haml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/views/projects/mirrors/_instructions.html.haml b/app/views/projects/mirrors/_instructions.html.haml index 64f0fde30cf..e051f9e6331 100644 --- a/app/views/projects/mirrors/_instructions.html.haml +++ b/app/views/projects/mirrors/_instructions.html.haml @@ -1,10 +1,11 @@ .account-well.prepend-top-default.append-bottom-default %ul %li - The repository must be accessible over http://, https://, ssh:// or git://. - %li - Include the username in the URL if required: https://username@gitlab.company.com/group/project.git. - %li - The update action will time out after 10 minutes. For big repositories, use a clone/push combination. - %li - The Git LFS objects will not be synced. + = _('The repository must be accessible over http://, + https://, ssh:// and git://.').html_safe + %li= _('Include the username in the URL if required: https://username@gitlab.company.com/group/project.git.').html_safe + %li= _("The update action will time out after #{import_will_timeout_message(Gitlab.config.gitlab_shell.git_timeout)} minutes. For big repositories, use a clone/push combination.") + %li= _('The Git LFS objects will not be synced.').html_safe + %li + = _('This user will be the author of all events in the activity feed that are the result of an update, + like new branches being created or new commits being pushed to existing branches.') -- cgit v1.2.1 From f8f699ab976801af80221994fbfe148f39070d8a Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 9 Aug 2018 12:30:44 +0000 Subject: Update gitlab.pot --- locale/gitlab.pot | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index bec60cf592a..29af7785937 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -3031,6 +3031,9 @@ msgstr "" msgid "Include a Terms of Service agreement and Privacy Policy that all users must accept." msgstr "" +msgid "Include the username in the URL if required: https://username@gitlab.company.com/group/project.git." +msgstr "" + msgid "Incompatible Project" msgstr "" @@ -5189,6 +5192,9 @@ msgstr "" msgid "Test coverage parsing" msgstr "" +msgid "The Git LFS objects will not be synced." +msgstr "" + msgid "The Issue Tracker is the place to add things that need to be improved or solved in a project" msgstr "" @@ -5246,6 +5252,9 @@ msgstr "" msgid "The repository must be accessible over http://, https:// or git://." msgstr "" +msgid "The repository must be accessible over http://, https://, ssh:// and git://." +msgstr "" + msgid "The review stage shows the time from creating the merge request to merging it. The data will automatically be added after you merge your first merge request." msgstr "" @@ -5408,6 +5417,9 @@ msgstr "" msgid "This user has no identities" msgstr "" +msgid "This user will be the author of all events in the activity feed that are the result of an update, like new branches being created or new commits being pushed to existing branches." +msgstr "" + msgid "Time before an issue gets scheduled" msgstr "" -- cgit v1.2.1 From 8650d72eb271417dd3bb11fee185da2fdacb7358 Mon Sep 17 00:00:00 2001 From: Luke Bennett Date: Tue, 14 Aug 2018 19:22:18 +0100 Subject: regenerate .pot --- locale/gitlab.pot | 3 --- 1 file changed, 3 deletions(-) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 4c660ae45c1..04141584cac 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5321,9 +5321,6 @@ msgstr "" msgid "The time taken by each data entry gathered by that stage." msgstr "" -msgid "The update action will time out after 15 minutes. For big repositories, use a clone/push combination." -msgstr "" - msgid "The user map is a JSON document mapping the Google Code users that participated on your projects to the way their email addresses and usernames will be imported into GitLab. You can change this by changing the value on the right hand side of :. Be sure to preserve the surrounding double quotes, other punctuation and the email address or username on the left hand side." msgstr "" -- cgit v1.2.1