summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2017-06-15 13:47:42 +0200
committerBob Van Landuyt <bob@gitlab.com>2017-06-15 14:47:05 +0200
commit86cd00b5d26779150edab84e434b88ce3b985a0f (patch)
tree8541b9710528cab003387fc58609dcbfa357df7c
parent459998276560dc6b77c11768cbd2d22bae7426a2 (diff)
downloadgitlab-ce-86cd00b5d26779150edab84e434b88ce3b985a0f.tar.gz
Add context for commit_box title
-rw-r--r--app/views/projects/commit/_commit_box.html.haml2
-rw-r--r--locale/en/gitlab.po31
-rw-r--r--locale/es/gitlab.po5
-rw-r--r--locale/gitlab.pot7
4 files changed, 27 insertions, 18 deletions
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index d7d32a45810..6da2e94e218 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -1,7 +1,7 @@
.page-content-header
.header-main-content
%strong
- #{ _('Commit') }
+ #{ s_('CommitBoxTitle|Commit') }
%span.commit-sha= @commit.short_id
= clipboard_button(text: @commit.id, title: _("Copy commit SHA to clipboard"))
%span.hidden-xs authored
diff --git a/locale/en/gitlab.po b/locale/en/gitlab.po
index ba72e4fc3b7..874698382ed 100644
--- a/locale/en/gitlab.po
+++ b/locale/en/gitlab.po
@@ -85,12 +85,6 @@ msgstr ""
msgid "ChangeTypeAction|Cherry-pick"
msgstr ""
-msgid "ChangeType|commit"
-msgstr ""
-
-msgid "ChangeType|merge request"
-msgstr ""
-
msgid "Changelog"
msgstr ""
@@ -100,7 +94,7 @@ msgstr ""
msgid "Cherry-pick this commit"
msgstr ""
-msgid "Cherry-pick this merge-request"
+msgid "Cherry-pick this merge request"
msgstr ""
msgid "CiStatusLabel|canceled"
@@ -165,6 +159,9 @@ msgstr[1] ""
msgid "Commit message"
msgstr ""
+msgid "CommitBoxTitle|Commit"
+msgstr ""
+
msgid "CommitMessage|Add %{file_name}"
msgstr ""
@@ -219,9 +216,6 @@ msgstr ""
msgid "Cron syntax"
msgstr ""
-msgid "Custom"
-msgstr ""
-
msgid "Custom notification events"
msgstr ""
@@ -396,6 +390,9 @@ msgstr ""
msgid "Learn more in the"
msgstr ""
+msgid "Learn more in the|pipeline schedules documentation"
+msgstr ""
+
msgid "Leave group"
msgstr ""
@@ -562,6 +559,9 @@ msgstr ""
msgid "PipelineSchedules|Target"
msgstr ""
+msgid "PipelineSheduleIntervalPattern|Custom"
+msgstr ""
+
msgid "Project '%{project_name}' queued for deletion."
msgstr ""
@@ -655,7 +655,7 @@ msgstr ""
msgid "Revert this commit"
msgstr ""
-msgid "Revert this merge-request"
+msgid "Revert this merge request"
msgstr ""
msgid "Save pipeline schedule"
@@ -705,6 +705,9 @@ msgstr ""
msgid "StarProject|Star"
msgstr ""
+msgid "Start a %{new_merge_request} with these changes"
+msgstr ""
+
msgid "Start a <strong>new merge request</strong> with these changes"
msgstr ""
@@ -1007,6 +1010,9 @@ msgid_plural "days"
msgstr[0] ""
msgstr[1] ""
+msgid "new merge request"
+msgstr ""
+
msgid "notification emails"
msgstr ""
@@ -1015,9 +1021,6 @@ msgid_plural "parents"
msgstr[0] ""
msgstr[1] ""
-msgid "pipeline schedules documentation"
-msgstr ""
-
msgid "with stage"
msgid_plural "with stages"
msgstr[0] ""
diff --git a/locale/es/gitlab.po b/locale/es/gitlab.po
index 455122b522b..2f4ec24e720 100644
--- a/locale/es/gitlab.po
+++ b/locale/es/gitlab.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-06-15 13:28+0200\n"
+"PO-Revision-Date: 2017-06-15 13:46+0200\n"
"Language-Team: Spanish\n"
"Language: es\n"
"MIME-Version: 1.0\n"
@@ -159,6 +159,9 @@ msgstr[1] "Cambios"
msgid "Commit message"
msgstr "Mensaje del cambio"
+msgid "CommitBoxTitle|Commit"
+msgstr "Cambio"
+
msgid "CommitMessage|Add %{file_name}"
msgstr "Agregar %{file_name}"
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index df225f5aac8..82b3c163571 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-15 12:35+0200\n"
-"PO-Revision-Date: 2017-06-15 12:35+0200\n"
+"POT-Creation-Date: 2017-06-15 13:42+0200\n"
+"PO-Revision-Date: 2017-06-15 13:42+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -160,6 +160,9 @@ msgstr[1] ""
msgid "Commit message"
msgstr ""
+msgid "CommitBoxTitle|Commit"
+msgstr ""
+
msgid "CommitMessage|Add %{file_name}"
msgstr ""