Commit add9defa authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Fix sentence for i18n

parent 0c5c5a7f
- branch_name = link_to @merge_request.source_branch, project_tree_path(@merge_request.project, @merge_request.source_branch), class: "ref-name"
- translation =_('You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}') % { use_ours: '<code>Use Ours</code>', use_theirs: '<code>Use Theirs</code>', branch_name: branch_name }
%hr %hr
.form-horizontal.resolve-conflicts-form .form-horizontal.resolve-conflicts-form
.form-group .form-group
.col-md-4 .col-md-4
%h4= _('Resolve conflicts on source branch') %h4= _('Resolve conflicts on source branch')
.resolve-info .resolve-info
#{ _('You can resolve the merge conflict using either the Interactive mode, by choosing') } = translation.html_safe
%code Use ours
#{ _('or') }
%code Use theirs
#{ _('buttons, or by editing the files directly. Commit these changes into') }
#{link_to @merge_request.source_branch, project_tree_path(@merge_request.project, @merge_request.source_branch), class: "ref-name"}.
.col-md-8 .col-md-8
%label.label-light{ "for" => "commit-message" } %label.label-light{ "for" => "commit-message" }
#{ _('Commit message') } #{ _('Commit message') }
......
...@@ -8,8 +8,8 @@ msgid "" ...@@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gitlab 1.0.0\n" "Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-17 09:05-0700\n" "POT-Creation-Date: 2018-05-21 12:38-0700\n"
"PO-Revision-Date: 2018-05-17 09:05-0700\n" "PO-Revision-Date: 2018-05-21 12:38-0700\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: \n"
...@@ -82,6 +82,9 @@ msgstr[1] "" ...@@ -82,6 +82,9 @@ msgstr[1] ""
msgid "%{loadingIcon} Started" msgid "%{loadingIcon} Started"
msgstr "" msgstr ""
msgid "%{lock_path} is locked by GitLab User %{lock_user_id}"
msgstr ""
msgid "%{nip_domain} can be used as an alternative to a custom domain." msgid "%{nip_domain} can be used as an alternative to a custom domain."
msgstr "" msgstr ""
...@@ -1447,7 +1450,7 @@ msgstr "" ...@@ -1447,7 +1450,7 @@ msgstr ""
msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images."
msgstr "" msgstr ""
msgid "ContainerRegistry|You can also %{deploy_token} for read-only access to the registry images." msgid "ContainerRegistry|You can also use a %{deploy_token} for read-only access to the registry images."
msgstr "" msgstr ""
msgid "Continuous Integration and Deployment" msgid "Continuous Integration and Deployment"
...@@ -2487,6 +2490,9 @@ msgstr "" ...@@ -2487,6 +2490,9 @@ msgstr ""
msgid "Lock %{issuableDisplayName}" msgid "Lock %{issuableDisplayName}"
msgstr "" msgstr ""
msgid "Lock not found"
msgstr ""
msgid "Lock to current projects" msgid "Lock to current projects"
msgstr "" msgstr ""
...@@ -4281,6 +4287,9 @@ msgstr "" ...@@ -4281,6 +4287,9 @@ msgstr ""
msgid "Toggle Sidebar" msgid "Toggle Sidebar"
msgstr "" msgstr ""
msgid "Toggle discussion"
msgstr ""
msgid "Toggle sidebar" msgid "Toggle sidebar"
msgstr "" msgstr ""
...@@ -4602,15 +4611,21 @@ msgstr "" ...@@ -4602,15 +4611,21 @@ msgstr ""
msgid "You can only edit files when you are on a branch" msgid "You can only edit files when you are on a branch"
msgstr "" msgstr ""
msgid "You can resolve the merge conflict using either the Interactive mode, by choosing" msgid "You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}"
msgstr "" msgstr ""
msgid "You cannot write to this read-only GitLab instance." msgid "You cannot write to this read-only GitLab instance."
msgstr "" msgstr ""
msgid "You have no permissions"
msgstr ""
msgid "You have reached your project limit" msgid "You have reached your project limit"
msgstr "" msgstr ""
msgid "You must have master access to force delete a lock"
msgstr ""
msgid "You must sign in to star a project" msgid "You must sign in to star a project"
msgstr "" msgstr ""
...@@ -4692,9 +4707,6 @@ msgstr "" ...@@ -4692,9 +4707,6 @@ msgstr ""
msgid "branch name" msgid "branch name"
msgstr "" msgstr ""
msgid "buttons, or by editing the files directly. Commit these changes into"
msgstr ""
msgid "command line instructions" msgid "command line instructions"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment