kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix sentence for i18n

This commit is contained in:
Annabel Dunstone Gray 2018-05-21 12:36:16 -07:00
parent 0c5c5a7ffa
commit add9defa05
No known key found for this signature in database
GPG Key ID: 7C8C78A372AD7A2D
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/projects/merge_requests/conflicts/_submit_form.html.haml
View File

@ -1,15 +1,13 @@
- 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
.form-horizontal.resolve-conflicts-form
.form-group
.col-md-4
%h4= _('Resolve conflicts on source branch')
.resolve-info
#{ _('You can resolve the merge conflict using either the Interactive mode, by choosing') }
%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"}.
= translation.html_safe
.col-md-8
%label.label-light{ "for" => "commit-message" }
#{ _('Commit message') }

26
locale/gitlab.pot
View File

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-17 09:05-0700\n"
"PO-Revision-Date: 2018-05-17 09:05-0700\n"
"POT-Creation-Date: 2018-05-21 12:38-0700\n"
"PO-Revision-Date: 2018-05-21 12:38-0700\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@ -82,6 +82,9 @@ msgstr[1] ""
msgid "%{loadingIcon} Started"
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."
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."
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 ""
msgid "Continuous Integration and Deployment"
@ -2487,6 +2490,9 @@ msgstr ""
msgid "Lock %{issuableDisplayName}"
msgstr ""
msgid "Lock not found"
msgstr ""
msgid "Lock to current projects"
msgstr ""
@ -4281,6 +4287,9 @@ msgstr ""
msgid "Toggle Sidebar"
msgstr ""
msgid "Toggle discussion"
msgstr ""
msgid "Toggle sidebar"
msgstr ""
@ -4602,15 +4611,21 @@ msgstr ""
msgid "You can only edit files when you are on a branch"
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 ""
msgid "You cannot write to this read-only GitLab instance."
msgstr ""
msgid "You have no permissions"
msgstr ""
msgid "You have reached your project limit"
msgstr ""
msgid "You must have master access to force delete a lock"
msgstr ""
msgid "You must sign in to star a project"
msgstr ""
@ -4692,9 +4707,6 @@ msgstr ""
msgid "branch name"
msgstr ""
msgid "buttons, or by editing the files directly. Commit these changes into"
msgstr ""
msgid "command line instructions"
msgstr ""