summaryrefslogtreecommitdiff
path: root/app/views/admin
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/abuse_reports/_abuse_report.html.haml16
-rw-r--r--app/views/admin/abuse_reports/index.html.haml14
-rw-r--r--app/views/admin/appearances/_form.html.haml26
-rw-r--r--app/views/admin/appearances/preview.html.haml14
-rw-r--r--app/views/admin/appearances/show.html.haml6
-rw-r--r--app/views/admin/application_settings/_form.html.haml16
-rw-r--r--app/views/admin/application_settings/show.html.haml4
-rw-r--r--app/views/admin/applications/_delete_form.html.haml2
-rw-r--r--app/views/admin/applications/_form.html.haml14
-rw-r--r--app/views/admin/applications/edit.html.haml4
-rw-r--r--app/views/admin/applications/index.html.haml16
-rw-r--r--app/views/admin/applications/new.html.haml4
-rw-r--r--app/views/admin/applications/show.html.haml12
-rw-r--r--app/views/admin/background_jobs/show.html.haml14
-rw-r--r--app/views/admin/broadcast_messages/edit.html.haml2
-rw-r--r--app/views/admin/broadcast_messages/index.html.haml19
-rw-r--r--app/views/admin/builds/_build.html.haml4
-rw-r--r--app/views/admin/builds/index.html.haml28
-rw-r--r--app/views/admin/dashboard/index.html.haml46
-rw-r--r--app/views/admin/deploy_keys/index.html.haml16
-rw-r--r--app/views/admin/deploy_keys/new.html.haml16
-rw-r--r--app/views/admin/groups/_form.html.haml10
-rw-r--r--app/views/admin/groups/edit.html.haml4
-rw-r--r--app/views/admin/groups/index.html.haml17
-rw-r--r--app/views/admin/groups/new.html.haml4
-rw-r--r--app/views/admin/groups/show.html.haml15
-rw-r--r--app/views/admin/hooks/index.html.haml23
-rw-r--r--app/views/admin/identities/_form.html.haml6
-rw-r--r--app/views/admin/identities/_identity.html.haml6
-rw-r--r--app/views/admin/identities/edit.html.haml4
-rw-r--r--app/views/admin/identities/index.html.haml10
-rw-r--r--app/views/admin/identities/new.html.haml4
-rw-r--r--app/views/admin/keys/show.html.haml2
-rw-r--r--app/views/admin/labels/_form.html.haml14
-rw-r--r--app/views/admin/labels/edit.html.haml4
-rw-r--r--app/views/admin/labels/index.html.haml8
-rw-r--r--app/views/admin/labels/new.html.haml4
-rw-r--r--app/views/admin/logs/show.html.haml6
-rw-r--r--app/views/admin/projects/index.html.haml28
-rw-r--r--app/views/admin/projects/show.html.haml38
-rw-r--r--app/views/admin/runners/_runner.html.haml24
-rw-r--r--app/views/admin/runners/index.html.haml52
-rw-r--r--app/views/admin/runners/show.html.haml50
-rw-r--r--app/views/admin/services/_form.html.haml4
-rw-r--r--app/views/admin/services/edit.html.haml2
-rw-r--r--app/views/admin/services/index.html.haml14
-rw-r--r--app/views/admin/users/_form.html.haml14
-rw-r--r--app/views/admin/users/_head.html.haml18
-rw-r--r--app/views/admin/users/_profile.html.haml14
-rw-r--r--app/views/admin/users/edit.html.haml4
-rw-r--r--app/views/admin/users/groups.html.haml8
-rw-r--r--app/views/admin/users/index.html.haml4
-rw-r--r--app/views/admin/users/new.html.haml4
-rw-r--r--app/views/admin/users/projects.html.haml16
-rw-r--r--app/views/admin/users/show.html.haml62
55 files changed, 394 insertions, 396 deletions
diff --git a/app/views/admin/abuse_reports/_abuse_report.html.haml b/app/views/admin/abuse_reports/_abuse_report.html.haml
index 2ab01704b77..b35a007671b 100644
--- a/app/views/admin/abuse_reports/_abuse_report.html.haml
+++ b/app/views/admin/abuse_reports/_abuse_report.html.haml
@@ -5,27 +5,27 @@
- if user
= link_to user.name, [:admin, user]
.light.small
- Joined #{time_ago_with_tooltip(user.created_at)}
+ 加入时间:#{time_ago_with_tooltip(user.created_at)}
- else
- (removed)
+ (已删除)
%td
- if reporter
= link_to reporter.name, [:admin, reporter]
- else
- (removed)
+ (已删除)
.light.small
= time_ago_with_tooltip(abuse_report.created_at)
%td
= markdown(abuse_report.message.squish!, pipeline: :single_line)
%td
- if user
- = link_to 'Remove user & report', admin_abuse_report_path(abuse_report, remove_user: true),
- data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" }, remote: true, method: :delete, class: "btn btn-xs btn-remove js-remove-tr"
+ = link_to '删除用户和举报', admin_abuse_report_path(abuse_report, remove_user: true),
+ data: { confirm: "确定要删除 #{user.name} 用户么?" }, remote: true, method: :delete, class: "btn btn-xs btn-remove js-remove-tr"
%td
- if user && !user.blocked?
- = link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-xs"
+ = link_to '禁用用户', block_admin_user_path(user), data: {confirm: '确定要禁用用户么?'}, method: :put, class: "btn btn-xs"
- else
.btn.btn-xs.disabled
- Already Blocked
- = link_to 'Remove report', [:admin, abuse_report], remote: true, method: :delete, class: "btn btn-xs btn-close js-remove-tr"
+ 已被禁用
+ = link_to '删除举报', [:admin, abuse_report], remote: true, method: :delete, class: "btn btn-xs btn-close js-remove-tr"
diff --git a/app/views/admin/abuse_reports/index.html.haml b/app/views/admin/abuse_reports/index.html.haml
index bc4a9cedb2c..703c3b1a768 100644
--- a/app/views/admin/abuse_reports/index.html.haml
+++ b/app/views/admin/abuse_reports/index.html.haml
@@ -1,17 +1,17 @@
-- page_title "Abuse Reports"
-%h3.page-title Abuse Reports
+- page_title "滥用举报"
+%h3.page-title 滥用举报
%hr
- if @abuse_reports.present?
.table-holder
%table.table
%thead
%tr
- %th User
- %th Reported by
- %th Message
- %th Primary action
+ %th 被举报用户
+ %th 举报人
+ %th 信息
+ %th 操作
%th
= render @abuse_reports
= paginate @abuse_reports
- else
- %h4 There are no abuse reports
+ %h4 没有滥用举报
diff --git a/app/views/admin/appearances/_form.html.haml b/app/views/admin/appearances/_form.html.haml
index 6f325914d14..e1efab88b69 100644
--- a/app/views/admin/appearances/_form.html.haml
+++ b/app/views/admin/appearances/_form.html.haml
@@ -6,17 +6,17 @@
%fieldset.sign-in
%legend
- Sign in/Sign up pages:
+ 登入/注册页面:
.form-group
- = f.label :title, class: 'control-label'
+ = f.label :title, "标题", class: 'control-label'
.col-sm-10
= f.text_field :title, class: "form-control"
.form-group
- = f.label :description, class: 'control-label'
+ = f.label :description, "描述", class: 'control-label'
.col-sm-10
= f.text_area :description, class: "form-control", rows: 10
.hint
- Description parsed with #{link_to "GitLab Flavored Markdown", help_page_path('markdown', 'markdown'), target: '_blank'}.
+ 描述被解析为 #{link_to "GitLab 特色 Markdown", help_page_path('markdown', 'markdown'), target: '_blank'} 格式。
.form-group
= f.label :logo, class: 'control-label'
.col-sm-10
@@ -24,35 +24,35 @@
= image_tag @appearance.logo_url, class: 'appearance-logo-preview'
- if @appearance.persisted?
%br
- = link_to 'Remove logo', logo_admin_appearances_path, data: { confirm: "Logo will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-small remove-logo"
+ = link_to '删除 Logo', logo_admin_appearances_path, data: { confirm: "确定要删除 Logo 么?"}, method: :delete, class: "btn btn-remove btn-small remove-logo"
%hr
= f.hidden_field :logo_cache
= f.file_field :logo, class: ""
.hint
- Maximum file size is 1MB. Pages are optimized for a 640x360 px logo.
+ 文件最大大小为 1MB。页面是按照 640x360 像素 LOGO 设计。
%fieldset.app_logo
%legend
- Navigation bar:
+ 导航条:
.form-group
- = f.label :header_logo, 'Header logo', class: 'control-label'
+ = f.label :header_logo, '头部 Logo', class: 'control-label'
.col-sm-10
- if @appearance.header_logo?
= image_tag @appearance.header_logo_url, class: 'appearance-light-logo-preview'
- if @appearance.persisted?
%br
- = link_to 'Remove header logo', header_logos_admin_appearances_path, data: { confirm: "Header logo will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-small remove-logo"
+ = link_to '删除头部 Logo', header_logos_admin_appearances_path, data: { confirm: "确定要删除头部 Logo 么?"}, method: :delete, class: "btn btn-remove btn-small remove-logo"
%hr
= f.hidden_field :header_logo_cache
= f.file_field :header_logo, class: ""
.hint
- Maximum file size is 1MB. Pages are optimized for a 72x72 px header logo
+ 文件最大大小为 1MB。页面是按照 72x72 像素头部 LOGO 设计。
.form-actions
- = f.submit 'Save', class: 'btn btn-save'
+ = f.submit '保存', class: 'btn btn-save'
- if @appearance.persisted?
- = link_to 'Preview last save', preview_admin_appearances_path, class: 'btn', target: '_blank'
+ = link_to '预览最后保存', preview_admin_appearances_path, class: 'btn', target: '_blank'
- if @appearance.updated_at
%span.pull-right
- Last edit #{time_ago_with_tooltip(@appearance.updated_at)}
+ 最后编辑:#{time_ago_with_tooltip(@appearance.updated_at)}
diff --git a/app/views/admin/appearances/preview.html.haml b/app/views/admin/appearances/preview.html.haml
index dd4a64e80bc..c77dfbeaacb 100644
--- a/app/views/admin/appearances/preview.html.haml
+++ b/app/views/admin/appearances/preview.html.haml
@@ -1,11 +1,11 @@
-- page_title "Preview | Appearance"
+- page_title "预览 | 外观"
%h3.page-title
- Appearance settings - Preview
+ 外观设置 - 预览
%hr
.ui-box
.title
- Sign-in page
+ 登入页面
%div
.login-page
.container
@@ -23,7 +23,7 @@
= brand_text
.col-sm-4
.login-box
- %h3.page-title Sign in
- = text_field_tag :login, nil, class: "form-control top", placeholder: "Username or Email"
- = password_field_tag :password, nil, class: "form-control bottom", placeholder: "Password"
- = button_tag "Sign in", class: "btn-create btn"
+ %h3.page-title 登入
+ = text_field_tag :login, nil, class: "form-control top", placeholder: "用户名或电子邮箱"
+ = password_field_tag :password, nil, class: "form-control bottom", placeholder: "密码"
+ = button_tag "登入", class: "btn-create btn"
diff --git a/app/views/admin/appearances/show.html.haml b/app/views/admin/appearances/show.html.haml
index 089e8e4cb7a..682ccaa35bc 100644
--- a/app/views/admin/appearances/show.html.haml
+++ b/app/views/admin/appearances/show.html.haml
@@ -1,7 +1,7 @@
-- page_title "Appearance"
+- page_title "外观"
%h3.page-title
- Appearance settings
+ 外观设置
%p.light
- You can modify the look and feel of GitLab here
+ 你可以在这里修改 GitLab 的外观效果
= render 'form'
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 0350995d03d..4d4d9723b78 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -252,29 +252,29 @@
.checkbox
= f.label :akismet_enabled do
= f.check_box :akismet_enabled
- Enable Akismet
- %span.help-block#akismet_help_block Helps prevent bots from creating issues
+ 开启 Akismet
+ %span.help-block#akismet_help_block 用户阻止机器人创建问题
.form-group
= f.label :akismet_api_key, 'Akismet API Key', class: 'control-label col-sm-2'
.col-sm-10
= f.text_field :akismet_api_key, class: 'form-control'
.help-block
- Generate API key at
+ 在后面的网址生成 API 密钥(API Key):
%a{ href: 'http://www.akismet.com', target: 'blank'} http://www.akismet.com
%fieldset
- %legend Error Reporting and Logging
+ %legend 错误报告和日志
%p
- These settings require a restart to take effect.
+ 这些设置需要重启才能生效。
.form-group
.col-sm-offset-2.col-sm-10
.checkbox
= f.label :sentry_enabled do
= f.check_box :sentry_enabled
- Enable Sentry
+ 开启 Sentry
.help-block
- Sentry is an error reporting and logging tool which is currently not shipped with GitLab, get it here:
+ Sentry 是一个错误报告和日志记录工具。GitLab 当前并未自带此工具,需要在后面的网址下载并安装:
%a{ href: 'https://getsentry.com', target: '_blank' } https://getsentry.com
.form-group
@@ -283,4 +283,4 @@
= f.text_field :sentry_dsn, class: 'form-control'
.form-actions
- = f.submit 'Save', class: 'btn btn-save'
+ = f.submit '保存', class: 'btn btn-save'
diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml
index e9c7ca9d5aa..faf58aec9a2 100644
--- a/app/views/admin/application_settings/show.html.haml
+++ b/app/views/admin/application_settings/show.html.haml
@@ -1,4 +1,4 @@
-- page_title "Settings"
-%h3.page-title Settings
+- page_title "设置"
+%h3.page-title 设置
%hr
= render 'form'
diff --git a/app/views/admin/applications/_delete_form.html.haml b/app/views/admin/applications/_delete_form.html.haml
index 3147cbd659f..3a744c0c864 100644
--- a/app/views/admin/applications/_delete_form.html.haml
+++ b/app/views/admin/applications/_delete_form.html.haml
@@ -1,4 +1,4 @@
- submit_btn_css ||= 'btn btn-link btn-remove btn-sm'
= form_tag admin_application_path(application) do
%input{:name => "_method", :type => "hidden", :value => "delete"}/
- = submit_tag 'Destroy', onclick: "return confirm('Are you sure?')", class: submit_btn_css \ No newline at end of file
+ = submit_tag '销毁', onclick: "return confirm('确定要继续么?')", class: submit_btn_css \ No newline at end of file
diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml
index e18f7b499dd..f60a03c2bbc 100644
--- a/app/views/admin/applications/_form.html.haml
+++ b/app/views/admin/applications/_form.html.haml
@@ -5,22 +5,22 @@
- application.errors.full_messages.each do |msg|
%p= msg
= content_tag :div, class: 'form-group' do
- = f.label :name, class: 'col-sm-2 control-label'
+ = f.label :name, "名称", class: 'col-sm-2 control-label'
.col-sm-10
= f.text_field :name, class: 'form-control'
= doorkeeper_errors_for application, :name
= content_tag :div, class: 'form-group' do
- = f.label :redirect_uri, class: 'col-sm-2 control-label'
+ = f.label :redirect_uri, "重定向 URI", class: 'col-sm-2 control-label'
.col-sm-10
= f.text_area :redirect_uri, class: 'form-control'
= doorkeeper_errors_for application, :redirect_uri
%span.help-block
- Use one line per URI
+ 每个 URI 使用一行
- if Doorkeeper.configuration.native_redirect_uri
%span.help-block
- Use
+ 使用
%code= Doorkeeper.configuration.native_redirect_uri
- for local tests
+ 作为本地测试
.form-actions
- = f.submit 'Submit', class: "btn btn-save wide"
- = link_to "Cancel", admin_applications_path, class: "btn btn-default"
+ = f.submit '提交', class: "btn btn-save wide"
+ = link_to "取消", admin_applications_path, class: "btn btn-default"
diff --git a/app/views/admin/applications/edit.html.haml b/app/views/admin/applications/edit.html.haml
index c596866bde2..985418631c0 100644
--- a/app/views/admin/applications/edit.html.haml
+++ b/app/views/admin/applications/edit.html.haml
@@ -1,4 +1,4 @@
-- page_title "Edit", @application.name, "Applications"
-%h3.page-title Edit application
+- page_title "编辑", @application.name, "应用"
+%h3.page-title 编辑应用
- @url = admin_application_path(@application)
= render 'form', application: @application
diff --git a/app/views/admin/applications/index.html.haml b/app/views/admin/applications/index.html.haml
index f8cd98f0ec4..c72133800f2 100644
--- a/app/views/admin/applications/index.html.haml
+++ b/app/views/admin/applications/index.html.haml
@@ -1,16 +1,16 @@
-- page_title "Applications"
+- page_title "应用"
%h3.page-title
- System OAuth applications
+ 系统 OAuth 应用
%p.light
- System OAuth applications don't belong to any user and can only be managed by admins
+ 系统 OAuth 应用不属于特定的用户,只由管理员管理
%hr
-%p= link_to 'New Application', new_admin_application_path, class: 'btn btn-success'
+%p= link_to '新应用', new_admin_application_path, class: 'btn btn-success'
%table.table.table-striped
%thead
%tr
- %th Name
- %th Callback URL
- %th Clients
+ %th 名称
+ %th 回调链接
+ %th 客户端
%th
%th
%tbody.oauth-applications
@@ -19,5 +19,5 @@
%td= link_to application.name, admin_application_path(application)
%td= application.redirect_uri
%td= application.access_tokens.map(&:resource_owner_id).uniq.count
- %td= link_to 'Edit', edit_admin_application_path(application), class: 'btn btn-link'
+ %td= link_to '编辑', edit_admin_application_path(application), class: 'btn btn-link'
%td= render 'delete_form', application: application
diff --git a/app/views/admin/applications/new.html.haml b/app/views/admin/applications/new.html.haml
index 6310d89bd6b..6d9391b43e7 100644
--- a/app/views/admin/applications/new.html.haml
+++ b/app/views/admin/applications/new.html.haml
@@ -1,4 +1,4 @@
-- page_title "New Application"
-%h3.page-title New application
+- page_title "新应用"
+%h3.page-title 新应用
- @url = admin_applications_path
= render 'form', application: @application
diff --git a/app/views/admin/applications/show.html.haml b/app/views/admin/applications/show.html.haml
index 3eb9d61972b..ac94ac7fe2e 100644
--- a/app/views/admin/applications/show.html.haml
+++ b/app/views/admin/applications/show.html.haml
@@ -1,28 +1,28 @@
-- page_title @application.name, "Applications"
+- page_title @application.name, "应用"
%h3.page-title
- Application: #{@application.name}
+ 应用: #{@application.name}
.table-holder
%table.table
%tr
%td
- Application Id
+ 应用 Id
%td
%code#application_id= @application.uid
%tr
%td
- Secret:
+ 密匙:
%td
%code#secret= @application.secret
%tr
%td
- Callback url
+ 回调链接
%td
- @application.redirect_uri.split.each do |uri|
%div
%span.monospace= uri
.form-actions
- = link_to 'Edit', edit_admin_application_path(@application), class: 'btn btn-primary wide pull-left'
+ = link_to '编辑', edit_admin_application_path(@application), class: 'btn btn-primary wide pull-left'
= render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger prepend-left-10'
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml
index de5bc050cf0..f2ee1482662 100644
--- a/app/views/admin/background_jobs/show.html.haml
+++ b/app/views/admin/background_jobs/show.html.haml
@@ -1,16 +1,16 @@
-- page_title "Background Jobs"
-%h3.page-title Background Jobs
-%p.light GitLab uses #{link_to "sidekiq", "http://sidekiq.org/"} library for async job processing
+- page_title "后台作业"
+%h3.page-title 后台作业
+%p.light GitLab 使用 #{link_to "sidekiq", "http://sidekiq.org/"} 库同步作业处理
%hr
.panel.panel-default
- .panel-heading Sidekiq running processes
+ .panel-heading Sidekiq 运行进程
.panel-body
- if @sidekiq_processes.empty?
%h4.cred
%i.fa.fa-exclamation-triangle
- There are no running sidekiq processes. Please restart GitLab
+ 没有运行的 sidekiq 进程,请重新启动 GitLab
- else
.table-holder
%table.table
@@ -35,10 +35,10 @@
.clearfix
%p
%i.fa.fa-exclamation-circle
- If '[25 of 25 busy]' is shown, restart GitLab with 'sudo service gitlab reload'.
+ 如果显示 '[25 of 25 busy]' 请使用 'sudo service gitlab reload' 重新启动 GitLab。
%p
%i.fa.fa-exclamation-circle
- If more than one sidekiq process is listed, stop GitLab, kill the remaining sidekiq processes (sudo pkill -u #{gitlab_config.user} -f sidekiq) and restart GitLab.
+ 如果列出超过一个 sidekiq 进程,请停止 GitLab,杀死剩余的 sidekiq 进程 (sudo pkill -u #{Settings.gitlab.user} -f sidekiq),然后重新启动 GitLab。
diff --git a/app/views/admin/broadcast_messages/edit.html.haml b/app/views/admin/broadcast_messages/edit.html.haml
index 45e053eb31d..f5482bd3a89 100644
--- a/app/views/admin/broadcast_messages/edit.html.haml
+++ b/app/views/admin/broadcast_messages/edit.html.haml
@@ -1,3 +1,3 @@
-- page_title "Broadcast Messages"
+- page_title "广播信息"
= render 'form'
diff --git a/app/views/admin/broadcast_messages/index.html.haml b/app/views/admin/broadcast_messages/index.html.haml
index c05538a393c..dd9fe805820 100644
--- a/app/views/admin/broadcast_messages/index.html.haml
+++ b/app/views/admin/broadcast_messages/index.html.haml
@@ -1,10 +1,9 @@
-- page_title "Broadcast Messages"
+- page_title "广播信息"
%h3.page-title
- Broadcast Messages
+ 广播信息
%p.light
- Broadcast messages are displayed for every user and can be used to notify
- users about scheduled maintenance, recent upgrades and more.
+ 广播信息会显示给所有用户,可以用于通知用户系统定期维护、近期计划升级等信息。
= render 'form'
@@ -14,10 +13,10 @@
%table.table
%thead
%tr
- %th Status
- %th Preview
- %th Starts
- %th Ends
+ %th 状态
+ %th 预览
+ %th 开始
+ %th 结束
%th  
%tbody
- @broadcast_messages.each do |message|
@@ -31,7 +30,7 @@
%td
= message.ends_at
%td
- = link_to icon('pencil-square-o'), edit_admin_broadcast_message_path(message), title: 'Edit', class: 'btn btn-xs'
- = link_to icon('times'), admin_broadcast_message_path(message), method: :delete, remote: true, title: 'Remove', class: 'js-remove-tr btn btn-xs btn-danger'
+ = link_to icon('pencil-square-o'), edit_admin_broadcast_message_path(message), title: '编辑', class: 'btn btn-xs'
+ = link_to icon('times'), admin_broadcast_message_path(message), method: :delete, remote: true, title: '删除', class: 'js-remove-tr btn btn-xs btn-danger'
= paginate @broadcast_messages, theme: 'gitlab'
diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml
index 588ad767426..6e254a50c2b 100644
--- a/app/views/admin/builds/_build.html.haml
+++ b/app/views/admin/builds/_build.html.haml
@@ -41,9 +41,9 @@
%span.label.label-primary
= tag
- if build.try(:trigger_request)
- %span.label.label-info triggered
+ %span.label.label-info 被触发
- if build.try(:allow_failure)
- %span.label.label-danger allowed to fail
+ %span.label.label-danger 允许失败
%td.duration
- if build.duration
diff --git a/app/views/admin/builds/index.html.haml b/app/views/admin/builds/index.html.haml
index 5931efdefe6..5ee960d2348 100644
--- a/app/views/admin/builds/index.html.haml
+++ b/app/views/admin/builds/index.html.haml
@@ -2,44 +2,44 @@
%ul.nav-links
%li{class: ('active' if @scope.nil?)}
= link_to admin_builds_path do
- All
+ 所有
%span.badge.js-totalbuilds-count= @all_builds.count(:id)
%li{class: ('active' if @scope == 'running')}
= link_to admin_builds_path(scope: :running) do
- Running
+ 正在运行
%span.badge.js-running-count= number_with_delimiter(@all_builds.running_or_pending.count(:id))
%li{class: ('active' if @scope == 'finished')}
= link_to admin_builds_path(scope: :finished) do
- Finished
+ 已结束
%span.badge.js-running-count= number_with_delimiter(@all_builds.finished.count(:id))
.nav-controls
- if @all_builds.running_or_pending.any?
- = link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
+ = link_to '取消所有', cancel_all_admin_builds_path, data: { confirm: '确定要继续么?' }, class: 'btn btn-danger', method: :post
.gray-content-block.second-block
- #{(@scope || 'running').capitalize} builds
+ #{(@scope || 'running').capitalize} 的构建
%ul.content-list
- if @builds.blank?
%li
- .nothing-here-block No builds to show
+ .nothing-here-block 没有构建显示
- else
.table-holder
%table.table.builds
%thead
%tr
- %th Status
- %th Build ID
- %th Project
- %th Commit
- %th Ref
+ %th 状态
+ %th 构建 ID
+ %th 项目
+ %th 提交
+ %th 参考
%th Runner
- %th Name
- %th Duration
- %th Finished at
+ %th 名称
+ %th 运行时间
+ %th 结束时间
%th
- @builds.each do |build|
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 3274ba5377b..23645abab1d 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -1,46 +1,46 @@
.admin-dashboard
.row
.col-md-4
- %h4 Statistics
+ %h4 统计
%hr
%p
- Forks
+ 派生
%span.light.pull-right
= number_with_delimiter(ForkedProjectLink.count)
%p
- Issues
+ 问题
%span.light.pull-right
= number_with_delimiter(Issue.count)
%p
- Merge Requests
+ 合并请求
%span.light.pull-right
= number_with_delimiter(MergeRequest.count)
%p
- Notes
+ 笔记
%span.light.pull-right
= number_with_delimiter(Note.count)
%p
- Snippets
+ 代码片段
%span.light.pull-right
= number_with_delimiter(Snippet.count)
%p
- SSH Keys
+ SSH 密钥
%span.light.pull-right
= number_with_delimiter(Key.count)
%p
- Milestones
+ 里程碑
%span.light.pull-right
= number_with_delimiter(Milestone.count)
%p
- Active Users
+ 活跃用户
%span.light.pull-right
= number_with_delimiter(User.active.count)
.col-md-4
%h4
- Features
+ 功能
%hr
%p
- Sign up
+ 注册
%span.light.pull-right
= boolean_to_icon signup_enabled?
%p
@@ -48,7 +48,7 @@
%span.light.pull-right
= boolean_to_icon Gitlab.config.ldap.enabled
%p
- Gravatar
+ 头像
%span.light.pull-right
= boolean_to_icon gravatar_enabled?
%p
@@ -56,12 +56,12 @@
%span.light.pull-right
= boolean_to_icon Gitlab.config.omniauth.enabled
%p
- Reply by email
+ 电子邮件回复
%span.light.pull-right
= boolean_to_icon Gitlab::IncomingEmail.enabled?
.col-md-4
%h4
- Components
+ 组件
- if current_application_settings.version_check_enabled
.pull-right
= version_status_badge
@@ -101,32 +101,32 @@
.row
.col-sm-4
.light-well
- %h4 Projects
+ %h4 项目
.data
= link_to admin_namespaces_projects_path do
%h1= number_with_delimiter(Project.count)
%hr
- = link_to('New Project', new_project_path, class: "btn btn-new")
+ = link_to('新项目', new_project_path, class: "btn btn-new")
.col-sm-4
.light-well
- %h4 Users
+ %h4 用户
.data
= link_to admin_users_path do
%h1= number_with_delimiter(User.count)
%hr
- = link_to 'New User', new_admin_user_path, class: "btn btn-new"
+ = link_to '新用户', new_admin_user_path, class: "btn btn-new"
.col-sm-4
.light-well
- %h4 Groups
+ %h4 群组
.data
= link_to admin_groups_path do
%h1= number_with_delimiter(Group.count)
%hr
- = link_to 'New Group', new_admin_group_path, class: "btn btn-new"
+ = link_to '新群组', new_admin_group_path, class: "btn btn-new"
.row.prepend-top-10
.col-md-4
- %h4 Latest projects
+ %h4 最近项目
%hr
- @projects.each do |project|
%p
@@ -135,7 +135,7 @@
#{time_ago_with_tooltip(project.created_at)}
.col-md-4
- %h4 Latest users
+ %h4 最近用户
%hr
- @users.each do |user|
%p
@@ -145,7 +145,7 @@
#{time_ago_with_tooltip(user.created_at)}
.col-md-4
- %h4 Latest groups
+ %h4 最近群组
%hr
- @groups.each do |group|
%p
diff --git a/app/views/admin/deploy_keys/index.html.haml b/app/views/admin/deploy_keys/index.html.haml
index 41c43899978..6bd1ddeb965 100644
--- a/app/views/admin/deploy_keys/index.html.haml
+++ b/app/views/admin/deploy_keys/index.html.haml
@@ -1,17 +1,17 @@
-- page_title "Deploy Keys"
+- page_title "部署密钥"
.panel.panel-default
.panel-heading
- Public deploy keys (#{@deploy_keys.count})
+ 公开的部署密钥 (#{@deploy_keys.count})
.controls
- = link_to 'New Deploy Key', new_admin_deploy_key_path, class: "btn btn-new btn-sm"
+ = link_to '新部署密钥', new_admin_deploy_key_path, class: "btn btn-new btn-sm"
- if @deploy_keys.any?
.table-holder
%table.table
%thead.panel-heading
%tr
- %th Title
- %th Fingerprint
- %th Added at
+ %th 标题
+ %th 指纹
+ %th 增加时间
%th
%tbody
- @deploy_keys.each do |deploy_key|
@@ -22,6 +22,6 @@
%code.key-fingerprint= deploy_key.fingerprint
%td
%span.cgray
- added #{time_ago_with_tooltip(deploy_key.created_at)}
+ 增加时间 #{time_ago_with_tooltip(deploy_key.created_at)}
%td
- = link_to 'Remove', admin_deploy_key_path(deploy_key), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-sm btn-remove delete-key pull-right"
+ = link_to '删除', admin_deploy_key_path(deploy_key), data: { confirm: '确定要继续么?'}, method: :delete, class: "btn btn-sm btn-remove delete-key pull-right"
diff --git a/app/views/admin/deploy_keys/new.html.haml b/app/views/admin/deploy_keys/new.html.haml
index 5b46b3222a9..d052df27bf1 100644
--- a/app/views/admin/deploy_keys/new.html.haml
+++ b/app/views/admin/deploy_keys/new.html.haml
@@ -1,5 +1,5 @@
-- page_title "New Deploy Key"
-%h3.page-title New public deploy key
+- page_title "新部署密钥"
+%h3.page-title 新的公开的部署密钥
%hr
%div
@@ -11,17 +11,17 @@
%li= msg
.form-group
- = f.label :title, class: "control-label"
+ = f.label :title, "标题", class: "control-label"
.col-sm-10= f.text_field :title, class: 'form-control'
.form-group
- = f.label :key, class: "control-label"
+ = f.label :key, "密钥", class: "control-label"
.col-sm-10
%p.light
- Paste a machine public key here. Read more about how to generate it
- = link_to "here", help_page_path("ssh", "README")
+ 在这里粘贴机器公钥。如何生成密钥请点击
+ = link_to "这里", help_page_path("ssh", "README")
= f.text_area :key, class: "form-control thin_area", rows: 5
.form-actions
- = f.submit 'Create', class: "btn-create btn"
- = link_to "Cancel", admin_deploy_keys_path, class: "btn btn-cancel"
+ = f.submit '创建', class: "btn-create btn"
+ = link_to "取消", admin_deploy_keys_path, class: "btn btn-cancel"
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml
index 7f2b1cd235d..7534b04c7ba 100644
--- a/app/views/admin/groups/_form.html.haml
+++ b/app/views/admin/groups/_form.html.haml
@@ -6,7 +6,7 @@
= render 'shared/group_form', f: f
.form-group.group-description-holder
- = f.label :avatar, "Group avatar", class: 'control-label'
+ = f.label :avatar, "群组头像", class: 'control-label'
.col-sm-10
= render 'shared/choose_group_avatar_button', f: f
@@ -18,10 +18,10 @@
.alert.alert-info
= render 'shared/group_tips'
.form-actions
- = f.submit 'Create group', class: "btn btn-create"
- = link_to 'Cancel', admin_groups_path, class: "btn btn-cancel"
+ = f.submit '创建群组', class: "btn btn-create"
+ = link_to '取消', admin_groups_path, class: "btn btn-cancel"
- else
.form-actions
- = f.submit 'Save changes', class: "btn btn-save"
- = link_to 'Cancel', admin_group_path(@group), class: "btn btn-cancel"
+ = f.submit '保存修改', class: "btn btn-save"
+ = link_to '取消', admin_group_path(@group), class: "btn btn-cancel"
diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml
index eb09a6328ed..26f51d1ce11 100644
--- a/app/views/admin/groups/edit.html.haml
+++ b/app/views/admin/groups/edit.html.haml
@@ -1,4 +1,4 @@
-- page_title "Edit", @group.name, "Groups"
-%h3.page-title Edit group: #{@group.name}
+- page_title "编辑", @group.name, "群组"
+%h3.page-title 编辑群组:#{@group.name}
%hr
= render 'form'
diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml
index 6bdc885a312..d47460cecb9 100644
--- a/app/views/admin/groups/index.html.haml
+++ b/app/views/admin/groups/index.html.haml
@@ -1,18 +1,17 @@
-- page_title "Groups"
+- page_title "群组"
%h3.page-title
- Groups (#{number_with_delimiter(@groups.total_count)})
- = link_to 'New Group', new_admin_group_path, class: "btn btn-new pull-right"
+ 群组 (#{number_with_delimiter(@groups.total_count)})
+ = link_to '新群组', new_admin_group_path, class: "btn btn-new pull-right"
%p.light
- Group allows you to keep projects organized.
- Use groups for uniting related projects.
+ 群组用于管理有组织的关联项目。
%hr
= form_tag admin_groups_path, method: :get, class: 'form-inline' do
= hidden_field_tag :sort, @sort
.form-group
= text_field_tag :name, params[:name], class: "form-control"
- = button_tag "Search", class: "btn submit btn-primary"
+ = button_tag "搜索", class: "btn submit btn-primary"
.pull-right
.dropdown.inline
@@ -41,8 +40,8 @@
%li
.clearfix
.pull-right.prepend-top-10
- = link_to 'Edit', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn btn-sm"
- = link_to 'Destroy', [:admin, group], data: {confirm: "REMOVE #{group.name}? Are you sure?"}, method: :delete, class: "btn btn-sm btn-remove"
+ = link_to '编辑', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn btn-sm"
+ = link_to '销毁', [:admin, group], data: {confirm: "确定要删除 #{group.name}?"}, method: :delete, class: "btn btn-sm btn-remove"
%h4
= link_to [:admin, group] do
@@ -60,7 +59,7 @@
= truncate group.description, length: 150
.clearfix
%p.light
- #{pluralize(group.members.size, 'member')}, #{pluralize(group.projects.count, 'project')}
+ #{pluralize(group.members.size, '个用户', '个用户')}, #{pluralize(group.projects.count, '个项目', '个项目')}
= paginate @groups, theme: "gitlab"
diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml
index c81ee552ac3..86a84a9167a 100644
--- a/app/views/admin/groups/new.html.haml
+++ b/app/views/admin/groups/new.html.haml
@@ -1,4 +1,4 @@
-- page_title "New Group"
-%h3.page-title New group
+- page_title "新群组"
+%h3.page-title 新群组
%hr
= render 'form'
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index f309e80a39a..1693e3afa63 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -75,11 +75,12 @@
- if can?(current_user, :admin_group_member, @group)
.panel.panel-default
.panel-heading
- Add user(s) to the group:
+ 增加用户到群组:
.panel-body.form-holder
%p.light
- Read more about project permissions
- %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
+ 关于项目的权限点击
+ %strong= link_to "这里", help_page_path("permissions", "permissions"), class: "vlink"
+ 了解更多信息
= form_tag members_update_admin_group_path(@group), id: "new_project_member", class: "bulk_import", method: :put do
%div
@@ -87,11 +88,11 @@
%div.prepend-top-10
= select_tag :access_level, options_for_select(GroupMember.access_level_roles), class: "project-access-select select2"
%hr
- = button_tag 'Add users to group', class: "btn btn-create"
+ = button_tag '增加用户到群组', class: "btn btn-create"
.panel.panel-default
.panel-heading
%h3.panel-title
- Members
+ 成员
%span.badge
#{@group.group_members.count}
%ul.well-list.group-users-list
@@ -105,11 +106,11 @@
- else
%strong
= member.invite_email
- (invited)
+ (已邀请)
%span.pull-right.light
= member.human_access
- if can?(current_user, :destroy_group_member, member)
- = link_to group_group_member_path(@group, member), data: { confirm: remove_user_from_group_message(@group, member) }, method: :delete, remote: true, class: "btn-xs btn btn-remove", title: 'Remove user from group' do
+ = link_to group_group_member_path(@group, member), data: { confirm: remove_user_from_group_message(@group, member) }, method: :delete, remote: true, class: "btn-xs btn btn-remove", title: '从群组中删除用户' do
%i.fa.fa-minus.fa-inverse
.panel-footer
= paginate @members, param_name: 'members_page', theme: 'gitlab'
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index 53b3cd04c68..322b9989f2e 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -1,10 +1,9 @@
-- page_title "System Hooks"
+- page_title "系统钩子"
%h3.page-title
- System hooks
+ 系统钩子
%p.light
- #{link_to "System hooks ", help_page_path("system_hooks", "system_hooks"), class: "vlink"} can be
- used for binding events when GitLab creates a User or Project.
+ #{link_to "系统钩子", help_page_path("system_hooks", "system_hooks"), class: "vlink"}可以绑定例如 Git 版本创建用户或项目的事件。
%hr
@@ -15,31 +14,31 @@
- @hook.errors.full_messages.each do |msg|
%p= msg
.form-group
- = f.label :url, "URL:", class: 'control-label'
+ = f.label :url, "链接:", class: 'control-label'
.col-sm-10
= f.text_field :url, class: "form-control"
.form-group
- = f.label :enable_ssl_verification, "SSL verification", class: 'control-label checkbox'
+ = f.label :enable_ssl_verification, "SSL 验证证书", class: 'control-label checkbox'
.col-sm-10
.checkbox
= f.label :enable_ssl_verification do
= f.check_box :enable_ssl_verification
- %strong Enable SSL verification
+ %strong 启用 SSL 验证证书
.form-actions
- = f.submit "Add System Hook", class: "btn btn-create"
+ = f.submit "增加系统钩子", class: "btn btn-create"
%hr
-if @hooks.any?
.panel.panel-default
.panel-heading
- System hooks (#{@hooks.count})
+ 系统钩子 (#{@hooks.count})
%ul.well-list
- @hooks.each do |hook|
%li
.list-item-name
%strong= hook.url
- %p SSL Verification: #{hook.enable_ssl_verification ? "enabled" : "disabled"}
+ %p SSL 验证证书: #{hook.enable_ssl_verification ? "已启用" : "已禁用"}
.pull-right
- = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-sm"
- = link_to 'Remove', admin_hook_path(hook), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-remove btn-sm"
+ = link_to '测试钩子', admin_hook_test_path(hook), class: "btn btn-sm"
+ = link_to '删除', admin_hook_path(hook), data: { confirm: '确定要继续么?' }, method: :delete, class: "btn btn-remove btn-sm"
diff --git a/app/views/admin/identities/_form.html.haml b/app/views/admin/identities/_form.html.haml
index 3a788558226..b2ef274064d 100644
--- a/app/views/admin/identities/_form.html.haml
+++ b/app/views/admin/identities/_form.html.haml
@@ -6,15 +6,15 @@
%p= msg
.form-group
- = f.label :provider, class: 'control-label'
+ = f.label :provider, "提供者", class: 'control-label'
.col-sm-10
- values = Gitlab::OAuth::Provider.providers.map { |name| ["#{Gitlab::OAuth::Provider.label_for(name)} (#{name})", name] }
= f.select :provider, values, { allow_blank: false }, class: 'form-control'
.form-group
- = f.label :extern_uid, "Identifier", class: 'control-label'
+ = f.label :extern_uid, "身份", class: 'control-label'
.col-sm-10
= f.text_field :extern_uid, class: 'form-control', required: true
.form-actions
- = f.submit 'Save changes', class: "btn btn-save"
+ = f.submit '保存修改', class: "btn btn-save"
diff --git a/app/views/admin/identities/_identity.html.haml b/app/views/admin/identities/_identity.html.haml
index 7362d904b94..9bf0146de6e 100644
--- a/app/views/admin/identities/_identity.html.haml
+++ b/app/views/admin/identities/_identity.html.haml
@@ -5,8 +5,8 @@
= identity.extern_uid
%td
= link_to edit_admin_user_identity_path(@user, identity), class: 'btn btn-xs btn-grouped' do
- Edit
+ 编辑
= link_to [:admin, @user, identity], method: :delete,
class: 'btn btn-xs btn-danger',
- data: { confirm: "Are you sure you want to remove this identity?" } do
- Delete
+ data: { confirm: "确定要删除此身份么?" } do
+ 删除
diff --git a/app/views/admin/identities/edit.html.haml b/app/views/admin/identities/edit.html.haml
index 515d46b0f29..e5747397c8c 100644
--- a/app/views/admin/identities/edit.html.haml
+++ b/app/views/admin/identities/edit.html.haml
@@ -1,6 +1,6 @@
-- page_title "Edit", @identity.provider, "Identities", @user.name, "Users"
+- page_title "编辑", @identity.provider, "身份", @user.name, "用户"
%h3.page-title
- Edit identity for #{@user.name}
+ 编辑 #{@user.name} 的身份
%hr
= render 'form'
diff --git a/app/views/admin/identities/index.html.haml b/app/views/admin/identities/index.html.haml
index 741d111fb7d..c764cf01100 100644
--- a/app/views/admin/identities/index.html.haml
+++ b/app/views/admin/identities/index.html.haml
@@ -1,15 +1,15 @@
-- page_title "Identities", @user.name, "Users"
+- page_title "身份", @user.name, "用户"
= render 'admin/users/head'
-= link_to 'New Identity', new_admin_user_identity_path, class: 'pull-right btn btn-new'
+= link_to '新身份', new_admin_user_identity_path, class: 'pull-right btn btn-new'
- if @identities.present?
.table-holder
%table.table
%thead
%tr
- %th Provider
- %th Identifier
+ %th 提供者
+ %th 身份
%th
= render @identities
- else
- %h4 This user has no identities
+ %h4 此用户没有任何身份
diff --git a/app/views/admin/identities/new.html.haml b/app/views/admin/identities/new.html.haml
index e30bf0ef0ee..64192db74d7 100644
--- a/app/views/admin/identities/new.html.haml
+++ b/app/views/admin/identities/new.html.haml
@@ -1,4 +1,4 @@
-- page_title "New Identity"
-%h3.page-title New identity
+- page_title "新身份"
+%h3.page-title 新身份
%hr
= render 'form'
diff --git a/app/views/admin/keys/show.html.haml b/app/views/admin/keys/show.html.haml
index 9ee77c77398..84403edd2ee 100644
--- a/app/views/admin/keys/show.html.haml
+++ b/app/views/admin/keys/show.html.haml
@@ -1,2 +1,2 @@
-- page_title @key.title, "Keys"
+- page_title @key.title, "密钥"
= render "profiles/keys/key_details", admin: true
diff --git a/app/views/admin/labels/_form.html.haml b/app/views/admin/labels/_form.html.haml
index 8c6b389bf15..49d921725f9 100644
--- a/app/views/admin/labels/_form.html.haml
+++ b/app/views/admin/labels/_form.html.haml
@@ -8,23 +8,23 @@
%br
.form-group
- = f.label :title, class: 'control-label'
+ = f.label :title, "标题", class: 'control-label'
.col-sm-10
= f.text_field :title, class: "form-control", required: true
.form-group
- = f.label :description, class: 'control-label'
+ = f.label :description, "描述", class: 'control-label'
.col-sm-10
= f.text_field :description, class: "form-control js-quick-submit"
.form-group
- = f.label :color, "Background color", class: 'control-label'
+ = f.label :color, "背景颜色", class: 'control-label'
.col-sm-10
.input-group
.input-group-addon.label-color-preview  
= f.color_field :color, class: "form-control"
.help-block
- Choose any color.
+ 选择任意颜色。
%br
- Or you can choose one of suggested colors below
+ 或者在下方选择推荐的颜色
.suggest-colors
- suggested_colors.each do |color|
@@ -32,8 +32,8 @@
 
.form-actions
- = f.submit 'Save', class: 'btn btn-save js-save-button'
- = link_to "Cancel", admin_labels_path, class: 'btn btn-cancel'
+ = f.submit '保存', class: 'btn btn-save js-save-button'
+ = link_to "取消", admin_labels_path, class: 'btn btn-cancel'
:javascript
new Labels();
diff --git a/app/views/admin/labels/edit.html.haml b/app/views/admin/labels/edit.html.haml
index 309aedceded..7dfff96999b 100644
--- a/app/views/admin/labels/edit.html.haml
+++ b/app/views/admin/labels/edit.html.haml
@@ -1,5 +1,5 @@
-- page_title "Edit", @label.name, "Labels"
+- page_title "编辑", @label.name, "标记"
%h3.page-title
- Edit Label
+ 编辑标记
%hr
= render 'form'
diff --git a/app/views/admin/labels/index.html.haml b/app/views/admin/labels/index.html.haml
index 3c57e3dc174..266a1bf9328 100644
--- a/app/views/admin/labels/index.html.haml
+++ b/app/views/admin/labels/index.html.haml
@@ -1,8 +1,8 @@
-- page_title "Labels"
+- page_title "标记"
= link_to new_admin_label_path, class: "pull-right btn btn-nr btn-new" do
- New label
+ 新标记
%h3.page-title
- Labels
+ 标记
%hr
.labels
@@ -12,5 +12,5 @@
= paginate @labels, theme: 'gitlab'
- else
.light-well
- .nothing-here-block There are no labels yet
+ .nothing-here-block 还没有标记
diff --git a/app/views/admin/labels/new.html.haml b/app/views/admin/labels/new.html.haml
index 0135ad0723d..14c8a954b18 100644
--- a/app/views/admin/labels/new.html.haml
+++ b/app/views/admin/labels/new.html.haml
@@ -1,5 +1,5 @@
-- page_title "New Label"
+- page_title "新标记"
%h3.page-title
- New Label
+ 新标记
%hr
= render 'form'
diff --git a/app/views/admin/logs/show.html.haml b/app/views/admin/logs/show.html.haml
index af9fdeb0734..e1ac4a7b4f8 100644
--- a/app/views/admin/logs/show.html.haml
+++ b/app/views/admin/logs/show.html.haml
@@ -1,4 +1,4 @@
-- page_title "Logs"
+- page_title "日志"
- loggers = [Gitlab::GitLogger, Gitlab::AppLogger,
Gitlab::ProductionLogger, Gitlab::SidekiqLogger]
%ul.nav-links.log-tabs
@@ -7,7 +7,7 @@
= link_to klass::file_name, "##{klass::file_name_noext}",
'data-toggle' => 'tab'
.gray-content-block
- To prevent performance issues admin logs output the last 2000 lines
+ 为了防止性能问题管理日志只输出最后的 2000 行
.tab-content
- loggers.each do |klass|
.tab-pane{ class: (klass == Gitlab::GitLogger ? 'active' : ''),
@@ -19,7 +19,7 @@
.pull-right
= link_to '#', class: 'log-bottom' do
%i.fa.fa-arrow-down
- Scroll down
+ 向下滚动
.file-content.logs
%ol
- klass.read_latest.each do |line|
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index d39c0f44031..a9b56541b7b 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -1,4 +1,4 @@
-- page_title "Projects"
+- page_title "项目"
= render 'shared/show_aside'
.row.prepend-top-default
@@ -6,30 +6,30 @@
.admin-filter
= form_tag admin_namespaces_projects_path, method: :get, class: '' do
.form-group
- = label_tag :name, 'Name:'
+ = label_tag :name, '名称:'
= text_field_tag :name, params[:name], class: "form-control"
.form-group
- = label_tag :namespace_id, "Namespace"
+ = label_tag :namespace_id, "命名空间"
= namespace_select_tag :namespace_id, selected: params[:namespace_id], class: 'input-large'
.form-group
- %strong Activity
+ %strong 活动
.checkbox
= label_tag :with_push do
= check_box_tag :with_push, 1, params[:with_push]
- %span Projects with push events
+ %span 项目有推送事件
.checkbox
= label_tag :abandoned do
= check_box_tag :abandoned, 1, params[:abandoned]
- %span No activity over 6 month
+ %span 6 个月不再活动
.checkbox
= label_tag :with_archived do
= check_box_tag :with_archived, 1, params[:with_archived]
- %span Show archived projects
+ %span 显示已归档项目
%fieldset
- %strong Visibility level:
+ %strong 可见等级:
.visibility-levels
- Project.visibility_levels.each do |label, level|
.checkbox
@@ -40,13 +40,13 @@
= label
%hr
= hidden_field_tag :sort, params[:sort]
- = button_tag "Search", class: "btn submit btn-primary"
- = link_to "Reset", admin_namespaces_projects_path, class: "btn btn-cancel"
+ = button_tag "搜索", class: "btn submit btn-primary"
+ = link_to "重置", admin_namespaces_projects_path, class: "btn btn-cancel"
%section.col-md-9
.panel.panel-default
.panel-heading
- Projects (#{@projects.total_count})
+ 项目 (#{@projects.total_count})
.controls
.dropdown.inline
%button.dropdown-toggle.btn.btn-sm{type: 'button', 'data-toggle' => 'dropdown'}
@@ -68,7 +68,7 @@
= sort_title_oldest_updated
= link_to admin_namespaces_projects_path(sort: sort_value_largest_repo) do
= sort_title_largest_repo
- = link_to 'New Project', new_project_path, class: "btn btn-sm btn-success"
+ = link_to '新项目', new_project_path, class: "btn btn-sm btn-success"
%ul.well-list
- @projects.each do |project|
%li
@@ -81,8 +81,8 @@
%span.label.label-warning archived
%span.label.label-gray
= repository_size(project)
- = link_to 'Edit', edit_namespace_project_path(project.namespace, project), id: "edit_#{dom_id(project)}", class: "btn btn-sm"
- = link_to 'Destroy', [project.namespace.becomes(Namespace), project], data: { confirm: remove_project_message(project) }, method: :delete, class: "btn btn-sm btn-remove"
+ = link_to '编辑', edit_namespace_project_path(project.namespace, project), id: "edit_#{dom_id(project)}", class: "btn btn-sm"
+ = link_to '销毁', [project.namespace.becomes(Namespace), project], data: { confirm: remove_project_message(project) }, method: :delete, class: "btn btn-sm btn-remove"
- if @projects.blank?
.nothing-here-block 0 projects matches
= paginate @projects, theme: "gitlab"
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index c638c32a654..2585f957bf7 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -1,42 +1,42 @@
-- page_title @project.name_with_namespace, "Projects"
+- page_title @project.name_with_namespace, "项目"
%h3.page-title
- Project: #{@project.name_with_namespace}
+ 项目:#{@project.name_with_namespace}
= link_to edit_project_path(@project), class: "btn btn-nr pull-right" do
%i.fa.fa-pencil-square-o
- Edit
+ 编辑
%hr
.row
.col-md-6
.panel.panel-default
.panel-heading
- Project info:
+ 项目信息:
%ul.well-list
%li
- %span.light Name:
+ %span.light 名称:
%strong
= link_to @project.name, project_path(@project)
%li
- %span.light Namespace:
+ %span.light 命名空间:
%strong
- if @project.namespace
= link_to @project.namespace.human_name, [:admin, @project.group || @project.owner]
- else
- Global
+ 全局
%li
- %span.light Owned by:
+ %span.light 所有者:
%strong
- if @project.owner
= link_to @project.owner_name, [:admin, @project.owner]
- else
- (deleted)
+ (已删除)
%li
- %span.light Created by:
+ %span.light 创建者:
%strong
- = @project.creator.try(:name) || '(deleted)'
+ = @project.creator.try(:name) || '(已删除)'
%li
- %span.light Created on:
+ %span.light 创建时间:
%strong
= @project.created_at.to_s(:medium)
@@ -83,24 +83,24 @@
.panel.panel-default
.panel-heading
- Transfer project
+ 转移项目
.panel-body
= form_for @project, url: transfer_admin_namespace_project_path(@project.namespace, @project), method: :put, html: { class: 'form-horizontal' } do |f|
.form-group
- = f.label :new_namespace_id, "Namespace", class: 'control-label'
+ = f.label :new_namespace_id, "命名空间", class: 'control-label'
.col-sm-10
= namespace_select_tag :new_namespace_id, selected: params[:namespace_id], class: 'input-large'
.form-group
.col-sm-offset-2.col-sm-10
- = f.submit 'Transfer', class: 'btn btn-primary'
+ = f.submit '转移', class: 'btn btn-primary'
.col-md-6
- if @group
.panel.panel-default
.panel-heading
%strong #{@group.name}
- group members (#{@group.group_members.count})
+ 群组成员 (#{@group.group_members.count})
.pull-right
= link_to admin_group_path(@group), class: 'btn btn-xs' do
%i.fa.fa-pencil-square-o
@@ -112,13 +112,13 @@
.panel.panel-default
.panel-heading
- Project members
+ 项目成员
%small
(#{@project.users.count})
.pull-right
= link_to namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-xs" do
%i.fa.fa-pencil-square-o
- Manage Access
+ 管理权限
%ul.well-list.project_members
- @project_members.each do |project_member|
- user = project_member.user
@@ -133,7 +133,7 @@
(invited)
.pull-right
- if project_member.owner?
- %span.light Owner
+ %span.light 所有者
- else
%span.light= project_member.human_access
= link_to namespace_project_project_member_path(@project.namespace, @project, project_member), data: { confirm: remove_from_project_team_message(@project, project_member)}, method: :delete, remote: true, class: "btn btn-sm btn-remove" do
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml
index 6745e58deca..3344b24afaf 100644
--- a/app/views/admin/runners/_runner.html.haml
+++ b/app/views/admin/runners/_runner.html.haml
@@ -1,11 +1,11 @@
%tr{id: dom_id(runner)}
%td
- if runner.shared?
- %span.label.label-success shared
+ %span.label.label-success 共享的
- else
- %span.label.label-info specific
+ %span.label.label-info 特定的
- unless runner.active?
- %span.label.label-danger paused
+ %span.label.label-danger 暂停的
%td
= link_to admin_runner_path(runner) do
@@ -13,13 +13,13 @@
%td
.runner-description
= runner.description
- %span (#{link_to 'edit', '#', class: 'edit-runner-link'})
+ %span (#{link_to '编辑', '#', class: 'edit-runner-link'})
.runner-description-form.hide
= form_for [:admin, runner], remote: true, html: { class: 'form-inline' } do |f|
.form-group
= f.text_field :description, class: 'form-control'
- = f.submit 'Save', class: 'btn'
- %span (#{link_to 'cancel', '#', class: 'cancel'})
+ = f.submit '保存', class: 'btn'
+ %span (#{link_to '取消', '#', class: 'cancel'})
%td
- if runner.shared?
\-
@@ -33,16 +33,16 @@
= tag
%td
- if runner.contacted_at
- #{time_ago_in_words(runner.contacted_at)} ago
+ #{time_ago_in_words(runner.contacted_at)}之前
- else
- Never
+ 从未
%td
.pull-right
- = link_to 'Edit', admin_runner_path(runner), class: 'btn btn-sm'
+ = link_to '编辑', admin_runner_path(runner), class: 'btn btn-sm'
 
- if runner.active?
- = link_to 'Pause', [:pause, :admin, runner], data: { confirm: "Are you sure?" }, method: :get, class: 'btn btn-danger btn-sm'
+ = link_to '暂停', [:pause, :admin, runner], data: { confirm: "确定要继续么?" }, method: :get, class: 'btn btn-danger btn-sm'
- else
- = link_to 'Resume', [:resume, :admin, runner], method: :get, class: 'btn btn-success btn-sm'
- = link_to 'Remove', [:admin, runner], data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm'
+ = link_to '继续', [:resume, :admin, runner], method: :get, class: 'btn btn-success btn-sm'
+ = link_to '删除', [:admin, runner], data: { confirm: "确定要继续么?" }, method: :delete, class: 'btn btn-danger btn-sm'
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index c407972cd08..61432db43c9 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -1,51 +1,51 @@
%p.lead
%span
- To register a new runner you should enter the following registration token.
- With this token the runner will request a unique runner token and use that for future communication.
- Registration token is
+ 要注册新的 runner 你需要输入后面的注册授权码。
+ Runner 将使用这个唯一授权码来标识自己,并使用它和服务器通信。
+ 注册授权码是
%code{ id: 'runners-token' } #{current_application_settings.runners_registration_token}
.bs-callout.clearfix
.pull-left
%p
- You can reset runners registration token by pressing a button below.
+ 你可以点击下面的按钮重置 runner 的注册授权码。
%p
= button_to reset_runners_token_admin_application_settings_path,
method: :put, class: 'btn btn-default',
- data: { confirm: 'Are you sure you want to reset registration token?' } do
+ data: { confirm: '确定要继续重置注册授权码么?' } do
= icon('refresh')
- Reset runners registration token
+ 重置 runner 注册授权码
.bs-callout
%p
- A 'runner' is a process which runs a build.
- You can setup as many runners as you need.
+ 一个 'runner' 就是一个运行构建的进程。
+ 你可以按照自己的需要设置很多个 runner。
%br
- Runners can be placed on separate users, servers, and even on your local machine.
+ Runners 可以被部署在不同的用户、服务器上,甚至在你本地使用的机器上。
%br
%div
- %span Each runner can be in one of the following states:
+ %span 每个 runner 可以是下列状态之一:
%ul
%li
- %span.label.label-success shared
- \- run builds from all unassigned projects
+ %span.label.label-success 共享的
+ \- 会运行所有未特殊指定项目的构建
%li
- %span.label.label-info specific
- \- run builds from assigned projects
+ %span.label.label-info 特定的
+ \- 只运行被特殊指定到该 runner 的项目的构建
%li
- %span.label.label-danger paused
- \- runner will not receive any new builds
+ %span.label.label-danger 暂停的
+ \- 该 runner 不会接受任何新构建
.append-bottom-20.clearfix
.pull-left
= form_tag admin_runners_path, id: 'runners-search', class: 'form-inline', method: :get do
.form-group
- = search_field_tag :search, params[:search], class: 'form-control', placeholder: 'Runner description or token', spellcheck: false
- = submit_tag 'Search', class: 'btn'
+ = search_field_tag :search, params[:search], class: 'form-control', placeholder: 'Runner 描述或授权码', spellcheck: false
+ = submit_tag '搜索', class: 'btn'
.pull-right.light
- Runners with last contact less than a minute ago: #{@active_runners_cnt}
+ 最后联系时间少于一分钟前的 runner 数量:#{@active_runners_cnt}
%br
@@ -53,13 +53,13 @@
%table.table
%thead
%tr
- %th Type
- %th Runner token
- %th Description
- %th Projects
- %th Builds
- %th Tags
- %th Last contact
+ %th 类型
+ %th Runner 授权码
+ %th 描述
+ %th 项目
+ %th 构建
+ %th 标签
+ %th 最后联系
%th
- @runners.each do |runner|
diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml
index 8700b4820cd..941d02f8631 100644
--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@@ -4,52 +4,52 @@
.pull-right
- if @runner.shared?
%span.runner-state.runner-state-shared
- Shared
+ 共享的
- else
%span.runner-state.runner-state-specific
- Specific
+ 特定的
- if @runner.shared?
.bs-callout.bs-callout-success
- %h4 This runner will process builds from ALL UNASSIGNED projects
+ %h4 此 runner 将会处理所有<b>未指派</b>项目的构建
%p
- If you want runners to build only specific projects, enable them in the table below.
- Keep in mind that this is a one way transition.
+ 如果你想让此 runner 只会处理指派项目的构建,请在下面的表格中启用相关项目的指派。
+ 需要注意的是,此操作只能一次。一旦指定,此 runner 将不能再转为共享的。
- else
.bs-callout.bs-callout-info
- %h4 This runner will process builds only from ASSIGNED projects
- %p You can't make this a shared runner.
+ %h4 此 runner 将只会处理<b>指派</b>项目的构建
+ %p 你不能再将此 runner 转为共享的。
%hr
= form_for @runner, url: admin_runner_path(@runner), html: { class: 'form-horizontal' } do |f|
.form-group
= label_tag :token, class: 'control-label' do
- Token
+ 授权码
.col-sm-10
= f.text_field :token, class: 'form-control', readonly: true
.form-group
= label_tag :description, class: 'control-label' do
- Description
+ 描述
.col-sm-10
= f.text_field :description, class: 'form-control'
.form-group
= label_tag :tag_list, class: 'control-label' do
- Tags
+ 标签列表
.col-sm-10
= f.text_field :tag_list, value: @runner.tag_list.to_s, class: 'form-control'
- .help-block You can setup builds to only use runners with specific tags
+ .help-block 你可以设置构建只使用指定标签的 runner
.form-actions
- = f.submit 'Save', class: 'btn btn-save'
+ = f.submit '保存', class: 'btn btn-save'
.row
.col-md-6
- %h4 Restrict projects for this runner
+ %h4 此 runner 指派的项目
- if @runner.projects.any?
%table.table
%thead
%tr
- %th Assigned projects
+ %th 指派的项目
%th
- @runner.runner_projects.each do |runner_project|
- project = runner_project.project
@@ -60,12 +60,12 @@
= project.name_with_namespace
%td
.pull-right
- = link_to 'Disable', [:admin, project.namespace.becomes(Namespace), project, runner_project], method: :delete, class: 'btn btn-danger btn-xs'
+ = link_to '禁用', [:admin, project.namespace.becomes(Namespace), project, runner_project], method: :delete, class: 'btn btn-danger btn-xs'
%table.table
%thead
%tr
- %th Project
+ %th 项目
%th
%tr
@@ -73,7 +73,7 @@
= form_tag admin_runner_path(@runner), id: 'runner-projects-search', class: 'form-inline', method: :get do
.form-group
= search_field_tag :search, params[:search], class: 'form-control', spellcheck: false
- = submit_tag 'Search', class: 'btn'
+ = submit_tag '搜索', class: 'btn'
%td
- @projects.each do |project|
@@ -84,19 +84,19 @@
.pull-right
= form_for [:admin, project.namespace.becomes(Namespace), project, project.runner_projects.new] do |f|
= f.hidden_field :runner_id, value: @runner.id
- = f.submit 'Enable', class: 'btn btn-xs'
+ = f.submit '启用', class: 'btn btn-xs'
= paginate @projects
.col-md-6
- %h4 Recent builds served by this runner
+ %h4 此 runner 最近完成的构建
%table.table.builds.runner-builds
%thead
%tr
- %th Build
- %th Status
- %th Project
- %th Commit
- %th Finished at
+ %th 构建
+ %th 状态
+ %th 项目
+ %th 提交
+ %th 结束时间
- @builds.each do |build|
- project = build.project
@@ -122,4 +122,4 @@
%td.timestamp
- if build.finished_at
- %span #{time_ago_in_words build.finished_at} ago
+ %span #{time_ago_in_words build.finished_at}之前
diff --git a/app/views/admin/services/_form.html.haml b/app/views/admin/services/_form.html.haml
index cdbfc60f9a4..6a446090bd5 100644
--- a/app/views/admin/services/_form.html.haml
+++ b/app/views/admin/services/_form.html.haml
@@ -1,10 +1,10 @@
%h3.page-title
= @service.title
-%p #{@service.description} template
+%p #{@service.description} 模板
= form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'form-horizontal fieldset-form' } do |form|
= render 'shared/service_settings', form: form
.form-actions
- = form.submit 'Save', class: 'btn btn-save'
+ = form.submit '保存', class: 'btn btn-save'
diff --git a/app/views/admin/services/edit.html.haml b/app/views/admin/services/edit.html.haml
index 53d970e33c1..22612e311bb 100644
--- a/app/views/admin/services/edit.html.haml
+++ b/app/views/admin/services/edit.html.haml
@@ -1,2 +1,2 @@
-- page_title @service.title, "Service Templates"
+- page_title @service.title, "服务模板"
= render 'form'
diff --git a/app/views/admin/services/index.html.haml b/app/views/admin/services/index.html.haml
index 6a5986f496a..30b60bf8d3a 100644
--- a/app/views/admin/services/index.html.haml
+++ b/app/views/admin/services/index.html.haml
@@ -1,15 +1,15 @@
-- page_title "Service Templates"
-%h3.page-title Service templates
-%p.light Service template allows you to set default values for project services
+- page_title "服务模板"
+%h3.page-title 服务模板
+%p.light 服务模板可以为项目服务设置默认值
.table-holder
%table.table
%thead
%tr
%th
- %th Service
- %th Description
- %th Last edit
+ %th 服务
+ %th 描述
+ %th 最后编辑
- @services.sort_by(&:title).each do |service|
%tr
%td
@@ -21,4 +21,4 @@
= service.description
%td.light
= time_ago_in_words service.updated_at
- ago
+ 过去
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index d2527ede995..f4fce7950ef 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -78,19 +78,19 @@
= f.label :skype, class: 'control-label'
.col-sm-10= f.text_field :skype, class: 'form-control'
.form-group
- = f.label :linkedin, class: 'control-label'
+ = f.label :linkedin, "领英", class: 'control-label'
.col-sm-10= f.text_field :linkedin, class: 'form-control'
.form-group
- = f.label :twitter, class: 'control-label'
+ = f.label :twitter, "推特", class: 'control-label'
.col-sm-10= f.text_field :twitter, class: 'form-control'
.form-group
- = f.label :website_url, 'Website', class: 'control-label'
+ = f.label :website_url, "网址", class: 'control-label'
.col-sm-10= f.text_field :website_url, class: 'form-control'
.form-actions
- if @user.new_record?
- = f.submit 'Create user', class: "btn btn-create"
- = link_to 'Cancel', admin_users_path, class: "btn btn-cancel"
+ = f.submit '创建用户', class: "btn btn-create"
+ = link_to '取消', admin_users_path, class: "btn btn-cancel"
- else
- = f.submit 'Save changes', class: "btn btn-save"
- = link_to 'Cancel', admin_user_path(@user), class: "btn btn-cancel"
+ = f.submit '保存修改', class: "btn btn-save"
+ = link_to '取消', admin_user_path(@user), class: "btn btn-cancel"
diff --git a/app/views/admin/users/_head.html.haml b/app/views/admin/users/_head.html.haml
index ce5e21e54cc..deb4d5aa4d3 100644
--- a/app/views/admin/users/_head.html.haml
+++ b/app/views/admin/users/_head.html.haml
@@ -1,26 +1,26 @@
%h3.page-title
= @user.name
- if @user.blocked?
- %span.cred (Blocked)
+ %span.cred (禁用的)
- if @user.admin
- %span.cred (Admin)
+ %span.cred (管理)
.pull-right
- unless @user == current_user || @user.blocked?
- = link_to 'Impersonate', impersonate_admin_user_path(@user), method: :post, class: "btn btn-nr btn-grouped btn-info"
+ = link_to '假冒', impersonate_admin_user_path(@user), method: :post, class: "btn btn-nr btn-grouped btn-info"
= link_to edit_admin_user_path(@user), class: "btn btn-nr btn-grouped" do
%i.fa.fa-pencil-square-o
- Edit
+ 编辑
%hr
%ul.nav-links
= nav_link(path: 'users#show') do
- = link_to "Account", admin_user_path(@user)
+ = link_to "账户", admin_user_path(@user)
= nav_link(path: 'users#groups') do
- = link_to "Groups", groups_admin_user_path(@user)
+ = link_to "群组", groups_admin_user_path(@user)
= nav_link(path: 'users#projects') do
- = link_to "Projects", projects_admin_user_path(@user)
+ = link_to "项目", projects_admin_user_path(@user)
= nav_link(path: 'users#keys') do
- = link_to "SSH keys", keys_admin_user_path(@user)
+ = link_to "SSH 密钥", keys_admin_user_path(@user)
= nav_link(controller: :identities) do
- = link_to "Identities", admin_user_identities_path(@user)
+ = link_to "身份", admin_user_identities_path(@user)
.append-bottom-default
diff --git a/app/views/admin/users/_profile.html.haml b/app/views/admin/users/_profile.html.haml
index 6bc217f84cc..c2502c82dd0 100644
--- a/app/views/admin/users/_profile.html.haml
+++ b/app/views/admin/users/_profile.html.haml
@@ -1,13 +1,13 @@
.panel.panel-default
.panel-heading
- Profile
+ 个人资料
%ul.well-list
%li
- %span.light Member since
+ %span.light 注册时间:
%strong= user.created_at.to_s(:medium)
- unless user.public_email.blank?
%li
- %span.light E-mail:
+ %span.light 电子邮箱:
%strong= link_to user.public_email, "mailto:#{user.public_email}"
- unless user.skype.blank?
%li
@@ -15,17 +15,17 @@
%strong= link_to user.skype, "skype:#{user.skype}"
- unless user.linkedin.blank?
%li
- %span.light LinkedIn:
+ %span.light 领英:
%strong= link_to user.linkedin, "https://www.linkedin.com/in/#{user.linkedin}"
- unless user.twitter.blank?
%li
- %span.light Twitter:
+ %span.light 推特:
%strong= link_to user.twitter, "https://twitter.com/#{user.twitter}"
- unless user.website_url.blank?
%li
- %span.light Website:
+ %span.light 网站:
%strong= link_to user.short_website_url, user.full_website_url
- unless user.location.blank?
%li
- %span.light Location:
+ %span.light 位置:
%strong= user.location
diff --git a/app/views/admin/users/edit.html.haml b/app/views/admin/users/edit.html.haml
index 3b6fd71500d..395e9d30c33 100644
--- a/app/views/admin/users/edit.html.haml
+++ b/app/views/admin/users/edit.html.haml
@@ -1,5 +1,5 @@
-- page_title "Edit", @user.name, "Users"
+- page_title "编辑", @user.name, "用户"
%h3.page-title
- Edit user: #{@user.name}
+ 编辑用户:#{@user.name}
%hr
= render 'form'
diff --git a/app/views/admin/users/groups.html.haml b/app/views/admin/users/groups.html.haml
index dbecb7bbfd6..ac7500ad67c 100644
--- a/app/views/admin/users/groups.html.haml
+++ b/app/views/admin/users/groups.html.haml
@@ -1,9 +1,9 @@
-- page_title "Groups", @user.name, "Users"
+- page_title "群组", @user.name, "用户"
= render 'admin/users/head'
- if @user.group_members.present?
.panel.panel-default
- .panel-heading Groups:
+ .panel-heading 群组:
%ul.well-list
- @user.group_members.each do |group_member|
- group = group_member.group
@@ -13,7 +13,7 @@
.pull-right
%span.light= group_member.human_access
- unless group_member.owner?
- = link_to group_group_member_path(group, group_member), data: { confirm: remove_user_from_group_message(group, group_member) }, method: :delete, remote: true, class: "btn-xs btn btn-remove", title: 'Remove user from group' do
+ = link_to group_group_member_path(group, group_member), data: { confirm: remove_user_from_group_message(group, group_member) }, method: :delete, remote: true, class: "btn-xs btn btn-remove", title: '从群组中删除用户' do
%i.fa.fa-times.fa-inverse
- else
- .nothing-here-block This user has no groups.
+ .nothing-here-block 此用户没有群组。
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 0ee8dc962b9..a52aa324503 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -59,10 +59,10 @@
= link_to admin_users_path(sort: sort_value_oldest_updated, filter: params[:filter]) do
= sort_title_oldest_updated
- = link_to 'New User', new_admin_user_path, class: "btn btn-new"
+ = link_to '新用户', new_admin_user_path, class: "btn btn-new"
= form_tag admin_users_path, method: :get, class: 'form-inline' do
.form-group
- = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control', spellcheck: false
+ = search_field_tag :name, params[:name], placeholder: '姓名、电子邮箱或用户名', class: 'form-control', spellcheck: false
= hidden_field_tag "filter", params[:filter]
= button_tag class: 'btn btn-primary' do
%i.fa.fa-search
diff --git a/app/views/admin/users/new.html.haml b/app/views/admin/users/new.html.haml
index bfc36ed7373..b313613a7b1 100644
--- a/app/views/admin/users/new.html.haml
+++ b/app/views/admin/users/new.html.haml
@@ -1,5 +1,5 @@
-- page_title "New User"
+- page_title "新用户"
%h3.page-title
- New user
+ 新用户
%hr
= render 'form'
diff --git a/app/views/admin/users/projects.html.haml b/app/views/admin/users/projects.html.haml
index b655b2a15f5..624b9ff5a4e 100644
--- a/app/views/admin/users/projects.html.haml
+++ b/app/views/admin/users/projects.html.haml
@@ -1,27 +1,27 @@
-- page_title "Projects", @user.name, "Users"
+- page_title "项目", @user.name, "用户"
= render 'admin/users/head'
- if @user.groups.any?
.panel.panel-default
- .panel-heading Group projects
+ .panel-heading 群组项目
%ul.well-list
- @user.groups.each do |group|
%li
%strong= group.name
- &ndash; access to
- #{pluralize(group.projects.count, 'project')}
+ &ndash; 访问
+ #{pluralize(group.projects.count, '个项目', '个项目')}
.row
.col-md-6
- if @personal_projects.present?
= render 'admin/users/projects', projects: @personal_projects
- else
- .nothing-here-block This user has no personal projects.
+ .nothing-here-block 此用户没有个人项目。
.col-md-6
.panel.panel-default
- .panel-heading Joined projects (#{@joined_projects.count})
+ .panel-heading 加入的项目 (#{@joined_projects.count})
%ul.well-list
- @joined_projects.sort_by(&:name_with_namespace).each do |project|
- member = project.team.find_member(@user.id)
@@ -33,11 +33,11 @@
- if member
.pull-right
- if member.owner?
- %span.light Owner
+ %span.light 所有者
- else
%span.light= member.human_access
- if member.respond_to? :project
- = link_to namespace_project_project_member_path(project.namespace, project, member), data: { confirm: remove_from_project_team_message(project, member) }, remote: true, method: :delete, class: "btn-xs btn btn-remove", title: 'Remove user from project' do
+ = link_to namespace_project_project_member_path(project.namespace, project, member), data: { confirm: remove_from_project_team_message(project, member) }, remote: true, method: :delete, class: "btn-xs btn btn-remove", title: '从项目中删除用户' do
%i.fa.fa-times
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index d37489bebea..c078453c1ef 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -1,4 +1,4 @@
-- page_title @user.name, "Users"
+- page_title @user.name, "用户"
= render 'admin/users/head'
.row
@@ -10,7 +10,7 @@
%li
= image_tag avatar_icon(@user, 60), class: "avatar s60"
%li
- %span.light Profile page:
+ %span.light 个人资料页面:
%strong
= link_to user_path(@user) do
= @user.username
@@ -119,7 +119,7 @@
- if @user.created_by
%li
- %span.light Created by:
+ %span.light 创建者:
%strong
= link_to @user.created_by.name, [:admin, @user.created_by]
@@ -128,66 +128,66 @@
- unless @user.confirmed?
.panel.panel-info
.panel-heading
- Confirm user
+ 确认用户
.panel-body
- if @user.unconfirmed_email.present?
- email = " (#{@user.unconfirmed_email})"
- %p This user has an unconfirmed email address#{email}. You may force a confirmation.
+ %p 此用户有一个未确认的电子邮箱地址 #{email}。你可以强制确认。
%br
- = link_to 'Confirm user', confirm_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
+ = link_to '确认用户', confirm_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: '确认要继续么?' }
- if @user.blocked?
.panel.panel-info
.panel-heading
- This user is blocked
+ 该用户被禁用
.panel-body
- %p Blocking user has the following effects:
+ %p 禁用用户有如下效果:
%ul
- %li User will not be able to login
- %li User will not be able to access git repositories
- %li Personal projects will be left
- %li Owned groups will be left
+ %li 用户无法登录
+ %li 用户无法访问 git 版本仓库
+ %li 个人项目将被移除
+ %li 拥有的群组将被移除
%br
- = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
+ = link_to '启用用户', unblock_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: '确认要继续么?' }
- else
.panel.panel-warning
.panel-heading
- Block this user
+ 禁用用户
.panel-body
- %p Blocking user has the following effects:
+ %p 禁用用户有如下效果:
%ul
- %li User will not be able to login
- %li User will not be able to access git repositories
- %li User will be removed from joined projects and groups
- %li Personal projects will be left
- %li Owned groups will be left
+ %li 用户无法登录
+ %li 用户无法访问 git 版本仓库
+ %li 用户将从加入的项目和群组中删除
+ %li 个人项目将被移除
+ %li 拥有的群组将被移除
%br
- = link_to 'Block user', block_admin_user_path(@user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put, class: "btn btn-warning"
+ = link_to '禁用用户', block_admin_user_path(@user), data: { confirm: '用户将被禁用!确定要继续么?' }, method: :put, class: "btn btn-warning"
- if @user.access_locked?
.panel.panel-info
.panel-heading
- This account has been locked
+ 此账户已被锁定
.panel-body
- %p This user has been temporarily locked due to excessive number of failed logins. You may manually unlock the account.
+ %p 此用户因为登录失败过多而被临时锁定。可以手动解锁此账户。
%br
- = link_to 'Unlock user', unlock_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
+ = link_to '解锁用户', unlock_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: '确定要继续么?' }
.panel.panel-danger
.panel-heading
- Remove user
+ 删除用户
.panel-body
- if @user.can_be_removed?
- %p Deleting a user has the following effects:
+ %p 删除用户有如下效果:
%ul
- %li All user content like authored issues, snippets, comments will be removed
+ %li 所有用户内容,比如:问题、代码片段、注释都将被删除
- rp = @user.personal_projects.count
- unless rp.zero?
- %li #{pluralize rp, 'personal project'} will be removed and cannot be restored
+ %li #{pluralize rp, '个个人项目', '个个人项目'}将被删除并无法恢复
%br
- = link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove"
+ = link_to '删除用户', [:admin, @user], data: { confirm: "用户 #{@user.name} 将被删除!确定要继续么?" }, method: :delete, class: "btn btn-remove"
- else
- if @user.solo_owned_groups.present?
%p
- This user is currently an owner in these groups:
+ 此用户当前拥有以下群组:
%strong #{@user.solo_owned_groups.map(&:name).join(', ')}
%p
- You must transfer ownership or delete these groups before you can delete this user.
+ 在删除此用户前,请转移这些群组的所有权或删除之。