diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-16 16:16:35 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-06-16 19:00:27 -0500 |
| commit | 2a7deae183a73c24bea135d75956918815a655fb (patch) | |
| tree | facc4ee1fb1b0538b77837eddcea66ac391b8434 /app/views/projects/merge_requests/conflicts/_submit_form.html.haml | |
| parent | 999926075d82552f630d4e9d8b1128f5f2e131af (diff) | |
| download | gitlab-ce-9-3-stable-rc3-i18n.tar.gz | |
Merge branch 'bvl-missing-translations' into 'master'9-3-stable-rc3-i18n
Missing translations for the project & repository pages.
Closes #33420
See merge request !12052
Conflicts:
app/assets/javascripts/locale/en/app.js
app/assets/javascripts/locale/es/app.js
app/views/projects/pipeline_schedules/_form.html.haml
locale/en/gitlab.po
locale/es/gitlab.po
locale/gitlab.pot
Diffstat (limited to 'app/views/projects/merge_requests/conflicts/_submit_form.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/_submit_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml index 62c9748c510..e675e1830d0 100644 --- a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml +++ b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml @@ -1,7 +1,7 @@ .form-horizontal.resolve-conflicts-form .form-group %label.col-sm-2.control-label{ "for" => "commit-message" } - Commit message + #{ _('Commit message') } .col-sm-10 .commit-message-container .max-width-marker |