Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
0f7c38f0
Commit
0f7c38f0
authored
May 09, 2018
by
Dylan Griffith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add more i18n for runner pages
parent
c8bfb3e4
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
147 additions
and
20 deletions
+147
-20
app/views/groups/runners/_group_runners.html.haml
app/views/groups/runners/_group_runners.html.haml
+1
-1
app/views/groups/runners/edit.html.haml
app/views/groups/runners/edit.html.haml
+1
-1
app/views/projects/runners/_group_runners.html.haml
app/views/projects/runners/_group_runners.html.haml
+2
-2
app/views/projects/runners/_shared_runners.html.haml
app/views/projects/runners/_shared_runners.html.haml
+3
-3
app/views/projects/runners/_specific_runners.html.haml
app/views/projects/runners/_specific_runners.html.haml
+2
-1
app/views/projects/runners/edit.html.haml
app/views/projects/runners/edit.html.haml
+1
-1
app/views/shared/runners/_form.html.haml
app/views/shared/runners/_form.html.haml
+2
-2
app/views/shared/runners/show.html.haml
app/views/shared/runners/show.html.haml
+7
-7
locale/gitlab.pot
locale/gitlab.pot
+128
-2
No files found.
app/views/groups/runners/_group_runners.html.haml
View file @
0f7c38f0
-
link
=
link_to
'Runners API'
,
help_page_path
(
'api/runners.md'
)
-
link
=
link_to
_
(
'Runners API'
)
,
help_page_path
(
'api/runners.md'
)
%h3
%h3
=
_
(
'Group Runners'
)
=
_
(
'Group Runners'
)
...
...
app/views/groups/runners/edit.html.haml
View file @
0f7c38f0
-
page_title
"Edit"
,
"
#{
@runner
.
description
}
#
#{
@runner
.
id
}
"
,
"Runners"
-
page_title
_
(
'Edit'
),
"
#{
@runner
.
description
}
#
#{
@runner
.
id
}
"
,
'Runners'
%h4
Runner ##{@runner.id}
%h4
Runner ##{@runner.id}
...
...
app/views/projects/runners/_group_runners.html.haml
View file @
0f7c38f0
-
link
=
link_to
'Runners API'
,
help_page_path
(
'api/runners.md'
)
-
link
=
link_to
_
(
'Runners API'
)
,
help_page_path
(
'api/runners.md'
)
%h3
%h3
=
_
(
'Group Runners'
)
=
_
(
'Group Runners'
)
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
=
_
(
'This group does not provide any group Runners yet.'
)
=
_
(
'This group does not provide any group Runners yet.'
)
-
if
can?
(
current_user
,
:admin_pipeline
,
@project
.
group
)
-
if
can?
(
current_user
,
:admin_pipeline
,
@project
.
group
)
-
group_link
=
link_to
'Group CI/CD settings'
,
group_settings_ci_cd_path
(
@project
.
group
)
-
group_link
=
link_to
_
(
'Group CI/CD settings'
)
,
group_settings_ci_cd_path
(
@project
.
group
)
=
_
(
'Group masters can register group runners in the %{link}'
).
html_safe
%
{
link:
group_link
}
=
_
(
'Group masters can register group runners in the %{link}'
).
html_safe
%
{
link:
group_link
}
-
else
-
else
=
_
(
'Ask your group master to setup a group Runner.'
)
=
_
(
'Ask your group master to setup a group Runner.'
)
...
...
app/views/projects/runners/_shared_runners.html.haml
View file @
0f7c38f0
%h3
Shared Runners
%h3
=
_
(
'Shared Runners'
)
.bs-callout.shared-runners-description
.bs-callout.shared-runners-description
-
if
Gitlab
::
CurrentSettings
.
shared_runners_text
.
present?
-
if
Gitlab
::
CurrentSettings
.
shared_runners_text
.
present?
...
@@ -17,8 +18,7 @@
...
@@ -17,8 +18,7 @@
for this project
for this project
-
if
@shared_runners_count
.
zero?
-
if
@shared_runners_count
.
zero?
This GitLab instance does not provide any shared Runners yet. Instance
=
_
(
'This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area.'
)
administrators can register shared Runners in the admin area.
-
else
-
else
%h4
.underlined-title
Available shared Runners :
#{
@shared_runners_count
}
%h4
.underlined-title
Available shared Runners :
#{
@shared_runners_count
}
%ul
.bordered-list.available-shared-runners
%ul
.bordered-list.available-shared-runners
...
...
app/views/projects/runners/_specific_runners.html.haml
View file @
0f7c38f0
%h3
Specific Runners
%h3
=
_
(
'Specific Runners'
)
=
render
partial:
'ci/runner/how_to_setup_specific_runner'
,
=
render
partial:
'ci/runner/how_to_setup_specific_runner'
,
locals:
{
registration_token:
@project
.
runners_token
}
locals:
{
registration_token:
@project
.
runners_token
}
...
...
app/views/projects/runners/edit.html.haml
View file @
0f7c38f0
-
page_title
"Edit"
,
"
#{
@runner
.
description
}
#
#{
@runner
.
id
}
"
,
"Runners"
-
page_title
_
(
'Edit'
),
"
#{
@runner
.
description
}
#
#{
@runner
.
id
}
"
,
'Runners'
%h4
Runner ##{@runner.id}
%h4
Runner ##{@runner.id}
...
...
app/views/shared/runners/_form.html.haml
View file @
0f7c38f0
...
@@ -20,11 +20,11 @@
...
@@ -20,11 +20,11 @@
%span
.light
Indicates whether this runner can pick jobs without tags
%span
.light
Indicates whether this runner can pick jobs without tags
-
unless
runner
.
group_type?
-
unless
runner
.
group_type?
.form-group
.form-group
=
label
:locked
,
'Lock to current projects'
,
class:
'control-label'
=
label
:locked
,
_
(
'Lock to current projects'
)
,
class:
'control-label'
.col-sm-10
.col-sm-10
.checkbox
.checkbox
=
f
.
check_box
:locked
=
f
.
check_box
:locked
%span
.light
When a runner is locked, it cannot be assigned to other projects
%span
.light
=
_
(
'When a runner is locked, it cannot be assigned to other projects'
)
.form-group
.form-group
=
label_tag
:token
,
class:
'control-label'
do
=
label_tag
:token
,
class:
'control-label'
do
Token
Token
...
...
app/views/shared/runners/show.html.haml
View file @
0f7c38f0
...
@@ -21,17 +21,17 @@
...
@@ -21,17 +21,17 @@
%th
Value
%th
Value
%tr
%tr
%td
Active
%td
Active
%td
=
@runner
.
active?
?
'Yes'
:
'No'
%td
=
@runner
.
active?
?
_
(
'Yes'
)
:
_
(
'No'
)
%tr
%tr
%td
Protected
%td
Protected
%td
=
@runner
.
ref_protected?
?
'Yes'
:
'No'
%td
=
@runner
.
ref_protected?
?
_
(
'Yes'
)
:
_
(
'No'
)
%tr
%tr
%td
Can run untagged jobs
%td
=
_
(
'Can run untagged jobs'
)
%td
=
@runner
.
run_untagged?
?
'Yes'
:
'No'
%td
=
@runner
.
run_untagged?
?
_
(
'Yes'
)
:
_
(
'No'
)
-
unless
@runner
.
group_type?
-
unless
@runner
.
group_type?
%tr
%tr
%td
Locked to this project
%td
=
_
(
'Locked to this project'
)
%td
=
@runner
.
locked?
?
'Yes'
:
'No'
%td
=
@runner
.
locked?
?
_
(
'Yes'
)
:
_
(
'No'
)
%tr
%tr
%td
Tags
%td
Tags
%td
%td
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
%td
Description
%td
Description
%td
=
@runner
.
description
%td
=
@runner
.
description
%tr
%tr
%td
Maximum job timeout
%td
=
_
(
'Maximum job timeout'
)
%td
=
@runner
.
maximum_timeout_human_readable
%td
=
@runner
.
maximum_timeout_human_readable
%tr
%tr
%td
Last contact
%td
Last contact
...
...
locale/gitlab.pot
View file @
0f7c38f0
...
@@ -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-0
2 22:28
+0200\n"
"POT-Creation-Date: 2018-05-0
9 09:24
+0200\n"
"PO-Revision-Date: 2018-05-0
2 22:28
+0200\n"
"PO-Revision-Date: 2018-05-0
9 09:24
+0200\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"
...
@@ -104,6 +104,12 @@ msgstr ""
...
@@ -104,6 +104,12 @@ msgstr ""
msgid "+ %{moreCount} more"
msgid "+ %{moreCount} more"
msgstr ""
msgstr ""
msgid "- Runner is active and can process any new jobs"
msgstr ""
msgid "- Runner is paused and will not receive any new jobs"
msgstr ""
msgid "- show less"
msgid "- show less"
msgstr ""
msgstr ""
...
@@ -156,6 +162,9 @@ msgstr ""
...
@@ -156,6 +162,9 @@ msgstr ""
msgid "<strong>Removes</strong> source branch"
msgid "<strong>Removes</strong> source branch"
msgstr ""
msgstr ""
msgid "A 'Runner' is a process which runs a job. You can setup as many Runners as you need."
msgstr ""
msgid "A collection of graphs regarding Continuous Integration"
msgid "A collection of graphs regarding Continuous Integration"
msgstr ""
msgstr ""
...
@@ -387,6 +396,9 @@ msgstr ""
...
@@ -387,6 +396,9 @@ msgstr ""
msgid "Artifacts"
msgid "Artifacts"
msgstr ""
msgstr ""
msgid "Ask your group master to setup a group Runner."
msgstr ""
msgid "Assign custom color like #FF0000"
msgid "Assign custom color like #FF0000"
msgstr ""
msgstr ""
...
@@ -474,6 +486,12 @@ msgstr ""
...
@@ -474,6 +486,12 @@ msgstr ""
msgid "Available"
msgid "Available"
msgstr ""
msgstr ""
msgid "Available group Runners : %{runners}"
msgstr ""
msgid "Available group Runners : %{runners}."
msgstr ""
msgid "Avatar will be removed. Are you sure?"
msgid "Avatar will be removed. Are you sure?"
msgstr ""
msgstr ""
...
@@ -716,6 +734,9 @@ msgstr ""
...
@@ -716,6 +734,9 @@ msgstr ""
msgid "CI/CD configuration"
msgid "CI/CD configuration"
msgstr ""
msgstr ""
msgid "CI/CD settings"
msgstr ""
msgid "CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery."
msgid "CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery."
msgstr ""
msgstr ""
...
@@ -749,6 +770,9 @@ msgstr ""
...
@@ -749,6 +770,9 @@ msgstr ""
msgid "CICD|You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages."
msgid "CICD|You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages."
msgstr ""
msgstr ""
msgid "Can run untagged jobs"
msgstr ""
msgid "Cancel"
msgid "Cancel"
msgstr ""
msgstr ""
...
@@ -1652,6 +1676,15 @@ msgstr ""
...
@@ -1652,6 +1676,15 @@ msgstr ""
msgid "Directory name"
msgid "Directory name"
msgstr ""
msgstr ""
msgid "Disable"
msgstr ""
msgid "Disable for this project"
msgstr ""
msgid "Disable group Runners"
msgstr ""
msgid "Discard changes"
msgid "Discard changes"
msgstr ""
msgstr ""
...
@@ -1703,6 +1736,9 @@ msgstr ""
...
@@ -1703,6 +1736,9 @@ msgstr ""
msgid "Due date"
msgid "Due date"
msgstr ""
msgstr ""
msgid "Each Runner can be in one of the following states:"
msgstr ""
msgid "Edit"
msgid "Edit"
msgstr ""
msgstr ""
...
@@ -1724,6 +1760,9 @@ msgstr ""
...
@@ -1724,6 +1760,9 @@ msgstr ""
msgid "Embed"
msgid "Embed"
msgstr ""
msgstr ""
msgid "Enable"
msgstr ""
msgid "Enable Auto DevOps"
msgid "Enable Auto DevOps"
msgstr ""
msgstr ""
...
@@ -1736,6 +1775,12 @@ msgstr ""
...
@@ -1736,6 +1775,12 @@ msgstr ""
msgid "Enable and configure Prometheus metrics."
msgid "Enable and configure Prometheus metrics."
msgstr ""
msgstr ""
msgid "Enable for this project"
msgstr ""
msgid "Enable group Runners"
msgstr ""
msgid "Enable or disable version check and usage ping."
msgid "Enable or disable version check and usage ping."
msgstr ""
msgstr ""
...
@@ -1978,6 +2023,9 @@ msgstr ""
...
@@ -1978,6 +2023,9 @@ msgstr ""
msgid "GitLab CI Linter has been moved"
msgid "GitLab CI Linter has been moved"
msgstr ""
msgstr ""
msgid "GitLab Group Runners can execute code for all the projects in this group."
msgstr ""
msgid "GitLab Runner section"
msgid "GitLab Runner section"
msgstr ""
msgstr ""
...
@@ -2002,9 +2050,18 @@ msgstr ""
...
@@ -2002,9 +2050,18 @@ msgstr ""
msgid "Got it!"
msgid "Got it!"
msgstr ""
msgstr ""
msgid "Group CI/CD settings"
msgstr ""
msgid "Group ID"
msgid "Group ID"
msgstr ""
msgstr ""
msgid "Group Runners"
msgstr ""
msgid "Group masters can register group runners in the %{link}"
msgstr ""
msgid "GroupSettings|Prevent sharing a project within %{group} with other groups"
msgid "GroupSettings|Prevent sharing a project within %{group} with other groups"
msgstr ""
msgstr ""
...
@@ -2315,9 +2372,18 @@ msgstr ""
...
@@ -2315,9 +2372,18 @@ msgstr ""
msgid "Lock %{issuableDisplayName}"
msgid "Lock %{issuableDisplayName}"
msgstr ""
msgstr ""
msgid "Lock to current projects"
msgstr ""
msgid "Locked"
msgid "Locked"
msgstr ""
msgstr ""
msgid "Locked to current projects"
msgstr ""
msgid "Locked to this project"
msgstr ""
msgid "Login"
msgid "Login"
msgstr ""
msgstr ""
...
@@ -2348,6 +2414,9 @@ msgstr ""
...
@@ -2348,6 +2414,9 @@ msgstr ""
msgid "Maximum git storage failures"
msgid "Maximum git storage failures"
msgstr ""
msgstr ""
msgid "Maximum job timeout"
msgstr ""
msgid "May"
msgid "May"
msgstr ""
msgstr ""
...
@@ -2491,6 +2560,9 @@ msgstr ""
...
@@ -2491,6 +2560,9 @@ msgstr ""
msgid "New tag"
msgid "New tag"
msgstr ""
msgstr ""
msgid "No"
msgstr ""
msgid "No assignee"
msgid "No assignee"
msgstr ""
msgstr ""
...
@@ -2680,6 +2752,9 @@ msgstr ""
...
@@ -2680,6 +2752,9 @@ msgstr ""
msgid "Password"
msgid "Password"
msgstr ""
msgstr ""
msgid "Pause"
msgstr ""
msgid "Pending"
msgid "Pending"
msgstr ""
msgstr ""
...
@@ -3145,6 +3220,9 @@ msgstr ""
...
@@ -3145,6 +3220,9 @@ msgstr ""
msgid "Register / Sign In"
msgid "Register / Sign In"
msgstr ""
msgstr ""
msgid "Register and see your runners for this group."
msgstr ""
msgid "Related Commits"
msgid "Related Commits"
msgstr ""
msgstr ""
...
@@ -3169,6 +3247,12 @@ msgstr ""
...
@@ -3169,6 +3247,12 @@ msgstr ""
msgid "Remind later"
msgid "Remind later"
msgstr ""
msgstr ""
msgid "Remove"
msgstr ""
msgid "Remove Runner"
msgstr ""
msgid "Remove avatar"
msgid "Remove avatar"
msgstr ""
msgstr ""
...
@@ -3202,6 +3286,9 @@ msgstr ""
...
@@ -3202,6 +3286,9 @@ msgstr ""
msgid "Resolve discussion"
msgid "Resolve discussion"
msgstr ""
msgstr ""
msgid "Resume"
msgstr ""
msgid "Retry"
msgid "Retry"
msgstr ""
msgstr ""
...
@@ -3234,6 +3321,15 @@ msgstr ""
...
@@ -3234,6 +3321,15 @@ msgstr ""
msgid "Runners"
msgid "Runners"
msgstr ""
msgstr ""
msgid "Runners API"
msgstr ""
msgid "Runners can be placed on separate users, servers, and even on your local machine."
msgstr ""
msgid "Runners settings"
msgstr ""
msgid "Running"
msgid "Running"
msgstr ""
msgstr ""
...
@@ -3360,6 +3456,9 @@ msgstr ""
...
@@ -3360,6 +3456,9 @@ msgstr ""
msgid "Share"
msgid "Share"
msgstr ""
msgstr ""
msgid "Shared Runners"
msgstr ""
msgid "Show command"
msgid "Show command"
msgstr ""
msgstr ""
...
@@ -3515,6 +3614,9 @@ msgstr ""
...
@@ -3515,6 +3614,9 @@ msgstr ""
msgid "Spam and Anti-bot Protection"
msgid "Spam and Anti-bot Protection"
msgstr ""
msgstr ""
msgid "Specific Runners"
msgstr ""
msgid "Specify the following URL during the Runner setup:"
msgid "Specify the following URL during the Runner setup:"
msgstr ""
msgstr ""
...
@@ -3772,9 +3874,18 @@ msgstr ""
...
@@ -3772,9 +3874,18 @@ msgstr ""
msgid "There was an error when unsubscribing from this label."
msgid "There was an error when unsubscribing from this label."
msgstr ""
msgstr ""
msgid "They can be managed using the %{link}."
msgstr ""
msgid "This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area."
msgstr ""
msgid "This directory"
msgid "This directory"
msgstr ""
msgstr ""
msgid "This group does not provide any group Runners yet."
msgstr ""
msgid "This is a confidential issue."
msgid "This is a confidential issue."
msgstr ""
msgstr ""
...
@@ -3832,6 +3943,9 @@ msgstr ""
...
@@ -3832,6 +3943,9 @@ msgstr ""
msgid "This project"
msgid "This project"
msgstr ""
msgstr ""
msgid "This project does not belong to a group and can therefore not make use of group Runners."
msgstr ""
msgid "This repository"
msgid "This repository"
msgstr ""
msgstr ""
...
@@ -4016,6 +4130,9 @@ msgstr ""
...
@@ -4016,6 +4130,9 @@ msgstr ""
msgid "To import an SVN repository, check out %{svn_link}."
msgid "To import an SVN repository, check out %{svn_link}."
msgstr ""
msgstr ""
msgid "To start serving your jobs you can add Runners to your group"
msgstr ""
msgid "To validate your GitLab CI configurations, go to 'CI/CD → Pipelines' inside your project, and click on the 'CI Lint' button."
msgid "To validate your GitLab CI configurations, go to 'CI/CD → Pipelines' inside your project, and click on the 'CI Lint' button."
msgstr ""
msgstr ""
...
@@ -4187,6 +4304,9 @@ msgstr ""
...
@@ -4187,6 +4304,9 @@ msgstr ""
msgid "Web terminal"
msgid "Web terminal"
msgstr ""
msgstr ""
msgid "When a runner is locked, it cannot be assigned to other projects"
msgstr ""
msgid "When enabled, users cannot use GitLab until the terms have been accepted."
msgid "When enabled, users cannot use GitLab until the terms have been accepted."
msgstr ""
msgstr ""
...
@@ -4304,6 +4424,9 @@ msgstr ""
...
@@ -4304,6 +4424,9 @@ msgstr ""
msgid "Write a commit message..."
msgid "Write a commit message..."
msgstr ""
msgstr ""
msgid "Yes"
msgstr ""
msgid "You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?"
msgid "You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?"
msgstr ""
msgstr ""
...
@@ -4447,6 +4570,9 @@ msgstr ""
...
@@ -4447,6 +4570,9 @@ msgstr ""
msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command."
msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command."
msgstr ""
msgstr ""
msgid "for this project"
msgstr ""
msgid "importing"
msgid "importing"
msgstr ""
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment