diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-08-15 09:59:35 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-08-15 09:59:35 +0000 |
| commit | 218fc3e3db8d62f42600bcda2f8d98af603e6bf9 (patch) | |
| tree | 975f401795bff8e83587e58496fec371dc231a78 | |
| parent | 9b718a761f1601394c3a1e0a15c7855d7eec6ac3 (diff) | |
| parent | 8650d72eb271417dd3bb11fee185da2fdacb7358 (diff) | |
| download | gitlab-ce-218fc3e3db8d62f42600bcda2f8d98af603e6bf9.tar.gz | |
Merge branch 'port-i18n-for-mirrors-instructions' into 'master'
Port EE changes for mirrors/_instructions.html.haml
See merge request gitlab-org/gitlab-ce!21107
| -rw-r--r-- | app/views/projects/mirrors/_instructions.html.haml | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/app/views/projects/mirrors/_instructions.html.haml b/app/views/projects/mirrors/_instructions.html.haml index 3d811be3fe3..e051f9e6331 100644 --- a/app/views/projects/mirrors/_instructions.html.haml +++ b/app/views/projects/mirrors/_instructions.html.haml @@ -4,7 +4,7 @@ = _('The repository must be accessible over <code>http://</code>, <code>https://</code>, <code>ssh://</code> and <code>git://</code>.').html_safe %li= _('Include the username in the URL if required: <code>https://username@gitlab.company.com/group/project.git</code>.').html_safe - %li= _('The update action will time out after 15 minutes. For big repositories, use a clone/push combination.') + %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 <strong>not</strong> 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, diff --git a/locale/gitlab.pot b/locale/gitlab.pot index e5e818f57b9..b01a0068694 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5381,9 +5381,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 <code>:</code>. Be sure to preserve the surrounding double quotes, other punctuation and the email address or username on the left hand side." msgstr "" |