<%= f.label :current_password %>
(we need your current password to confirm your changes)
+
<%= f.label :current_password %> (変更の確認のために現在のパスワードを入力してください)
<%= f.password_field :current_password %>
-
<%= f.submit "Update", class: "input_button" %>
+
<%= f.submit "更新", class: "input_button" %>
<% end %>
-
Cancel my account
+
キャンセル
-
Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>.
+
Unhappy? <%= link_to "キャンセル", registration_path(resource_name), data: { confirm: "本当にキャンセルしますか？" }, method: :delete %>します。
-<%= link_to "Back", :back %>
+<%= link_to "戻る", :back %>
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index d3e37f7..3e59258 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -1,3 +1,3 @@
= render 'devise/shared/signup_box'
-= render 'devise/shared/sign_in_link'
\ No newline at end of file
+= render 'devise/shared/sign_in_link'
diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml
index 54a3972..727f7e5 100644
--- a/app/views/devise/sessions/_new_base.html.haml
+++ b/app/views/devise/sessions/_new_base.html.haml
@@ -1,12 +1,12 @@
= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
- = f.text_field :login, class: "form-control top", placeholder: "Username or Email", autofocus: "autofocus"
- = f.password_field :password, class: "form-control bottom", placeholder: "Password"
+ = f.text_field :login, class: "form-control top", placeholder: "ユーザ名またはメールアドレス", autofocus: "autofocus"
+ = f.password_field :password, class: "form-control bottom", placeholder: "パスワード"
- if devise_mapping.rememberable?
.remember-me.checkbox
%label{for: "user_remember_me"}
= f.check_box :remember_me
- %span Remember me
+ %span パスワードを記憶
.pull-right
- = link_to "Forgot your password?", new_password_path(resource_name)
+ = link_to "パスワードを忘れた場合", new_password_path(resource_name)
%div
- = f.submit "Sign in", class: "btn btn-save"
+ = f.submit "サインイン", class: "btn btn-save"
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
index 49e99e2..b56edb7 100644
--- a/app/views/devise/shared/_links.erb
+++ b/app/views/devise/shared/_links.erb
@@ -1,19 +1,19 @@
<%- if controller_name != 'sessions' %>
- <%= link_to "Sign in", new_session_path(resource_name), class: "btn" %>
+ <%= link_to "サインイン", new_session_path(resource_name), class: "btn" %>
<% end -%>
<%- if devise_mapping.registerable? && controller_name != 'registrations' && gitlab_config.signup_enabled %>
- <%= link_to "Sign up", new_registration_path(resource_name) %>
+ <%= link_to "サインアップ", new_registration_path(resource_name) %>
<% end -%>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
-<%= link_to "Forgot your password?", new_password_path(resource_name), class: "btn" %>
+<%= link_to "パスワードを忘れた場合", new_password_path(resource_name), class: "btn" %>
<% end -%>
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
- <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+ <%= link_to "確認方法のメールを受信していませんか？", new_confirmation_path(resource_name) %>
<% end -%>
<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
- <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+ <%= link_to "ロック解除方法のメールを受信していませんか？", new_unlock_path(resource_name) %>
<% end -%>
diff --git a/app/views/devise/shared/_sign_in_link.html.haml b/app/views/devise/shared/_sign_in_link.html.haml
index fafc4b8..8c8f9cd 100644
--- a/app/views/devise/shared/_sign_in_link.html.haml
+++ b/app/views/devise/shared/_sign_in_link.html.haml
@@ -1,5 +1,5 @@
%p
%span.light
- Already have login and password?
+ ログインアカウントとパスワードをお持ちですか？
%strong
- = link_to "Sign in", new_session_path(resource_name)
+ = link_to "サインイン", new_session_path(resource_name)
diff --git a/app/views/devise/shared/_signin_box.html.haml b/app/views/devise/shared/_signin_box.html.haml
index c76574d..1f19252 100644
--- a/app/views/devise/shared/_signin_box.html.haml
+++ b/app/views/devise/shared/_signin_box.html.haml
@@ -1,10 +1,10 @@
.login-box
- if signup_enabled?
.login-heading
- %h3 Existing user? Sign in
+ %h3 登録済みの方はサインイン
- else
.login-heading
- %h3 Sign in
+ %h3 サインイン
.login-body
- if ldap_enabled?
%ul.nav.nav-tabs
diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml
index dcf60c9..6030252 100644
--- a/app/views/devise/shared/_signup_box.html.haml
+++ b/app/views/devise/shared/_signup_box.html.haml
@@ -1,26 +1,26 @@
.login-box
- if signin_enabled?
.login-heading
- %h3 New user? Create an account
+ %h3 はじめての方は登録
- else
.login-heading
- %h3 Create an account
+ %h3 アカウントの作成
.login-body
= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
.devise-errors
= devise_error_messages!
%div
- = f.text_field :name, class: "form-control top", placeholder: "Name", required: true
+ = f.text_field :name, class: "form-control top", placeholder: "名前", required: true
%div
- = f.text_field :username, class: "form-control middle", placeholder: "Username", required: true
+ = f.text_field :username, class: "form-control middle", placeholder: "ユーザ名", required: true
%div
- = f.email_field :email, class: "form-control middle", placeholder: "Email", required: true
+ = f.email_field :email, class: "form-control middle", placeholder: "メールアドレス", required: true
.form-group.append-bottom-20#password-strength
- = f.password_field :password, class: "form-control bottom", id: "user_password_sign_up", placeholder: "Password", required: true
+ = f.password_field :password, class: "form-control bottom", id: "user_password_sign_up", placeholder: "パスワード", required: true
%div
- = f.submit "Sign up", class: "btn-create btn"
+ = f.submit "サインアップ", class: "btn-create btn"
.clearfix.prepend-top-20
%p
- %span.light Did not receive confirmation email?
- = link_to "Send again", new_confirmation_path(resource_name)
\ No newline at end of file
+ %span.light 確認方法のメールを受信していませんか？
+ = link_to "もう一度送信", new_confirmation_path(resource_name)
diff --git a/app/views/doorkeeper/applications/_form.html.haml b/app/views/doorkeeper/applications/_form.html.haml
index a5fec2f..55ed3af 100644
--- a/app/views/doorkeeper/applications/_form.html.haml
+++ b/app/views/doorkeeper/applications/_form.html.haml
@@ -1,24 +1,24 @@
= form_for application, url: doorkeeper_submit_path(application), html: {class: 'form-horizontal', role: 'form'} do |f|
- if application.errors.any?
.alert.alert-danger{"data-alert" => ""}
- %p Whoops! Check your form for possible errors
+ %p 入力内容にエラーがあります。確認してください
= content_tag :div, class: "form-group#{' has-error' if application.errors[:name].present?}" do
= f.label :name, class: 'col-sm-2 control-label'
.col-sm-10
- = f.text_field :name, class: 'form-control'
+ = f.text_field :name, '名前', class: 'form-control'
= doorkeeper_errors_for application, :name
= content_tag :div, class: "form-group#{' has-error' if application.errors[:redirect_uri].present?}" 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
+ 1行につき1つの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-primary wide"
- = link_to "Cancel", applications_profile_path, class: "btn btn-default"
+ = f.submit '送信', class: "btn btn-primary wide"
+ = link_to "キャンセル", applications_profile_path, class: "btn btn-default"
diff --git a/app/views/doorkeeper/applications/index.html.haml b/app/views/doorkeeper/applications/index.html.haml
index e5be4b4..5afc98c 100644
--- a/app/views/doorkeeper/applications/index.html.haml
+++ b/app/views/doorkeeper/applications/index.html.haml
@@ -1,10 +1,10 @@
-%h3.page-title Your applications
-%p= link_to 'New Application', new_oauth_application_path, class: 'btn btn-success'
+%h3.page-title あなたのアプリケーション
+%p= link_to '新しいアプリケーション', new_oauth_application_path, class: 'btn btn-success'
%table.table.table-striped
%thead
%tr
- %th Name
- %th Callback URL
+ %th 名前
+ %th コールバックURL
%th
%th
%tbody
@@ -12,5 +12,5 @@
%tr{:id => "application_#{application.id}"}
%td= link_to application.name, oauth_application_path(application)
%td= application.redirect_uri
- %td= link_to 'Edit', edit_oauth_application_path(application), class: 'btn btn-link'
- %td= render 'delete_form', application: application
\ No newline at end of file
+ %td= link_to '編集', edit_oauth_application_path(application), class: 'btn btn-link'
+ %td= render 'delete_form', application: application
diff --git a/app/views/doorkeeper/applications/new.html.haml b/app/views/doorkeeper/applications/new.html.haml
index 655845e..c3d0c5b 100644
--- a/app/views/doorkeeper/applications/new.html.haml
+++ b/app/views/doorkeeper/applications/new.html.haml
@@ -1,2 +1,2 @@
-%h3.page-title New application
-= render 'form', application: @application
\ No newline at end of file
+%h3.page-title 新しいアプリケーション
+= render 'form', application: @application
diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml
index d2f0005..7049487 100644
--- a/app/views/events/_event_last_push.html.haml
+++ b/app/views/events/_event_last_push.html.haml
@@ -1,14 +1,16 @@
- if show_last_push_widget?(event)
.event-last-push
.event-last-push-text
- %span You pushed to
+ %span あなたは
= link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
%strong= event.ref_name
- at
+ ブランチを
%strong= link_to_project event.project
+ プロジェクトに
#{time_ago_with_tooltip(event.created_at)}
+ にプッシュしました。
.pull-right
- = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-sm" do
- Create Merge Request
+ = link_to new_mr_path_from_push_event(event), title: "新しいマージリクエスト", class: "btn btn-create btn-sm" do
+ マージリクエストを作成
%hr
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index a39e62e..b2f90f1 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -1,17 +1,18 @@
.event-title
%span.author_name= link_to_author event
- %span.event_label{class: event.action_name}
- = event_action_name(event)
-
- - if event.target
- %strong= link_to "##{event.target_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target]
- at
-
+ が
- if event.project
= link_to_project event.project
- else
= event.project_name
-
+ %span.event_label{class: event.action_name}
+ で#{event_action_name(event)}
+
+ - if event.target
+ (
+ %strong>= link_to "##{event.target_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target]
+ )
+
- if event.target.respond_to?(:title)
.event-body
.event-note
diff --git a/app/views/events/event/_created_project.html.haml b/app/views/events/event/_created_project.html.haml
index 3c7153d..b3508aa 100644
--- a/app/views/events/event/_created_project.html.haml
+++ b/app/views/events/event/_created_project.html.haml
@@ -2,6 +2,7 @@
%span.author_name= link_to_author event
%span.event_label{class: event.action_name}
= event_action_name(event)
+ \:
- if event.project
= link_to_project event.project
@@ -13,7 +14,7 @@
.event-note
.md
%p
- Congratulations! Why not share your accomplishment with the world?
+ おめでとうございます! これをシェアしませんか？
%a.twitter-share-button{ |
href: "https://twitter.com/share", |
@@ -24,4 +25,4 @@
"data-hashtags" => "gitlab", |
"data-count" => "none"}
Tweet
- %script{src: "//platform.twitter.com/widgets.js"}
\ No newline at end of file
+ %script{src: "//platform.twitter.com/widgets.js"}
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
index 4ef18c0..676b6be 100644
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -1,14 +1,14 @@
.event-title
%span.author_name= link_to_author event
- %span.event_label
- = event.action_name
- = event_note_title_html(event)
- at
-
+ が
- if event.project
= link_to_project event.project
- else
= event.project_name
+ で
+ %span.event_label
+ = event_note_title_html(event)
+ に#{event.i18n_action_name}
.event-body
.event-note
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml
index 4891388..3d7e3b5 100644
--- a/app/views/events/event/_push.html.haml
+++ b/app/views/events/event/_push.html.haml
@@ -1,13 +1,15 @@
.event-title
%span.author_name= link_to_author event
- %span.event_label.pushed #{event.action_name} #{event.ref_type}
+ が
+ = link_to_project event.project
+ で#{event.i18n_ref_type}
- if event.rm_ref?
%strong= event.ref_name
- else
= link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
%strong= event.ref_name
- at
- = link_to_project event.project
+ を
+ %span.event_label.pushed> #{event.i18n_action_name}
- if event.push_with_commits?
- project = event.project
@@ -22,4 +24,4 @@
- if event.commits_count > 2
%span ... and #{event.commits_count - 2} more commits.
= link_to namespace_project_compare_path(event.project.namespace, event.project, from: event.commit_from, to: event.commit_to) do
- %strong Compare → #{truncate_sha(event.commit_from)}...#{truncate_sha(event.commit_to)}
+ %strong 比較 → #{truncate_sha(event.commit_from)}...#{truncate_sha(event.commit_to)}
diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml
index 2ea6cb1..f56d3be 100644
--- a/app/views/explore/groups/index.html.haml
+++ b/app/views/explore/groups/index.html.haml
@@ -3,14 +3,14 @@
= form_tag explore_groups_path, method: :get, class: 'form-inline form-tiny' do |f|
= hidden_field_tag :sort, @sort
.form-group
- = search_field_tag :search, params[:search], placeholder: "Filter by name", class: "form-control search-text-input input-mn-300", id: "groups_search"
+ = search_field_tag :search, params[:search], placeholder: "名前で絞り込み", class: "form-control search-text-input input-mn-300", id: "groups_search"
.form-group
- = button_tag 'Search', class: "btn btn-primary wide"
+ = button_tag '検索', class: "btn btn-primary wide"
.pull-right
.dropdown.inline
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
- %span.light sort:
+ %span.light 並び替え:
- if @sort.present?
= sort_options_hash[@sort]
- else
@@ -44,7 +44,7 @@
%p.light
#{pluralize(group.members.size, 'member')}, #{pluralize(group.projects.count, 'project')}
- unless @groups.present?
- .nothing-here-block No public groups
+ .nothing-here-block 公開グループはありません
= paginate @groups, theme: "gitlab"
diff --git a/app/views/explore/projects/_filter.html.haml b/app/views/explore/projects/_filter.html.haml
index b3963a9..a23a396 100644
--- a/app/views/explore/projects/_filter.html.haml
+++ b/app/views/explore/projects/_filter.html.haml
@@ -1,25 +1,25 @@
.pull-left
= form_tag explore_projects_filter_path, method: :get, class: 'form-inline form-tiny' do |f|
.form-group
- = search_field_tag :search, params[:search], placeholder: "Filter by name", class: "form-control search-text-input input-mn-300", id: "projects_search"
+ = search_field_tag :search, params[:search], placeholder: "名前で絞り込み", class: "form-control search-text-input input-mn-300", id: "projects_search"
.form-group
- = button_tag 'Search', class: "btn btn-primary wide"
+ = button_tag '検索', class: "btn btn-primary wide"
.pull-right.hidden-sm.hidden-xs
- if current_user
.dropdown.inline.append-right-10
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
%i.fa.fa-globe
- %span.light Visibility:
+ %span.light 可視性:
- if params[:visibility_level].present?
= visibility_level_label(params[:visibility_level].to_i)
- else
- Any
+ 指定なし
%b.caret
%ul.dropdown-menu
%li
= link_to explore_projects_filter_path(visibility_level: nil) do
- Any
+ 指定なし
- Gitlab::VisibilityLevel.values.each do |level|
%li{ class: (level.to_s == params[:visibility_level]) ? 'active' : 'light' }
= link_to explore_projects_filter_path(visibility_level: level) do
@@ -30,16 +30,16 @@
.dropdown.inline.append-right-10
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
%i.fa.fa-tags
- %span.light Tags:
+ %span.light タグ:
- if params[:tag].present?
= params[:tag]
- else
- Any
+ 指定なし
%b.caret
%ul.dropdown-menu
%li
= link_to explore_projects_filter_path(tag: nil) do
- Any
+ 指定なし
- @tags.each do |tag|
%li{ class: (tag.name == params[:tag]) ? 'active' : 'light' }
@@ -49,7 +49,7 @@
.dropdown.inline
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
- %span.light sort:
+ %span.light 並び替え:
- if @sort.present?
= sort_options_hash[@sort]
- else
diff --git a/app/views/explore/projects/_project.html.haml b/app/views/explore/projects/_project.html.haml
index d65fb52..291f88a 100644
--- a/app/views/explore/projects/_project.html.haml
+++ b/app/views/explore/projects/_project.html.haml
@@ -14,11 +14,11 @@
.repo-info
- unless project.empty_repo?
- = link_to pluralize(project.repository.round_commit_count, 'commit'), namespace_project_commits_path(project.namespace, project, project.default_branch)
+ = link_to "#{project.repository.round_commit_count} コミット", namespace_project_commits_path(project.namespace, project, project.default_branch)
·
- = link_to pluralize(project.repository.branch_names.count, 'branch'), namespace_project_branches_path(project.namespace, project)
+ = link_to "#{project.repository.branch_names.count} ブランチ", namespace_project_branches_path(project.namespace, project)
·
- = link_to pluralize(project.repository.tag_names.count, 'tag'), namespace_project_tags_path(project.namespace, project)
+ = link_to "#{project.repository.tag_names.count} タグ", namespace_project_tags_path(project.namespace, project)
- else
%i.fa.fa-exclamation-triangle
- Empty repository
+ 空のリポジトリ
diff --git a/app/views/explore/projects/index.html.haml b/app/views/explore/projects/index.html.haml
index 5086b58..43231c5 100644
--- a/app/views/explore/projects/index.html.haml
+++ b/app/views/explore/projects/index.html.haml
@@ -6,6 +6,6 @@
%ul.bordered-list.top-list
= render @projects
- unless @projects.present?
- .nothing-here-block No public projects
+ .nothing-here-block 公開プロジェクトはありません
= paginate @projects, theme: "gitlab"
diff --git a/app/views/explore/projects/starred.html.haml b/app/views/explore/projects/starred.html.haml
index 420f069..c48832b 100644
--- a/app/views/explore/projects/starred.html.haml
+++ b/app/views/explore/projects/starred.html.haml
@@ -1,7 +1,7 @@
.explore-trending-block
%p.lead
%i.fa.fa-star
- See most starred projects
+ 最もスターがつけられたプロジェクトを見てみましょう
%hr
.public-projects
%ul.bordered-list
diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml
index 9cad923..92f4ffe 100644
--- a/app/views/explore/projects/trending.html.haml
+++ b/app/views/explore/projects/trending.html.haml
@@ -1,11 +1,11 @@
.explore-trending-block
%p.lead
%i.fa.fa-comments-o
- See most discussed projects for last month
+ この1ヶ月で最も議論されたプロジェクトを見てみましょう
%hr
.public-projects
%ul.bordered-list
= render @trending_projects
.center
- = link_to 'Show all projects', explore_projects_path, class: 'btn btn-primary'
+ = link_to 'すべてのプロジェクトを表示', explore_projects_path, class: 'btn btn-primary'
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index 6f53e12..c016a05 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -1,10 +1,10 @@
.panel.panel-default
.panel-heading.clearfix
.input-group
- = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control'
+ = search_field_tag :filter_projects, nil, placeholder: '名前で絞り込み', class: 'projects-list-filter form-control'
- if can? current_user, :create_projects, @group
.input-group-addon.dash-new-project
= link_to new_project_path(namespace_id: @group.id) do
- %strong New project
+ %strong 新しいプロジェクト
= render 'shared/projects_list', projects: @projects, projects_limit: 20
diff --git a/app/views/groups/_settings_nav.html.haml b/app/views/groups/_settings_nav.html.haml
index e6aee22..8e40d47 100644
--- a/app/views/groups/_settings_nav.html.haml
+++ b/app/views/groups/_settings_nav.html.haml
@@ -3,9 +3,9 @@
= link_to edit_group_path(@group), title: 'Group' do
%i.fa.fa-pencil-square-o
%span
- Group
+ グループ
= nav_link(path: 'groups#projects') do
= link_to projects_group_path(@group), title: 'Projects' do
%i.fa.fa-folder
%span
- Projects
+ プロジェクト
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 49e7180..3e37919 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -1,7 +1,7 @@
.panel.panel-default
.panel-heading
%strong= @group.name
- group settings:
+ グループの設定:
.panel-body
= form_for @group, html: { multipart: true, class: "form-horizontal" }, authenticity_token: true do |f|
- if @group.errors.any?
@@ -15,23 +15,23 @@
= image_tag group_icon(@group), alt: '', class: 'avatar group-avatar s160'
%p.light
- if @group.avatar?
- You can change your group avatar here
+ アバターを変更することができます。
- else
- You can upload a group avatar here
+ アバターをアップロードすることができます。
= render 'shared/choose_group_avatar_button', f: f
- if @group.avatar?
%hr
- = link_to 'Remove avatar', group_avatar_path(@group.to_param), data: { confirm: "Group avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-sm remove-avatar"
+ = link_to 'アバターを削除', group_avatar_path(@group.to_param), data: { confirm: "グループアバターを削除します。よろしいですか？"}, method: :delete, class: "btn btn-remove btn-sm remove-avatar"
.form-actions
- = f.submit 'Save group', class: "btn btn-save"
+ = f.submit 'グループを保存', class: "btn btn-save"
.panel.panel-danger
- .panel-heading Remove group
+ .panel-heading グループの削除
.panel-body
%p
- Removing group will cause all child projects and resources to be removed.
+ グループを削除すると、子プロジェクトとリソースも削除されます。
%br
- %strong Removed group can not be restored!
+ %strong グループの削除は元に戻せません！
- = link_to 'Remove Group', @group, data: {confirm: 'Removed group can not be restored! Are you sure?'}, method: :delete, class: "btn btn-remove"
+ = link_to 'グループを削除', @group, data: {confirm: 'グループの削除は元に戻せません！本当に削除しますか？'}, method: :delete, class: "btn btn-remove"
diff --git a/app/views/groups/group_members/_group_member.html.haml b/app/views/groups/group_members/_group_member.html.haml
index 0030252..5630215 100644
--- a/app/views/groups/group_members/_group_member.html.haml
+++ b/app/views/groups/group_members/_group_member.html.haml
@@ -8,10 +8,10 @@
%strong= user.name
%span.cgray= user.username
- if user == current_user
- %span.label.label-success It's you
+ %span.label.label-success あなた
- if user.blocked?
%label.label.label-danger
- %strong Blocked
+ %strong ブロック中
- if show_roles
%span.pull-right
@@ -19,12 +19,12 @@
- if show_controls
- if can?(current_user, :modify_group_member, member)
= button_tag class: "btn-xs btn js-toggle-button",
- title: 'Edit access level', type: 'button' do
+ title: 'アクセスレベルを編集', type: 'button' do
%i.fa.fa-pencil-square-o
- if can?(current_user, :destroy_group_member, member)
- if current_user == user
- = link_to leave_group_group_members_path(@group), data: { confirm: leave_group_message(@group.name)}, method: :delete, class: "btn-xs btn btn-remove", title: 'Remove user from group' do
+ = link_to leave_group_group_members_path(@group), data: { confirm: leave_group_message(@group.name)}, method: :delete, class: "btn-xs btn btn-remove", title: 'ユーザをグループから削除' do
%i.fa.fa-minus.fa-inverse
- else
= link_to group_group_member_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-xs btn btn-remove", title: 'Remove user from group' do
@@ -34,4 +34,4 @@
= form_for [@group, member], remote: true do |f|
.alert.prepend-top-20
= f.select :access_level, options_for_select(GroupMember.access_level_roles, member.access_level)
- = f.submit 'Save', class: 'btn btn-save btn-sm'
+ = f.submit '保存', class: 'btn btn-save btn-sm'
diff --git a/app/views/groups/group_members/_new_group_member.html.haml b/app/views/groups/group_members/_new_group_member.html.haml
index c4c29bb..1f1508c 100644
--- a/app/views/groups/group_members/_new_group_member.html.haml
+++ b/app/views/groups/group_members/_new_group_member.html.haml
@@ -1,15 +1,16 @@
= form_for @group_member, url: group_group_members_path(@group), html: { class: 'form-horizontal users-group-form' } do |f|
.form-group
- = f.label :user_ids, "People", class: 'control-label'
+ = f.label :user_ids, "ユーザ", class: 'control-label'
.col-sm-10= users_select_tag(:user_ids, multiple: true, class: 'input-large')
.form-group
- = f.label :access_level, "Group Access", class: 'control-label'
+ = f.label :access_level, "グループアクセス権", class: 'control-label'
.col-sm-10
= select_tag :access_level, options_for_select(GroupMember.access_level_roles, @group_member.access_level), class: "project-access-select select2"
.help-block
- Read more about role permissions
- %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
+ アクセス権についての詳細は、
+ %strong= link_to "こちら", help_page_path("permissions", "permissions"), class: "vlink"
+ から確認できます。
.form-actions
- = f.submit 'Add users to group', class: "btn btn-create"
+ = f.submit 'ユーザをグループに追加', class: "btn btn-create"
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml
index 0d501fe..e618d3a 100644
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -1,25 +1,26 @@
- show_roles = should_user_see_group_roles?(current_user, @group)
%h3.page-title
- Group members
+ グループメンバー
- if show_roles
%p.light
- Members of group have access to all group projects.
- Read more about permissions
- %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
+ このグループのメンバーはこのグループのすべてのプロジェクトにアクセスできます。
+ アクセス権についての詳細は、
+ %strong= link_to "こちら", help_page_path("permissions", "permissions"), class: "vlink"
+ から確認できます。
%hr
.clearfix.js-toggle-container
= form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form' do
.form-group
- = search_field_tag :search, params[:search], { placeholder: 'Find existing member by name', class: 'form-control search-text-input input-mn-300' }
- = button_tag 'Search', class: 'btn'
+ = search_field_tag :search, params[:search], { placeholder: 'メンバーを名前で検索', class: 'form-control search-text-input input-mn-300' }
+ = button_tag '検索', class: 'btn'
- if current_user && current_user.can?(:manage_group, @group)
.pull-right
= button_tag class: 'btn btn-new js-toggle-button', type: 'button' do
- Add members
+ メンバーを追加
%i.fa.fa-chevron-down
.js-toggle-content.hide.new-group-member-holder
@@ -28,7 +29,7 @@
.panel.panel-default.prepend-top-20
.panel-heading
%strong #{@group.name}
- group members
+ グループのメンバー
%small
(#{@members.total_count})
%ul.well-list
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index 6c0d89c..bf1b1a1 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -1,12 +1,11 @@
%h3.page-title
- Issues
+ 課題
%p.light
- Only issues from
%strong #{@group.name}
- group are listed here.
+ グループの課題だけが表示されています。
- if current_user
- To see all issues you should visit #{link_to 'dashboard', issues_dashboard_path} page.
+ すべての課題を確認するには #{link_to 'ダッシュボード', issues_dashboard_path} を表示してください。
%hr
.append-bottom-20
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index 1ad7490..e788f90 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -1,12 +1,11 @@
%h3.page-title
- Merge Requests
+ マージリクエスト
%p.light
- Only merge requests from
%strong #{@group.name}
- group are listed here.
+ グループのマージリクエストだけが表示されています。
- if current_user
- To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
+ すべてのマージリクエストを確認するには #{link_to 'ダッシュボード', merge_requests_dashboard_path} を表示してください。
%hr
.append-bottom-20
= render 'shared/issuable_filter'
diff --git a/app/views/groups/milestones/index.html.haml b/app/views/groups/milestones/index.html.haml
index 57dc235..abaa6a5 100644
--- a/app/views/groups/milestones/index.html.haml
+++ b/app/views/groups/milestones/index.html.haml
@@ -1,11 +1,10 @@
%h3.page-title
- Milestones
- %span.pull-right #{@group_milestones.count} milestones
+ マイルストーン
+ %span.pull-right #{@group_milestones.count} 件
%p.light
- Only milestones from
%strong #{@group.name}
- group are listed here.
+ グループのマイルストーンだけが表示されています
%hr
@@ -15,27 +14,27 @@
%ul.well-list
- if @group_milestones.blank?
%li
- .nothing-here-block No milestones to show
+ .nothing-here-block マイルストーンがありません
- else
- @group_milestones.each do |milestone|
%li{class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: dom_id(milestone.milestones.first) }
.pull-right
- if can?(current_user, :manage_group, @group)
- if milestone.closed?
- = link_to 'Reopen Milestone', group_milestone_path(@group, milestone.safe_title, title: milestone.title, milestone: {state_event: :activate }), method: :put, class: "btn btn-sm btn-grouped btn-reopen"
+ = link_to 'マイルストーンを再オープン', group_milestone_path(@group, milestone.safe_title, title: milestone.title, milestone: {state_event: :activate }), method: :put, class: "btn btn-sm btn-grouped btn-reopen"
- else
- = link_to 'Close Milestone', group_milestone_path(@group, milestone.safe_title, title: milestone.title, milestone: {state_event: :close }), method: :put, class: "btn btn-sm btn-close"
+ = link_to 'マイルストーンをクローズ', group_milestone_path(@group, milestone.safe_title, title: milestone.title, milestone: {state_event: :close }), method: :put, class: "btn btn-sm btn-close"
%h4
= link_to_gfm truncate(milestone.title, length: 100), group_milestone_path(@group, milestone.safe_title, title: milestone.title)
%div
%div
= link_to group_milestone_path(@group, milestone.safe_title, title: milestone.title) do
- = pluralize milestone.issue_count, 'Issue'
+ #{milestone.issue_count}件の課題
= link_to group_milestone_path(@group, milestone.safe_title, title: milestone.title) do
- = pluralize milestone.merge_requests_count, 'Merge Request'
+ #{milestone.merge_requests_count}件のマージリクエスト
- %span.light #{milestone.percent_complete}% complete
+ %span.light #{milestone.percent_complete}% 完了
= milestone_progress_bar(milestone)
%div
%br
diff --git a/app/views/groups/milestones/show.html.haml b/app/views/groups/milestones/show.html.haml
index fea70f5..ac6f79d 100644
--- a/app/views/groups/milestones/show.html.haml
+++ b/app/views/groups/milestones/show.html.haml
@@ -1,30 +1,30 @@
%h4.page-title
.issue-box{ class: "issue-box-#{@group_milestone.closed? ? 'closed' : 'open'}" }
- if @group_milestone.closed?
- Closed
+ クローズ
- else
- Open
- Milestone #{@group_milestone.title}
+ オープン
+ マイルストーン #{@group_milestone.title}
.pull-right
- if can?(current_user, :manage_group, @group)
- if @group_milestone.active?
- = link_to 'Close Milestone', group_milestone_path(@group, @group_milestone.safe_title, title: @group_milestone.title, milestone: {state_event: :close }), method: :put, class: "btn btn-sm btn-close"
+ = link_to 'マイルストーンをクローズ', group_milestone_path(@group, @group_milestone.safe_title, title: @group_milestone.title, milestone: {state_event: :close }), method: :put, class: "btn btn-sm btn-close"
- else
- = link_to 'Reopen Milestone', group_milestone_path(@group, @group_milestone.safe_title, title: @group_milestone.title, milestone: {state_event: :activate }), method: :put, class: "btn btn-sm btn-grouped btn-reopen"
+ = link_to 'マイルストーンを再オープン', group_milestone_path(@group, @group_milestone.safe_title, title: @group_milestone.title, milestone: {state_event: :activate }), method: :put, class: "btn btn-sm btn-grouped btn-reopen"
%hr
- if (@group_milestone.total_items_count == @group_milestone.closed_items_count) && @group_milestone.active?
.alert.alert-success
- %span All issues for this milestone are closed. You may close the milestone now.
+ %span すべての課題がクローズされているため、マイルストーンをクローズできます
.description
%table.table
%thead
%tr
- %th Project
- %th Open issues
- %th State
- %th Due date
+ %th プロジェクト
+ %th オープンな課題
+ %th ステータス
+ %th 期日
- @group_milestone.milestones.each do |milestone|
%tr
%td
@@ -33,48 +33,48 @@
= milestone.issues.opened.count
%td
- if milestone.closed?
- Closed
+ クローズ
- else
- Open
+ オープン
%td
= milestone.expires_at
.context
%p.lead
- Progress:
- #{@group_milestone.closed_items_count} closed
+ 進捗:
+ #{@group_milestone.closed_items_count} クローズ
–
- #{@group_milestone.open_items_count} open
+ #{@group_milestone.open_items_count} オープン
= milestone_progress_bar(@group_milestone)
%ul.nav.nav-tabs
%li.active
= link_to '#tab-issues', 'data-toggle' => 'tab' do
- Issues
+ 課題
%span.badge= @group_milestone.issue_count
%li
= link_to '#tab-merge-requests', 'data-toggle' => 'tab' do
- Merge Requests
+ マージリクエスト
%span.badge= @group_milestone.merge_requests_count
%li
= link_to '#tab-participants', 'data-toggle' => 'tab' do
- Participants
+ 参加者
%span.badge= @group_milestone.participants.count
.tab-content
.tab-pane.active#tab-issues
.row
.col-md-6
- = render 'issues', title: "Open", issues: @group_milestone.opened_issues
+ = render 'issues', title: "オープン", issues: @group_milestone.opened_issues
.col-md-6
- = render 'issues', title: "Closed", issues: @group_milestone.closed_issues
+ = render 'issues', title: "クローズ", issues: @group_milestone.closed_issues
.tab-pane#tab-merge-requests
.row
.col-md-6
- = render 'merge_requests', title: "Open", merge_requests: @group_milestone.opened_merge_requests
+ = render 'merge_requests', title: "オープン", merge_requests: @group_milestone.opened_merge_requests
.col-md-6
- = render 'merge_requests', title: "Closed", merge_requests: @group_milestone.closed_merge_requests
+ = render 'merge_requests', title: "クローズ", merge_requests: @group_milestone.closed_merge_requests
.tab-pane#tab-participants
%ul.bordered-list
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index 6e17cda..e02957a 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -6,7 +6,7 @@
= render 'shared/group_form', f: f, autofocus: true
.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
@@ -16,4 +16,4 @@
= render 'shared/group_tips'
.form-actions
- = f.submit 'Create group', class: "btn btn-create", tabindex: 3
+ = f.submit 'グループを作成', class: "btn btn-create", tabindex: 3
diff --git a/app/views/groups/projects.html.haml b/app/views/groups/projects.html.haml
index dd1fa38..0a573ee 100644
--- a/app/views/groups/projects.html.haml
+++ b/app/views/groups/projects.html.haml
@@ -1,12 +1,12 @@
.panel.panel-default
.panel-heading
%strong= @group.name
- projects:
+ グループのプロジェクト:
- if can? current_user, :manage_group, @group
.panel-head-actions
= link_to new_project_path(namespace_id: @group.id), class: "btn btn-sm btn-success" do
%i.fa.fa-plus
- New Project
+ 新しいプロジェクト
%ul.well-list
- @projects.each do |project|
%li
@@ -16,10 +16,10 @@
%span.label.label-gray
= repository_size(project)
.pull-right
- = link_to 'Members', namespace_project_project_members_path(project.namespace, project), id: "edit_#{dom_id(project)}", class: "btn btn-sm"
- = link_to 'Edit', edit_namespace_project_path(project.namespace, project), id: "edit_#{dom_id(project)}", class: "btn btn-sm"
- = link_to 'Remove', project, data: { confirm: remove_project_message(project)}, method: :delete, class: "btn btn-sm btn-remove"
+ = link_to 'メンバー', namespace_project_project_members_path(project.namespace, project), id: "edit_#{dom_id(project)}", class: "btn btn-sm"
+ = link_to '編集', edit_namespace_project_path(project.namespace, project), id: "edit_#{dom_id(project)}", class: "btn btn-sm"
+ = link_to '削除', project, data: { confirm: remove_project_message(project)}, method: :delete, class: "btn btn-sm btn-remove"
- if @projects.blank?
- .nothing-here-block This group has no projects yet
+ .nothing-here-block このグループにはまだプロジェクトがありません
= paginate @projects, theme: "gitlab"
diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml
index 7b21ca3..d336192 100644
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@@ -4,159 +4,159 @@
.modal-header
%a.close{href: "#", "data-dismiss" => "modal"} ×
%h4
- Keyboard Shortcuts
+ キーボードショートカット
%small
- = link_to '(Show all)', '#', class: 'js-more-help-button'
+ = link_to '(すべて表示)', '#', class: 'js-more-help-button'
.modal-body.shortcuts-cheatsheet
.col-lg-4
%table.shortcut-mappings
%tbody
%tr
%th
- %th Global Shortcuts
+ %th グローバルショートカット
%tr
%td.shortcut
.key s
- %td Focus Search
+ %td 検索バーにフォーカス
%tr
%td.shortcut
.key ?
- %td Show this dialog
+ %td このダイアログを表示
%tbody
%tr
%th
- %th Project Files browsing
+ %th プロジェクトのファイル閲覧
%tr
%td.shortcut
.key
%i.fa.fa-arrow-up
- %td Move selection up
+ %td 選択位置を上に移動
%tr
%td.shortcut
.key
%i.fa.fa-arrow-down
- %td Move selection down
+ %td 選択位置を下に移動
%tr
%td.shortcut
.key enter
- %td Open Selection
+ %td 選択項目を開く
.col-lg-4
%table.shortcut-mappings
%tbody{ class: 'hidden-shortcut project', style: 'display:none' }
%tr
%th
- %th Global Dashboard
+ %th グローバルダッシュボード
%tr
%td.shortcut
.key g
.key a
%td
- Go to the activity feed
+ アクティビティフィードを表示
%tr
%td.shortcut
.key g
.key p
%td
- Go to projects
+ プロジェクトを表示
%tr
%td.shortcut
.key g
.key i
%td
- Go to issues
+ 課題を表示
%tr
%td.shortcut
.key g
.key m
%td
- Go to merge requests
+ マージリクエストを表示
%tbody
%tr
%th
- %th Project
+ %th プロジェクト
%tr
%td.shortcut
.key g
.key p
%td
- Go to the project's activity feed
+ プロジェクトのアクティビティフィードを表示
%tr
%td.shortcut
.key g
.key f
%td
- Go to files
+ ファイルを表示
%tr
%td.shortcut
.key g
.key c
%td
- Go to commits
+ コミットを表示
%tr
%td.shortcut
.key g
.key n
%td
- Go to network graph
+ ネットワークグラフを表示
%tr
%td.shortcut
.key g
.key g
%td
- Go to graphs
+ グラフを表示
%tr
%td.shortcut
.key g
.key i
%td
- Go to issues
+ 課題を表示
%tr
%td.shortcut
.key g
.key m
%td
- Go to merge requests
+ マージリクエストを表示
%tr
%td.shortcut
.key g
.key s
%td
- Go to snippets
+ スニペットを表示
.col-lg-4
%table.shortcut-mappings
%tbody{ class: 'hidden-shortcut network', style: 'display:none' }
%tr
%th
- %th Network Graph
+ %th ネットワークグラフ
%tr
%td.shortcut
.key
%i.fa.fa-arrow-left
\/
.key h
- %td Scroll left
+ %td 左へスクロール
%tr
%td.shortcut
.key
%i.fa.fa-arrow-right
\/
.key l
- %td Scroll right
+ %td 右へスクロール
%tr
%td.shortcut
.key
%i.fa.fa-arrow-up
\/
.key k
- %td Scroll up
+ %td 上へスクロール
%tr
%td.shortcut
.key
%i.fa.fa-arrow-down
\/
.key j
- %td Scroll down
+ %td 下へスクロール
%tr
%td.shortcut
.key
@@ -165,7 +165,7 @@
\/
.key
shift k
- %td Scroll to top
+ %td 最上部にスクロール
%tr
%td.shortcut
.key
@@ -174,31 +174,31 @@
\/
.key
shift j
- %td Scroll to bottom
+ %td 最下部にスクロール
%tbody{ class: 'hidden-shortcut issues', style: 'display:none' }
%tr
%th
- %th Issues
+ %th 課題
%tr
%td.shortcut
.key a
- %td Change assignee
+ %td 担当者を変更
%tr
%td.shortcut
.key m
- %td Change milestone
+ %td マイルストーンを変更
%tbody{ class: 'hidden-shortcut merge_reuests', style: 'display:none' }
%tr
%th
- %th Merge Requests
+ %th マージリクエスト
%tr
%td.shortcut
.key a
- %td Change assignee
+ %td 担当者を変更
%tr
%td.shortcut
.key m
- %td Change milestone
+ %td マイルストーンを変更
:javascript
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index af39dfe..c48436f 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -4,17 +4,17 @@
%span= Gitlab::VERSION
%small= Gitlab::REVISION
%p.slead
- GitLab is open source software to collaborate on code.
+ GitLabはコードを共同編集するためのオープンソースソフトウェアです。
%br
- Manage git repositories with fine grained access controls that keep your code secure.
+ Gitリポジトリをきめ細かくアクセス管理でき、あなたのソースコードを安全な状態に保ちます。
%br
- Perform code reviews and enhance collaboration with merge requests.
+ マージリクエストを使えば、ソースコードレビューや共同作業を向上することができます。
%br
- Each project can also have an issue tracker and a wiki.
+ 各プロジェクトには課題トラッカーとWikiを備えることができます。
%br
- Used by more than 100,000 organizations, GitLab is the most popular solution to manage git repositories on-premises.
+ GitLabは5万以上の組織で使われており、もっともポピュラーなオンプレミスGitリポジトリ管理のソリューションです。
%br
- Read more about GitLab at #{link_to promo_host, promo_url, target: '_blank'}.
+ GitLabについての詳細は #{link_to promo_host, promo_url, target: '_blank'} でご確認ください。
%hr
@@ -30,21 +30,21 @@
.col-md-4
.panel.panel-default
.panel-heading
- Quick help
+ クイックヘルプ
%ul.well-list
%li
- See our website for
- = link_to 'getting help', promo_url + '/getting-help/'
+ = link_to 'Webサイトのヘルプ', promo_url + '/getting-help/'
+ を見る
%li
- Use the
- = link_to 'search bar', '#', onclick: 'Shortcuts.focusSearch(event)'
- on the top of this page
+ ページトップの
+ = link_to '検索バー', '#', onclick: 'Shortcuts.focusSearch(event)'
+ を使う
%li
- Use
- = link_to 'shortcuts', '#', onclick: 'Shortcuts.showHelp(event)'
+ = link_to 'ショートカット', '#', onclick: 'Shortcuts.showHelp(event)'
+ を使う
%li
- Get a support
- = link_to 'subscription', 'https://about.gitlab.com/pricing/'
+ サポートサブスクリプションを
+ = link_to '購入', 'https://about.gitlab.com/pricing/'
%li
- = link_to 'Compare', 'https://about.gitlab.com/features/#compare'
- GitLab editions
+ GitLabのEditionを
+ = link_to '比較', 'https://about.gitlab.com/features/#compare'
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index fc8a487..69c1a57 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -2,7 +2,7 @@
.navbar-inner
.container
%div.app_logo
- = link_to root_path, class: "home has_bottom_tooltip", title: "Dashboard" do
+ = link_to root_path, class: "home has_bottom_tooltip", title: "ダッシュボード" do
= brand_header_logo
%h1.title= title
@@ -15,34 +15,34 @@
%li.hidden-sm.hidden-xs
= render "layouts/search"
%li.visible-sm.visible-xs
- = link_to search_path, title: "Search", class: 'has_bottom_tooltip', 'data-original-title' => 'Search area' do
+ = link_to search_path, title: "検索", class: 'has_bottom_tooltip', 'data-original-title' => '検索' do
%i.fa.fa-search
%li
- = link_to help_path, title: 'Help', class: 'has_bottom_tooltip',
- 'data-original-title' => 'Help' do
+ = link_to help_path, title: 'ヘルプ', class: 'has_bottom_tooltip',
+ 'data-original-title' => 'ヘルプ' do
%i.fa.fa-question-circle
%li
- = link_to explore_root_path, title: "Explore", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
+ = link_to explore_root_path, title: "探索", class: 'has_bottom_tooltip', 'data-original-title' => '公開エリア' do
%i.fa.fa-globe
%li
- = link_to user_snippets_path(current_user), title: "My snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'My snippets' do
+ = link_to user_snippets_path(current_user), title: "マイスニペット", class: 'has_bottom_tooltip', 'data-original-title' => 'マイスニペット' do
%i.fa.fa-clipboard
- if current_user.is_admin?
%li
- = link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do
+ = link_to admin_root_path, title: "管理", class: 'has_bottom_tooltip', 'data-original-title' => '管理' do
%i.fa.fa-cogs
- if current_user.can_create_project?
%li
- = link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project' do
+ = link_to new_project_path, title: "新規プロジェクト", class: 'has_bottom_tooltip', 'data-original-title' => '新規プロジェクト' do
%i.fa.fa-plus
%li
- = link_to profile_path, title: "Profile settings", class: 'has_bottom_tooltip', 'data-original-title' => 'Profile settings"' do
+ = link_to profile_path, title: "プロフィール設定", class: 'has_bottom_tooltip', 'data-original-title' => 'プロフィール設定' do
%i.fa.fa-user
%li
- = link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do
+ = link_to destroy_user_session_path, class: "logout", method: :delete, title: "ログアウト", class: 'has_bottom_tooltip', 'data-original-title' => 'ログアウト' do
%i.fa.fa-sign-out
%li.hidden-xs
- = link_to current_user, class: "profile-pic has_bottom_tooltip", id: 'profile-pic', 'data-original-title' => 'Your profile' do
- = image_tag avatar_icon(current_user.email, 60), alt: 'User activity'
+ = link_to current_user, class: "profile-pic has_bottom_tooltip", id: 'profile-pic', 'data-original-title' => 'あなたのプロフィール' do
+ = image_tag avatar_icon(current_user.email, 60), alt: 'ユーザアクティビティ'
= render 'shared/outdated_browser'
diff --git a/app/views/layouts/_public_head_panel.html.haml b/app/views/layouts/_public_head_panel.html.haml
index 3d6d2bf..3e7b6f5 100644
--- a/app/views/layouts/_public_head_panel.html.haml
+++ b/app/views/layouts/_public_head_panel.html.haml
@@ -12,11 +12,11 @@
- unless current_controller?('sessions')
.pull-right.hidden-xs
- = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-new append-right-10'
+ = link_to "サインイン", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-new append-right-10'
.navbar-collapse.collapse
%ul.nav.navbar-nav
%li.visible-xs
- = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes')
+ = link_to "サインイン", new_session_path(:user, redirect_to_referer: 'yes')
= render 'shared/outdated_browser'
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index ab84e87..c3a7805 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -1,6 +1,6 @@
!!! 5
%html{ lang: "en"}
- = render "layouts/head", title: "Admin area"
+ = render "layouts/head", title: "管理エリア"
%body{class: "#{app_theme} admin", :'data-page' => body_data_page}
- = render "layouts/head_panel", title: link_to("Admin area", admin_root_path)
+ = render "layouts/head_panel", title: link_to("管理エリア", admin_root_path)
= render 'layouts/page', sidebar: 'layouts/nav/admin'
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 6bd8ac4..7678620 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,6 +1,6 @@
!!! 5
%html{ lang: "en"}
- = render "layouts/head", title: "Dashboard"
+ = render "layouts/head", title: "ダッシュボード"
%body{class: "#{app_theme} application", :'data-page' => body_data_page }
- = render "layouts/head_panel", title: link_to("Dashboard", root_path)
+ = render "layouts/head_panel", title: link_to("ダッシュボード", root_path)
= render 'layouts/page', sidebar: 'layouts/nav/dashboard'
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index 6f805f1..c7d30fa 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -17,12 +17,12 @@
= brand_image
= brand_text
- else
- %h3 Open source software to collaborate on code
+ %h3 コード共同編集のためのオープンソース
%p
- Manage git repositories with fine grained access controls that keep your code secure.
- Perform code reviews and enhance collaboration with merge requests.
- Each project can also have an issue tracker and a wiki.
+ Gitリポジトリをきめ細かくアクセス管理でき、あなたのソースコードを安全な状態に保ちます。
+ マージリクエストを使えば、ソースコードレビューや共同作業を向上することができます。
+ 各プロジェクトには課題トラッカーとWikiを備えることができます。
- if extra_sign_in_text.present?
= markdown(extra_sign_in_text)
@@ -30,6 +30,6 @@
%hr
.container
.footer-links
- = link_to "Explore", explore_root_path
- = link_to "Documentation", "http://doc.gitlab.com/"
- = link_to "About GitLab", "https://about.gitlab.com/"
+ = link_to "探索", explore_root_path
+ = link_to "ドキュメント", "http://doc.gitlab.com/"
+ = link_to "GitLabについて", "https://about.gitlab.com/"
diff --git a/app/views/layouts/errors.html.haml b/app/views/layouts/errors.html.haml
index e51fd4c..eedda51 100644
--- a/app/views/layouts/errors.html.haml
+++ b/app/views/layouts/errors.html.haml
@@ -1,6 +1,6 @@
!!! 5
%html{ lang: "en"}
- = render "layouts/head", title: "Error"
+ = render "layouts/head", title: "エラー"
%body{class: "#{app_theme} application"}
= render "layouts/head_panel", title: "" if current_user
.container.navless-container
diff --git a/app/views/layouts/explore.html.haml b/app/views/layouts/explore.html.haml
index 2bd0b8d..e370258 100644
--- a/app/views/layouts/explore.html.haml
+++ b/app/views/layouts/explore.html.haml
@@ -1,4 +1,4 @@
-- page_title = 'Explore'
+- page_title = '探索'
!!! 5
%html{ lang: "en"}
= render "layouts/head", title: page_title
@@ -12,19 +12,19 @@
.content
.explore-title
%h3
- Explore GitLab
+ GitLabを探索
%p.lead
- Discover projects and groups. Share your projects with others
+ プロジェクトとグループを見つけましょう。あなたのプロジェクトをシェアしましょう
%ul.nav.nav-tabs
= nav_link(path: 'projects#trending') do
- = link_to 'Trending Projects', explore_root_path
+ = link_to 'トレンドプロジェクト', explore_root_path
= nav_link(path: 'projects#starred') do
- = link_to 'Most Starred Projects', starred_explore_projects_path
+ = link_to 'スターの多いプロジェクト', starred_explore_projects_path
= nav_link(path: 'projects#index') do
- = link_to 'All Projects', explore_projects_path
+ = link_to 'すべてのプロジェクト', explore_projects_path
= nav_link(controller: :groups) do
- = link_to 'All Groups', explore_groups_path
+ = link_to 'すべてのグループ', explore_groups_path
= yield
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index 2f38d59..2c40181 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -1,60 +1,60 @@
%ul.nav.nav-sidebar
= nav_link(controller: :dashboard, html_options: {class: 'home'}) do
- = link_to admin_root_path, title: "Stats" do
+ = link_to admin_root_path, title: "統計" do
%i.fa.fa-dashboard
%span
- Overview
+ 概要
= nav_link(controller: :projects) do
- = link_to admin_namespaces_projects_path, title: 'Projects' do
+ = link_to admin_namespaces_projects_path, title: 'プロジェクト' do
%i.fa.fa-cube
%span
- Projects
+ プロジェクト
= nav_link(controller: :users) do
- = link_to admin_users_path, title: 'Users' do
+ = link_to admin_users_path, title: 'ユーザ' do
%i.fa.fa-user
%span
- Users
+ ユーザ
= nav_link(controller: :groups) do
- = link_to admin_groups_path, title: 'Groups' do
+ = link_to admin_groups_path, title: 'グループ' do
%i.fa.fa-group
%span
- Groups
+ グループ
= nav_link(controller: :logs) do
- = link_to admin_logs_path, title: 'Logs' do
+ = link_to admin_logs_path, title: 'ログ' do
%i.fa.fa-file-text
%span
- Logs
+ ログ
= nav_link(controller: :broadcast_messages) do
- = link_to admin_broadcast_messages_path, title: 'Broadcast Messages' do
+ = link_to admin_broadcast_messages_path, title: 'メッセージ' do
%i.fa.fa-bullhorn
%span
- Messages
+ メッセージ
= nav_link(controller: :hooks) do
- = link_to admin_hooks_path, title: 'Hooks' do
+ = link_to admin_hooks_path, title: 'フック' do
%i.fa.fa-external-link
%span
- Hooks
+ フック
= nav_link(controller: :background_jobs) do
- = link_to admin_background_jobs_path, title: 'Background Jobs' do
+ = link_to admin_background_jobs_path, title: 'ジョブ' do
%i.fa.fa-cog
%span
- Background Jobs
+ ジョブ
= nav_link(controller: :applications) do
- = link_to admin_applications_path, title: 'Applications' do
+ = link_to admin_applications_path, title: 'アプリケーション' do
%i.fa.fa-cloud
%span
- Applications
+ アプリケーション
= nav_link(controller: :services) do
- = link_to admin_application_settings_services_path, title: 'Service Templates' do
+ = link_to admin_application_settings_services_path, title: 'サービステンプレート' do
%i.fa.fa-copy
%span
- Service Templates
+ サービステンプレート
= nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
- = link_to admin_application_settings_path, title: 'Settings' do
+ = link_to admin_application_settings_path, title: '設定' do
%i.fa.fa-cogs
%span
- Settings
+ 設定
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index e4f630c..721c2c3 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -1,38 +1,38 @@
%ul.nav.nav-sidebar
= nav_link(path: 'dashboard#show', html_options: {class: 'home'}) do
- = link_to root_path, title: 'Home', class: 'shortcuts-activity' do
+ = link_to root_path, title: 'ホーム', class: 'shortcuts-activity' do
%i.fa.fa-dashboard
%span
- Your Projects
+ プロジェクト
= nav_link(path: 'projects#starred') do
- = link_to starred_dashboard_projects_path, title: 'Starred Projects' do
+ = link_to starred_dashboard_projects_path, title: 'スターをつけたプロジェクト' do
%i.fa.fa-star
%span
- Starred Projects
+ スター
= nav_link(controller: :groups) do
- = link_to dashboard_groups_path, title: 'Groups' do
+ = link_to dashboard_groups_path, title: 'グループ' do
%i.fa.fa-group
%span
- Groups
+ グループ
= nav_link(controller: :milestones) do
- = link_to dashboard_milestones_path, title: 'Milestones' do
+ = link_to dashboard_milestones_path, title: 'マイルストーン' do
%i.fa.fa-clock-o
%span
- Milestones
+ マイルストーン
= nav_link(path: 'dashboard#issues') do
- = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'shortcuts-issues' do
+ = link_to assigned_issues_dashboard_path, title: '課題', class: 'shortcuts-issues' do
%i.fa.fa-exclamation-circle
%span
- Issues
+ 課題
%span.count= current_user.assigned_issues.opened.count
= nav_link(path: 'dashboard#merge_requests') do
- = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'shortcuts-merge_requests' do
+ = link_to assigned_mrs_dashboard_path, title: 'マージリクエスト', class: 'shortcuts-merge_requests' do
%i.fa.fa-tasks
%span
- Merge Requests
+ マージリクエスト
%span.count= current_user.assigned_merge_requests.opened.count
= nav_link(controller: :help) do
- = link_to help_path, title: 'Help' do
+ = link_to help_path, title: 'ヘルプ' do
%i.fa.fa-question-circle
%span
- Help
+ ヘルプ
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 32fe0e3..f9bfa92 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,41 +1,41 @@
%ul.nav.nav-sidebar
= nav_link(path: 'groups#show', html_options: {class: 'home'}) do
- = link_to group_path(@group), title: "Home" do
+ = link_to group_path(@group), title: "ホーム" do
%i.fa.fa-dashboard
%span
- Activity
+ アクティビティ
- if current_user
= nav_link(controller: [:group, :milestones]) do
- = link_to group_milestones_path(@group), title: 'Milestones' do
+ = link_to group_milestones_path(@group), title: 'マイルストーン' do
%i.fa.fa-clock-o
%span
- Milestones
+ マイルストーン
= nav_link(path: 'groups#issues') do
- = link_to issues_group_path(@group), title: 'Issues' do
+ = link_to issues_group_path(@group), title: '課題' do
%i.fa.fa-exclamation-circle
%span
- Issues
+ 課題
- if current_user
%span.count= Issue.opened.of_group(@group).count
= nav_link(path: 'groups#merge_requests') do
- = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
+ = link_to merge_requests_group_path(@group), title: 'マージリクエスト' do
%i.fa.fa-tasks
%span
- Merge Requests
+ マージリクエスト
- if current_user
%span.count= MergeRequest.opened.of_group(@group).count
= nav_link(controller: [:group_members]) do
- = link_to group_group_members_path(@group), title: 'Members' do
+ = link_to group_group_members_path(@group), title: 'メンバー' do
%i.fa.fa-users
%span
- Members
+ メンバー
- if can?(current_user, :manage_group, @group)
= nav_link(html_options: { class: "#{"active" if group_settings_page?} separate-item" }) do
- = link_to edit_group_path(@group), title: 'Settings', class: "tab no-highlight" do
+ = link_to edit_group_path(@group), title: '設定', class: "tab no-highlight" do
%i.fa.fa-cogs
%span
- Settings
+ 設定
%i.fa.fa-angle-down
- if group_settings_page?
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index d88e862..a33a915 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -1,50 +1,50 @@
%ul.nav.nav-sidebar
= nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
- = link_to profile_path, title: "Profile" do
+ = link_to profile_path, title: "プロフィール" do
%i.fa.fa-user
%span
- Profile
+ プロフィール
= nav_link(controller: :accounts) do
= link_to profile_account_path, title: 'Account' do
%i.fa.fa-gear
%span
- Account
+ アカウント
= nav_link(path: ['profiles#applications', 'applications#edit', 'applications#show', 'applications#new']) do
= link_to applications_profile_path, title: 'Applications' do
%i.fa.fa-cloud
%span
- Applications
+ アプリケーション
= nav_link(controller: :emails) do
= link_to profile_emails_path, title: 'Emails' do
%i.fa.fa-envelope-o
%span
- Emails
+ メール
%span.count= current_user.emails.count + 1
- unless current_user.ldap_user?
= nav_link(controller: :passwords) do
= link_to edit_profile_password_path, title: 'Password' do
%i.fa.fa-lock
%span
- Password
+ パスワード
= nav_link(controller: :notifications) do
= link_to profile_notifications_path, title: 'Notifications' do
%i.fa.fa-inbox
%span
- Notifications
+ 通知
= nav_link(controller: :keys) do
= link_to profile_keys_path, title: 'SSH Keys' do
%i.fa.fa-key
%span
- SSH Keys
+ SSHキー
%span.count= current_user.keys.count
= nav_link(path: 'profiles#design') do
= link_to design_profile_path, title: 'Design' do
%i.fa.fa-image
%span
- Design
+ デザイン
= nav_link(path: 'profiles#history') do
= link_to history_profile_path, title: 'History' do
%i.fa.fa-history
%span
- History
+ 履歴
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index d340ab1..f326e40 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -1,10 +1,10 @@
%ul.project-navigation.nav.nav-sidebar
- if @project_settings_nav
= nav_link do
- = link_to project_path(@project), title: 'Back to project', class: "" do
+ = link_to project_path(@project), title: 'プロジェクト', class: "" do
%i.fa.fa-caret-square-o-left
%span
- Back to project
+ プロジェクト
%li.separate-item
@@ -12,66 +12,66 @@
- else
= nav_link(path: 'projects#show', html_options: {class: "home"}) do
- = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
+ = link_to project_path(@project), title: 'プロジェクト', class: 'shortcuts-project' do
%i.fa.fa-dashboard
%span
- Project
+ プロジェクト
- if project_nav_tab? :files
= nav_link(controller: %w(tree blob blame edit_tree new_tree)) do
- = link_to namespace_project_tree_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'Files', class: 'shortcuts-tree' do
+ = link_to namespace_project_tree_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'ファイル', class: 'shortcuts-tree' do
%i.fa.fa-files-o
%span
- Files
+ ファイル
- if project_nav_tab? :commits
= nav_link(controller: %w(commit commits compare repositories tags branches)) do
- = link_to namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'Commits', class: 'shortcuts-commits' do
+ = link_to namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'コミット', class: 'shortcuts-commits' do
%i.fa.fa-history
%span
- Commits
+ コミット
- if project_nav_tab? :network
= nav_link(controller: %w(network)) do
- = link_to namespace_project_network_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'Network', class: 'shortcuts-network' do
+ = link_to namespace_project_network_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'ネットワーク', class: 'shortcuts-network' do
%i.fa.fa-code-fork
%span
- Network
+ ネットワーク
- if project_nav_tab? :graphs
= nav_link(controller: %w(graphs)) do
- = link_to namespace_project_graph_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'Graphs', class: 'shortcuts-graphs' do
+ = link_to namespace_project_graph_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'グラフ', class: 'shortcuts-graphs' do
%i.fa.fa-area-chart
%span
- Graphs
+ グラフ
= nav_link(controller: :milestones) do
- = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
+ = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'マイルストーン' do
%i.fa.fa-clock-o
%span
- Milestones
+ マイルストーン
- if project_nav_tab? :issues
= nav_link(controller: :issues) do
- = link_to url_for_project_issues, title: 'Issues', class: 'shortcuts-issues' do
+ = link_to url_for_project_issues, title: '課題', class: 'shortcuts-issues' do
%i.fa.fa-exclamation-circle
%span
- Issues
+ 課題
- if @project.default_issues_tracker?
%span.count.issue_counter= @project.issues.opened.count
- if project_nav_tab? :merge_requests
= nav_link(controller: :merge_requests) do
- = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do
+ = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'マージリクエスト', class: 'shortcuts-merge_requests' do
%i.fa.fa-tasks
%span
- Merge Requests
+ マージリクエスト
%span.count.merge_counter= @project.merge_requests.opened.count
= nav_link(controller: :labels) do
- = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do
+ = link_to namespace_project_labels_path(@project.namespace, @project), title: 'ラベル' do
%i.fa.fa-tags
%span
- Labels
+ ラベル
- if project_nav_tab? :wiki
= nav_link(controller: :wikis) do
@@ -82,14 +82,14 @@
- if project_nav_tab? :snippets
= nav_link(controller: :snippets) do
- = link_to namespace_project_snippets_path(@project.namespace, @project), title: 'Snippets', class: 'shortcuts-snippets' do
+ = link_to namespace_project_snippets_path(@project.namespace, @project), title: 'スニペット', class: 'shortcuts-snippets' do
%i.fa.fa-file-text-o
%span
- Snippets
+ スニペット
- if project_nav_tab? :settings
= nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do
- = link_to edit_project_path(@project), title: 'Settings', class: "stat-tab tab no-highlight" do
+ = link_to edit_project_path(@project), title: '設定', class: "stat-tab tab no-highlight" do
%i.fa.fa-cogs
%span
- Settings
+ 設定
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml
index 7eec93a..29e7d22 100644
--- a/app/views/layouts/notify.html.haml
+++ b/app/views/layouts/notify.html.haml
@@ -1,4 +1,4 @@
-%html{lang: "en"}
+%html{lang: "ja"}
%head
%meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
%title
@@ -37,7 +37,7 @@
\—
%br
- if @target_url
- #{link_to "View it on GitLab", @target_url}
+ #{link_to "GitLabで表示", @target_url}
= email_action @target_url
- if @project && !@disable_footer
- You're receiving this notification because you are a member of the #{link_to_unless @target_url, @project.name_with_namespace, namespace_project_url(@project.namespace, @project)} project team.
+ この通知は、あなたが #{link_to_unless @target_url, @project.name_with_namespace, namespace_project_url(@project.namespace, @project)} プロジェクトのメンバーであるため送信されています。
diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml
index 2b5be7f..f008cd1 100644
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
@@ -1,6 +1,6 @@
!!! 5
%html{ lang: "en"}
- = render "layouts/head", title: "Profile"
+ = render "layouts/head", title: "プロフィール"
%body{class: "#{app_theme} profile", :'data-page' => body_data_page}
- = render "layouts/head_panel", title: link_to("Profile", profile_path)
+ = render "layouts/head_panel", title: link_to("プロフィール", profile_path)
= render 'layouts/page', sidebar: 'layouts/nav/profile'
diff --git a/app/views/layouts/search.html.haml b/app/views/layouts/search.html.haml
index f9d8db0..6a1eff7 100644
--- a/app/views/layouts/search.html.haml
+++ b/app/views/layouts/search.html.haml
@@ -1,9 +1,9 @@
!!! 5
%html{ lang: "en"}
- = render "layouts/head", title: "Search"
+ = render "layouts/head", title: "検索"
%body{class: "#{app_theme} application", :'data-page' => body_data_page}
= render "layouts/broadcast"
- = render "layouts/head_panel", title: link_to("Search", search_path)
+ = render "layouts/head_panel", title: link_to("検索", search_path)
.container.navless-container
.content
= render "layouts/flash"
diff --git a/app/views/notify/closed_issue_email.html.haml b/app/views/notify/closed_issue_email.html.haml
index 56c18cd..f62561d 100644
--- a/app/views/notify/closed_issue_email.html.haml
+++ b/app/views/notify/closed_issue_email.html.haml
@@ -1,2 +1,2 @@
%p
- = "Issue was closed by #{@updated_by.name}"
+ = "#{@updated_by.name} が課題を「解決」に変更しました。"
diff --git a/app/views/notify/closed_merge_request_email.html.haml b/app/views/notify/closed_merge_request_email.html.haml
index 574e8bf..41a8cec 100644
--- a/app/views/notify/closed_merge_request_email.html.haml
+++ b/app/views/notify/closed_merge_request_email.html.haml
@@ -1,2 +1,2 @@
%p
- = "Merge Request ##{@merge_request.iid} was closed by #{@updated_by.name}"
+ = "#{@updated_by.name} がマージリクエスト ##{@merge_request.iid} をクロースしました。"
diff --git a/app/views/notify/closed_merge_request_email.text.haml b/app/views/notify/closed_merge_request_email.text.haml
index 59db86b..f2088e0 100644
--- a/app/views/notify/closed_merge_request_email.text.haml
+++ b/app/views/notify/closed_merge_request_email.text.haml
@@ -1,8 +1,8 @@
-= "Merge Request ##{@merge_request.iid} was closed by #{@updated_by.name}"
+= "マージリクエスト ##{@merge_request.iid} は #{@updated_by.name} にクローズされました"
-Merge Request url: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)}
+マージリクエストのURL: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)}
= merge_path_description(@merge_request, 'to')
-Author: #{@merge_request.author_name}
-Assignee: #{@merge_request.assignee_name}
+作成者: #{@merge_request.author_name}
+担当者: #{@merge_request.assignee_name}
diff --git a/app/views/notify/group_access_granted_email.html.haml b/app/views/notify/group_access_granted_email.html.haml
index f1916d6..126208d 100644
--- a/app/views/notify/group_access_granted_email.html.haml
+++ b/app/views/notify/group_access_granted_email.html.haml
@@ -1,4 +1,4 @@
%p
- = "You have been granted #{@group_member.human_access} access to group"
+ = "あなたに以下のグループへの #{@group_member.human_access} レベルのアクセス権が付与されました。"
= link_to group_url(@group) do
= @group.name
diff --git a/app/views/notify/issue_status_changed_email.html.haml b/app/views/notify/issue_status_changed_email.html.haml
index 482c884..61dfc0a 100644
--- a/app/views/notify/issue_status_changed_email.html.haml
+++ b/app/views/notify/issue_status_changed_email.html.haml
@@ -1,2 +1,2 @@
%p
- = "Issue was #{@issue_status} by #{@updated_by.name}"
+ = "#{@updated_by.name} が課題のステータスを #{@issue_status} に変更しました。"
diff --git a/app/views/notify/merged_merge_request_email.html.haml b/app/views/notify/merged_merge_request_email.html.haml
index 6762fae..3dcf472 100644
--- a/app/views/notify/merged_merge_request_email.html.haml
+++ b/app/views/notify/merged_merge_request_email.html.haml
@@ -1,2 +1,2 @@
%p
- = "Merge Request ##{@merge_request.iid} was merged"
+ = "マージリクエスト ##{@merge_request.iid} はマージされました"
diff --git a/app/views/notify/new_email_email.html.haml b/app/views/notify/new_email_email.html.haml
index 4a0448a..f8287c3 100644
--- a/app/views/notify/new_email_email.html.haml
+++ b/app/views/notify/new_email_email.html.haml
@@ -1,10 +1,10 @@
%p
- Hi #{@user.name}!
+ こんにちは #{@user.name} さん！
%p
- A new email was added to your account:
+ 以下の新しいメールアドレスがあなたのアカウントに追加されました。
%p
- email:
+ メールアドレス:
%code= @email.email
%p
- If this email was added in error, you can remove it here:
- = link_to "Emails", profile_emails_url
+ もしこのメールアドレスが誤って追加したものである場合、以下から削除できます。
+ = link_to "メールアドレス", profile_emails_url
diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml
index 03cbee9..1c5cf26 100644
--- a/app/views/notify/new_issue_email.html.haml
+++ b/app/views/notify/new_issue_email.html.haml
@@ -3,4 +3,4 @@
- if @issue.assignee_id.present?
%p
- Assignee: #{@issue.assignee_name}
+ 担当者: #{@issue.assignee_name}
diff --git a/app/views/notify/new_issue_email.text.erb b/app/views/notify/new_issue_email.text.erb
index 0cc6293..be29b0a 100644
--- a/app/views/notify/new_issue_email.text.erb
+++ b/app/views/notify/new_issue_email.text.erb
@@ -1,5 +1,5 @@
-New Issue was created.
+新しい課題が作成されました。
-Issue <%= @issue.iid %>: <%= url_for(namespace_project_issue_url(@issue.project.namespace, @issue.project, @issue)) %>
-Author: <%= @issue.author_name %>
-Asignee: <%= @issue.assignee_name %>
+課題 <%= @issue.iid %>: <%= url_for(namespace_project_issue_url(@issue.project.namespace, @issue.project, @issue)) %>
+作成者: <%= @issue.author_name %>
+担当者: <%= @issue.assignee_name %>
diff --git a/app/views/notify/new_merge_request_email.text.erb b/app/views/notify/new_merge_request_email.text.erb
index f08039a..99bb1ca 100644
--- a/app/views/notify/new_merge_request_email.text.erb
+++ b/app/views/notify/new_merge_request_email.text.erb
@@ -1,8 +1,8 @@
-New Merge Request #<%= @merge_request.iid %>
+新しいマージリクエスト #<%= @merge_request.iid %>
<%= url_for(namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)) %>
<%= merge_path_description(@merge_request, 'to') %>
-Author: <%= @merge_request.author_name %>
-Asignee: <%= @merge_request.assignee_name %>
+作成者: <%= @merge_request.author_name %>
+担当者: <%= @merge_request.assignee_name %>
diff --git a/app/views/notify/new_ssh_key_email.html.haml b/app/views/notify/new_ssh_key_email.html.haml
index 63b0cbb..7f11b3c 100644
--- a/app/views/notify/new_ssh_key_email.html.haml
+++ b/app/views/notify/new_ssh_key_email.html.haml
@@ -1,10 +1,10 @@
%p
- Hi #{@user.name}!
+ こんにちは #{@user.name} さん！
%p
- A new public key was added to your account:
+ 新しい公開鍵があなたのアカウントに追加されました。
%p
- title:
+ タイトル:
%code= @key.title
%p
- If this key was added in error, you can remove it under
- = link_to "SSH Keys", profile_keys_url
+ もしこのキーが誤って追加されたものである場合、以下から削除できます。
+ = link_to "SSHキー", profile_keys_url
diff --git a/app/views/notify/new_user_email.html.haml b/app/views/notify/new_user_email.html.haml
index ebbe98d..d520db7 100644
--- a/app/views/notify/new_user_email.html.haml
+++ b/app/views/notify/new_user_email.html.haml
@@ -1,14 +1,15 @@
%p
- Hi #{@user['name']}!
+ こんにちは #{@user['name']} さん！
%p
- if Gitlab.config.gitlab.signup_enabled
- Your account has been created successfully.
+ あなたのアカウントが正常に作成されました。
- else
- The Administrator created an account for you. Now you are a member of the company GitLab application.
+ 管理者があなたのアカウントを作成しました。
+ これであなたも社内GitLabアプリケーションのメンバーです。
%p
- login..........................................
+ ログイン..................................
%code= @user['email']
- if @user.created_by_id
%p
- = link_to "Click here to set your password", edit_password_url(@user, :reset_password_token => @token)
+ = link_to "クリックしてパスワードを設定", edit_password_url(@user, :reset_password_token => @token)
diff --git a/app/views/notify/note_commit_email.text.erb b/app/views/notify/note_commit_email.text.erb
index aaeaf5f..98e986a 100644
--- a/app/views/notify/note_commit_email.text.erb
+++ b/app/views/notify/note_commit_email.text.erb
@@ -1,9 +1,9 @@
-New comment for Commit <%= @commit.short_id %>
+コミット <%= @commit.short_id %> への新しいコメント
<%= url_for(namespace_project_commit_url(@note.project.namespace, @note.project, id: @commit.id, anchor: "note_#{@note.id}")) %>
-Author: <%= @note.author_name %>
+担当者: <%= @note.author_name %>
<%= @note.note %>
diff --git a/app/views/notify/note_issue_email.text.erb b/app/views/notify/note_issue_email.text.erb
index e33cbcd..65f82cd 100644
--- a/app/views/notify/note_issue_email.text.erb
+++ b/app/views/notify/note_issue_email.text.erb
@@ -1,9 +1,9 @@
-New comment for Issue <%= @issue.iid %>
+課題 <%= @issue.iid %> への新しいコメント
<%= url_for(namespace_project_issue_url(@issue.project.namespace, @issue.project, @issue, anchor: "note_#{@note.id}")) %>
-Author: <%= @note.author_name %>
+担当者: <%= @note.author_name %>
<%= @note.note %>
diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml
index 65f0e4c..90a7485 100644
--- a/app/views/notify/note_merge_request_email.html.haml
+++ b/app/views/notify/note_merge_request_email.html.haml
@@ -1,6 +1,6 @@
- if @note.diff_file_name
%p.details
- New comment on diff for
+ 差分への新しいコメント：
= link_to @note.diff_file_name, @target_url
\:
diff --git a/app/views/notify/note_merge_request_email.text.erb b/app/views/notify/note_merge_request_email.text.erb
index 1d14119..874f59b 100644
--- a/app/views/notify/note_merge_request_email.text.erb
+++ b/app/views/notify/note_merge_request_email.text.erb
@@ -1,4 +1,4 @@
-New comment for Merge Request <%= @merge_request.iid %>
+マージリクエスト <%= @merge_request.iid %> への新しいコメント
<%= url_for(namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")) %>
diff --git a/app/views/notify/project_access_granted_email.html.haml b/app/views/notify/project_access_granted_email.html.haml
index dfc30a2..276c4e7 100644
--- a/app/views/notify/project_access_granted_email.html.haml
+++ b/app/views/notify/project_access_granted_email.html.haml
@@ -1,5 +1,5 @@
%p
- = "You have been granted #{@project_member.human_access} access to project"
+ = "あなたに以下のプロジェクトへの #{@project_member.human_access} レベルのアクセス権が付与されました。"
%p
= link_to namespace_project_url(@project.namespace, @project) do
= @project.name_with_namespace
diff --git a/app/views/notify/project_was_moved_email.html.haml b/app/views/notify/project_was_moved_email.html.haml
index 3cd759f..efb0798 100644
--- a/app/views/notify/project_was_moved_email.html.haml
+++ b/app/views/notify/project_was_moved_email.html.haml
@@ -1,15 +1,15 @@
%p
- Project was moved to another location
+ プロジェクトが別の場所へ移動されました。
%p
- The project is now located under
+ プロジェクトは以下の場所にあります。
= link_to namespace_project_url(@project.namespace, @project) do
= @project.name_with_namespace
%p
- To update the remote url in your local repository run (for ssh):
+ リモートURL(SSH)を更新するには、ローカルリポジトリで以下を実行してください。
%p{ style: "background: #f5f5f5; padding:10px; border:1px solid #ddd" }
git remote set-url origin #{@project.ssh_url_to_repo}
%p
- or for http(s):
+ HTTP(S)のURLの場合は以下を実行してください。
%p{ style: "background: #f5f5f5; padding:10px; border:1px solid #ddd" }
git remote set-url origin #{@project.http_url_to_repo}
%br
diff --git a/app/views/notify/repository_push_email.html.haml b/app/views/notify/repository_push_email.html.haml
index 039b92d..7798abd 100644
--- a/app/views/notify/repository_push_email.html.haml
+++ b/app/views/notify/repository_push_email.html.haml
@@ -1,12 +1,12 @@
-%h3 #{@author.name} pushed to #{@branch} at #{link_to @project.name_with_namespace, namespace_project_url(@project.namespace, @project)}
+%h3 #{@author.name} が #{link_to @project.name_with_namespace, namespace_project_url(@project.namespace, @project)} の #{@branch} ブランチへプッシュしました
- if @reverse_compare
%p
- %strong WARNING:
- The push did not contain any new commits, but force pushed to delete the commits and changes below.
+ %strong 警告:
+ このプッシュは新しいコミットを含みませんが、以下のコミットと変更を削除するために強制プッシュされました。
%h4
- = @reverse_compare ? "Deleted commits:" : "Commits:"
+ = @reverse_compare ? "削除されたコミット:" : "コミット:"
%ul
- @commits.each do |commit|
@@ -18,7 +18,7 @@
%pre.commit-message
= commit.safe_message
-%h4 #{pluralize @diffs.count, "changed file"}:
+%h4 #{@diffs.count}件の変更されたファイル:
%ul
- @diffs.each_with_index do |diff, i|
@@ -40,7 +40,7 @@
= diff.new_path
- unless @disable_diffs
- %h4 Changes:
+ %h4 変更:
- @diffs.each_with_index do |diff, i|
%li{id: "diff-#{i}"}
%a{href: @target_url + "#diff-#{i}"}
@@ -63,4 +63,4 @@
%br
- if @compare.timeout
- %h5 Huge diff. To prevent performance issues changes are hidden
+ %h5 差分が大きいため、パフォーマンス悪化を防ぐため差分は表示されていません。
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml
index 6bafcb5..744a5a7 100644
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@@ -1,41 +1,42 @@
%h3.page-title
- Account Settings
+ アカウント設定
%p.light
- You can change your username and private token here.
+ ユーザ名とプライベートトークンを変更することができます。
- if current_user.ldap_user?
- Some options are unavailable for LDAP accounts
+ いくつかのオプションはLDAPアカウントでは利用できません。
%hr
.account-page
%fieldset.update-token
%legend
- Reset Private token
+ プライベートトークンのリセット
%div
= form_for @user, url: reset_private_token_profile_path, method: :put do |f|
.data
%p
- Your private token is used to access application resources without authentication.
+ プライベートトークンは認証なしでアプリケーションのリソースにアクセスするのに使われます。
%br
- It can be used for atom feeds or the API.
+ ATOMフィードやAPIでのアクセスに利用できます。
%span.cred
- Keep it secret!
+ 厳重に保管してください
+ 。
%p.cgray
- if current_user.private_token
= text_field_tag "token", current_user.private_token, class: "form-control"
%div
- = f.submit 'Reset private token', data: { confirm: "Are you sure?" }, class: "btn btn-primary btn-build-token"
+ = f.submit 'プライベートトークンをリセット', data: { confirm: "リセットしてよろしいですか？" }, class: "btn btn-primary btn-build-token"
- else
- %span You don`t have one yet. Click generate to fix it.
- = f.submit 'Generate', class: "btn success btn-build-token"
+ %span トークンがありません。「生成」をクリックして生成してください。
+ = f.submit '生成', class: "btn success btn-build-token"
- if show_profile_social_tab?
%fieldset
- %legend Social Accounts
+ %legend ソーシャルアカウント
.oauth_select_holder.append-bottom-10
- %p Click on icon to activate signin with one of the following services
+ %p 以下の各サービスを使ったサインインを有効化するには、アイコンをクリックしてください。
- enabled_social_providers.each do |provider|
%span{class: oauth_active_class(provider) }
= link_to authbutton(provider, 32), omniauth_authorize_path(User, provider)
@@ -43,36 +44,36 @@
- if show_profile_username_tab?
%fieldset.update-username
%legend
- Change Username
+ ユーザ名の変更
= form_for @user, url: update_username_profile_path, method: :put, remote: true do |f|
%p
- Changing your username will change path to all personal projects!
+ 注意：ユーザ名を変更すると、あなたの所有するすべてのプロジェクトのパスが変更されます。
%div
= f.text_field :username, required: true, class: 'form-control'
.loading-gif.hide
%p
%i.fa.fa-spinner.fa-spin
- Saving new username
+ ユーザ名を保存しています
%p.light
= user_url(@user)
%div
- = f.submit 'Save username', class: "btn btn-warning"
+ = f.submit 'ユーザ名を保存', class: "btn btn-warning"
- if show_profile_remove_tab?
%fieldset.remove-account
%legend
- Remove account
+ アカウントの削除
%div
- %p Deleting an account has the following effects:
+ %p アカウントを削除すると以下の影響があります。
%ul
- %li All user content like authored issues, snippets, comments will be removed
+ %li 課題、スニペット、コメントといった、このユーザが作成したすべてのコンテンツが削除されます
- rp = current_user.personal_projects.count
- unless rp.zero?
- %li #{pluralize rp, 'personal project'} will be removed and cannot be restored
+ %li #{rp}個の個人プロジェクトが削除され、元に戻すことはできません
- if current_user.solo_owned_groups.present?
%li
- The following groups will be abandoned. You should transfer or remove them:
+ 以下のグループが破棄されます。移譲しなければ、削除されます。
%strong #{current_user.solo_owned_groups.map(&:name).join(', ')}
- = link_to 'Delete account', user_registration_path, data: { confirm: "REMOVE #{current_user.name}? Are you sure?" }, method: :delete, class: "btn btn-remove"
+ = link_to 'アカウントを削除', user_registration_path, data: { confirm: "#{current_user.name}を削除します。本当によろしいですか？" }, method: :delete, class: "btn btn-remove"
diff --git a/app/views/profiles/applications.html.haml b/app/views/profiles/applications.html.haml
index 97e9894..870c7af 100644
--- a/app/views/profiles/applications.html.haml
+++ b/app/views/profiles/applications.html.haml
@@ -1,18 +1,18 @@
%h3.page-title
- Application Settings
+ アプリケーション設定
%p.light
- OAuth2 protocol settings below.
+ 以下では OAuth2 プロトコルの設定を行います。
%fieldset.oauth-applications
- %legend Your applications
- %p= link_to 'New Application', new_oauth_application_path, class: 'btn btn-success'
+ %legend あなたのアプリケーション
+ %p= link_to '新しいアプリケーション', new_oauth_application_path, class: 'btn btn-success'
- if @applications.any?
%table.table.table-striped
%thead
%tr
- %th Name
- %th Callback URL
- %th Clients
+ %th 名前
+ %th コールバックURL
+ %th クライアント
%th
%th
%tbody
@@ -23,19 +23,19 @@
- application.redirect_uri.split.each do |uri|
%div= uri
%td= application.access_tokens.count
- %td= link_to 'Edit', edit_oauth_application_path(application), class: 'btn btn-link btn-sm'
+ %td= link_to '編集', edit_oauth_application_path(application), class: 'btn btn-link btn-sm'
%td= render 'doorkeeper/applications/delete_form', application: application
%fieldset.oauth-authorized-applications.prepend-top-20
- %legend Authorized applications
+ %legend 認可済みアプリケーション
- if @authorized_tokens.any?
%table.table.table-striped
%thead
%tr
- %th Name
- %th Authorized At
- %th Scope
+ %th 名前
+ %th 認可日
+ %th スコープ
%th
%tbody
- @authorized_apps.each do |app|
@@ -46,4 +46,4 @@
%td= token.scopes
%td= render 'doorkeeper/authorized_applications/delete_form', application: app
- else
- %p.light You dont have any authorized applications
+ %p.light 認可済みアプリケーションはありません
diff --git a/app/views/profiles/design.html.haml b/app/views/profiles/design.html.haml
index cc00d08..b11923c 100644
--- a/app/views/profiles/design.html.haml
+++ b/app/views/profiles/design.html.haml
@@ -1,49 +1,49 @@
%h3.page-title
- Design Settings
+ デザイン設定
%p.light
- Appearance settings will be saved to your profile and made available across all devices.
+ デザイン設定はあなたのプロフィールに保存され、どの端末からでも利用できます。
%hr
= form_for @user, url: profile_path, remote: true, method: :put do |f|
%fieldset.application-theme
%legend
- Application theme
+ アプリケーションテーマ
.themes_opts
= label_tag do
.prev.default
= f.radio_button :theme_id, 1
- Default
+ デフォルト
= label_tag do
.prev.classic
= f.radio_button :theme_id, 2
- Classic
+ クラシック
= label_tag do
.prev.modern
= f.radio_button :theme_id, 3
- Modern
+ モダン
= label_tag do
.prev.gray
= f.radio_button :theme_id, 4
- Gray
+ グレー
= label_tag do
.prev.violet
= f.radio_button :theme_id, 5
- Violet
+ バイオレット
= label_tag do
.prev.blue
= f.radio_button :theme_id, 6
- Blue
+ ブルー
%br
.clearfix
%fieldset.code-preview-theme
%legend
- Code preview theme
+ コードプレビューテーマ
.code_highlight_opts
- color_schemes.each do |color_scheme_id, color_scheme|
= label_tag do
diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml
index 9d8f33c..a10c92f 100644
--- a/app/views/profiles/emails/index.html.haml
+++ b/app/views/profiles/emails/index.html.haml
@@ -1,37 +1,37 @@
%h3.page-title
- Email Settings
+ メールアドレス設定
%p.light
- Your
- %b Primary Email
- will be used for avatar detection and web based operations, such as edits and merges.
+ あなたの
+ %b プライマリメールアドレス
+ はアバターの検出やWebベースの操作(編集やマージなど)に使用されます。
%br
- Your
- %b Notification Email
- will be used for account notifications.
+ あなたの
+ %b 通知メールアドレス
+ はアカウントの通知に使用されます。
%br
- All email addresses will be used to identify your commits.
+ すべてのメールアドレスはあなたのコミットの識別に使用されます。
%hr
.panel.panel-default
.panel-heading
- Emails (#{@emails.count + 1})
+ メールアドレス (#{@emails.count + 1})
%ul.well-list#emails-table
%li
%strong= @primary
- %span.label.label-success Primary Email
+ %span.label.label-success プライマリメールアドレス
- @emails.each do |email|
%li
%strong= email.email
%span.cgray
- added #{time_ago_with_tooltip(email.created_at)}
- = link_to 'Remove', profile_email_path(email), data: { confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-sm btn-remove pull-right'
+ #{time_ago_with_tooltip(email.created_at)} に追加
+ = link_to '削除', profile_email_path(email), data: { confirm: '本当に削除しますか？'}, method: :delete, class: 'btn btn-sm btn-remove pull-right'
-%h4 Add email address
+%h4 メールアドレスの追加
= form_for 'email', url: profile_emails_path, html: { class: 'form-horizontal' } do |f|
.form-group
- = f.label :email, class: 'control-label'
+ = f.label :email, 'メールアドレス', class: 'control-label'
.col-sm-10
= f.text_field :email, class: 'form-control'
.form-actions
- = f.submit 'Add email address', class: 'btn btn-create'
+ = f.submit 'メールアドレスを追加', class: 'btn btn-create'
diff --git a/app/views/profiles/groups/index.html.haml b/app/views/profiles/groups/index.html.haml
new file mode 100644
index 0000000..620f066
--- /dev/null
+++ b/app/views/profiles/groups/index.html.haml
@@ -0,0 +1,39 @@
+%h3.page-title
+ グループ
+ - if current_user.can_create_group?
+ %span.pull-right
+ = link_to new_group_path, class: "btn btn-new" do
+ %i.fa.fa-plus
+ 新しいグループ
+%p.light
+ グループのメンバーは、そのグループに属するすべてのプロジェクトにアクセスできます。
+%hr
+.panel.panel-default
+ .panel-heading
+ %strong グループ
+ (#{@user_groups.count})
+ %ul.well-list
+ - @user_groups.each do |user_group|
+ - group = user_group.group
+ %li
+ .pull-right
+ - if can?(current_user, :manage_group, group)
+ = link_to edit_group_path(group), class: "btn-small btn btn-grouped" do
+ %i.fa.fa-cogs
+ 設定
+
+ - if can?(current_user, :destroy, user_group)
+ = link_to leave_profile_group_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-small btn btn-grouped", title: 'ユーザをグループから削除' do
+ %i.fa.fa-sign-out
+ 離脱
+
+ = link_to group, class: 'group-name' do
+ %strong= group.name
+
+ as
+ %strong #{user_group.human_access}
+
+ %div.light
+ #{group.projects.count}プロジェクト, #{group.users.count}ユーザ
+
+= paginate @user_groups
diff --git a/app/views/profiles/history.html.haml b/app/views/profiles/history.html.haml
index 9cafe03..8a28141 100644
--- a/app/views/profiles/history.html.haml
+++ b/app/views/profiles/history.html.haml
@@ -1,7 +1,7 @@
%h3.page-title
- My Account History
+ アカウント履歴
%p.light
- All events created by your account are listed below.
+ あなたのアカウントで作成されたすべてのイベントが表示されます。
%hr
.profile_history
= render @events
diff --git a/app/views/profiles/keys/_form.html.haml b/app/views/profiles/keys/_form.html.haml
index f905417..c054988 100644
--- a/app/views/profiles/keys/_form.html.haml
+++ b/app/views/profiles/keys/_form.html.haml
@@ -7,15 +7,15 @@
%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
= f.text_area :key, class: "form-control", rows: 8
.form-actions
- = f.submit 'Add key', class: "btn btn-create"
- = link_to "Cancel", profile_keys_path, class: "btn btn-cancel"
+ = f.submit 'キーを追加', class: "btn btn-create"
+ = link_to "キャンセル", profile_keys_path, class: "btn btn-cancel"
diff --git a/app/views/profiles/keys/_key.html.haml b/app/views/profiles/keys/_key.html.haml
index fe5770f..e387e51 100644
--- a/app/views/profiles/keys/_key.html.haml
+++ b/app/views/profiles/keys/_key.html.haml
@@ -7,6 +7,6 @@
(#{key.fingerprint})
%td
%span.cgray
- added #{time_ago_with_tooltip(key.created_at)}
+ #{time_ago_with_tooltip(key.created_at)} に追加
%td
- = link_to 'Remove', path_to_key(key, is_admin), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-sm btn-remove delete-key pull-right"
+ = link_to '削除', path_to_key(key, is_admin), data: { confirm: '本当に削除しますか？'}, method: :delete, class: "btn btn-sm btn-remove delete-key pull-right"
diff --git a/app/views/profiles/keys/_key_details.html.haml b/app/views/profiles/keys/_key_details.html.haml
index 8bac22a..8c97a4e 100644
--- a/app/views/profiles/keys/_key_details.html.haml
+++ b/app/views/profiles/keys/_key_details.html.haml
@@ -3,20 +3,20 @@
.col-md-4
.panel.panel-default
.panel-heading
- SSH Key
+ SSHキー
%ul.well-list
%li
- %span.light Title:
+ %span.light タイトル:
%strong= @key.title
%li
- %span.light Created on:
- %strong= @key.created_at.stamp("Aug 21, 2011")
+ %span.light 作成日:
+ %strong= @key.created_at.stamp("2011/08/21")
.col-md-8
%p
- %span.light Fingerprint:
+ %span.light フィンガープリント:
%strong= @key.fingerprint
%pre.well-pre
= @key.key
.pull-right
- = link_to 'Remove', path_to_key(@key, is_admin), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key"
+ = link_to '削除', path_to_key(@key, is_admin), data: {confirm: '本当に削除しますか？'}, method: :delete, class: "btn btn-remove delete-key"
diff --git a/app/views/profiles/keys/_key_table.html.haml b/app/views/profiles/keys/_key_table.html.haml
index ef0075a..e3b1f89 100644
--- a/app/views/profiles/keys/_key_table.html.haml
+++ b/app/views/profiles/keys/_key_table.html.haml
@@ -4,9 +4,9 @@
%table.table
%thead.panel-heading
%tr
- %th Title
- %th Fingerprint
- %th Added at
+ %th タイトル
+ %th フィンガープリント
+ %th 登録日
%th
%tbody
- @keys.each do |key|
@@ -14,6 +14,6 @@
- else
.nothing-here-block
- if is_admin
- User has no ssh keys
+ このユーザのSSHキーはありません
- else
- There are no SSH keys with access to your account.
+ あなたのアカウントにアクセスできるSSHキーはありません
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index 965d5e0..9517a0b 100644
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -1,12 +1,12 @@
%h3.page-title
- SSH Keys Settings
+ SSHキー設定
.pull-right
- = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new"
+ = link_to "SSHキーを追加", new_profile_key_path, class: "btn btn-new"
%p.light
- My SSH keys: #{@keys.count}
+ マイSSHキー: #{@keys.count}
%br
- Before you can add an SSH key you need to
- = link_to "generate it.", help_page_path("ssh", "README")
+ SSHキーを追加する前に
+ = link_to "SSHキーを生成してください", help_page_path("ssh", "README")
%hr
= render 'key_table'
diff --git a/app/views/profiles/keys/new.html.haml b/app/views/profiles/keys/new.html.haml
index ccec716..d7a8cdb 100644
--- a/app/views/profiles/keys/new.html.haml
+++ b/app/views/profiles/keys/new.html.haml
@@ -1,6 +1,6 @@
-%h3.page-title Add an SSH Key
+%h3.page-title SSHキーを追加
%p.light
- Paste your public key here. Read more about how to generate a key on #{link_to "the SSH help page", help_page_path("ssh", "README")}.
+ 公開鍵をペーストしてください。SSHキーの生成方法についての詳細は #{link_to "SSHヘルプページ", help_page_path("ssh", "README")} をご確認ください。
%hr
= render 'form'
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index 273e72f..f026046 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -1,7 +1,7 @@
%h3.page-title
- Notifications Settings
+ 通知設定
%p.light
- These are your global notification settings.
+ これらはグローバルな通知設定です。
%hr
= form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications form-horizontal global-notifications-form' } do |f|
@@ -14,53 +14,53 @@
= hidden_field_tag :notification_type, 'global'
.form-group
- = f.label :notification_email, class: "control-label"
+ = f.label :notification_email, '通知メールアドレス', class: "control-label"
.col-sm-10
= f.select :notification_email, @user.all_emails, { include_blank: false }, class: "form-control"
.form-group
- = f.label :notification_level, class: 'control-label'
+ = f.label :notification_level, '通知レベル', class: 'control-label'
.col-sm-10
.radio
= f.label :notification_level, value: Notification::N_DISABLED do
= f.radio_button :notification_level, Notification::N_DISABLED
.level-title
- Disabled
- %p You will not get any notifications via email
+ 無効
+ %p メールでは通知は何も受け取りません
.radio
= f.label :notification_level, value: Notification::N_MENTION do
= f.radio_button :notification_level, Notification::N_MENTION
.level-title
- Mention
- %p You will receive notifications only for comments in which you were @mentioned
+ メンション
+ %p コメント内で @名前 のようにメンションされたときにのみ通知を受け取ります
.radio
= f.label :notification_level, value: Notification::N_PARTICIPATING do
= f.radio_button :notification_level, Notification::N_PARTICIPATING
.level-title
- Participating
- %p You will only receive notifications from related resources (e.g. from your commits or assigned issues)
+ 参加
+ %p あなたに関係のあるリソースに関する通知だけを受け取ります (例: あなたのコミットや担当中の課題)
.radio
= f.label :notification_level, value: Notification::N_WATCH do
= f.radio_button :notification_level, Notification::N_WATCH
.level-title
- Watch
- %p You will receive all notifications from projects in which you participate
+ ウォッチ
+ %p 参加中のプロジェクトからのすべての通知を受け取ります
.form-actions
- = f.submit 'Save changes', class: "btn btn-create"
+ = f.submit '変更を保存', class: "btn btn-create"
.clearfix
%hr
.row.all-notifications
.col-md-6
%p
- You can also specify notification level per group or per project.
+ グループやプロジェクトの単位でも通知レベルを指定することができます。
%br
- By default, all projects and groups will use the notification level set above.
- %h4 Groups:
+ デフォルトではすべてのプロジェクトとすべてのグループに上記の設定が適用されます。
+ %h4 グループ:
%ul.bordered-list
- @group_members.each do |group_member|
- notification = Notification.new(group_member)
@@ -68,10 +68,10 @@
.col-md-6
%p
- To specify the notification level per project of a group you belong to,
+ 所属するグループ内のプロジェクト単位に通知レベルを設定するには、
%br
- you need to be a member of the project itself, not only its group.
- %h4 Projects:
+ グループだけでなくそのプロジェクトにも参加する必要があります。
+ %h4 プロジェクト:
%ul.bordered-list
- @project_members.each do |project_member|
- notification = Notification.new(project_member)
diff --git a/app/views/profiles/notifications/update.js.haml b/app/views/profiles/notifications/update.js.haml
index 84c6ab2..23c676e 100644
--- a/app/views/profiles/notifications/update.js.haml
+++ b/app/views/profiles/notifications/update.js.haml
@@ -1,6 +1,6 @@
- if @saved
:plain
- new Flash("Notification settings saved", "notice")
+ new Flash("通知設定を保存しました", "notice")
- else
:plain
- new Flash("Failed to save new settings", "alert")
+ new Flash("通知設定の保存に失敗しました", "alert")
diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml
index 4b04b11..dc3ef84 100644
--- a/app/views/profiles/passwords/edit.html.haml
+++ b/app/views/profiles/passwords/edit.html.haml
@@ -1,18 +1,18 @@
-%h3.page-title Password Settings
+%h3.page-title パスワード設定
%p.light
- if @user.password_automatically_set?
- Set your password.
+ パスワードを設定してください。
- else
- Change your password or recover your current one.
+ パスワードを変更または復旧します。
%hr
.update-password
= form_for @user, url: profile_password_path, method: :put, html: { class: 'form-horizontal' } do |f|
%div
%p.slead
- unless @user.password_automatically_set?
- You must provide current password in order to change it.
+ パスワードを変更するには、現在のパスワードを入力してください。
%br
- After a successful password update, you will be redirected to the login page where you can log in with your new password.
+ 正常に更新された場合、ログイン画面にリダイレクトします。新しいパスワードでログインしてください。
-if @user.errors.any?
.alert.alert-danger
%ul
@@ -20,19 +20,19 @@
%li= msg
- unless @user.password_automatically_set?
.form-group
- = f.label :current_password, class: 'control-label'
+ = f.label :current_password, '現在のパスワード', class: 'control-label'
.col-sm-10
= f.password_field :current_password, required: true, class: 'form-control'
%div
- = link_to "Forgot your password?", reset_profile_password_path, method: :put
+ = link_to "パスワードを忘れた場合", reset_profile_password_path, method: :put
.form-group
- = f.label :password, 'New password', class: 'control-label'
+ = f.label :password, '新しいパスワード', class: 'control-label'
.col-sm-10
= f.password_field :password, required: true, class: 'form-control'
.form-group
- = f.label :password_confirmation, class: 'control-label'
+ = f.label :password_confirmation, '新しいパスワード(確認)', class: 'control-label'
.col-sm-10
= f.password_field :password_confirmation, required: true, class: 'form-control'
.form-actions
- = f.submit 'Save password', class: "btn btn-create"
+ = f.submit 'パスワードを保存', class: "btn btn-create"
diff --git a/app/views/profiles/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml
index 8bed6e0..e6d5b59 100644
--- a/app/views/profiles/passwords/new.html.haml
+++ b/app/views/profiles/passwords/new.html.haml
@@ -1,10 +1,10 @@
-%h3.page-title Setup new password
+%h3.page-title 新しいパスワードの設定
%hr
= form_for @user, url: profile_password_path, method: :post, html: { class: 'form-horizontal '} do |f|
%p.slead
- Please set a new password before proceeding.
+ 新しいパスワードを設定してください。
%br
- After a successful password update you will be redirected to login screen.
+ 正常に更新された場合、ログイン画面にリダイレクトします。
-if @user.errors.any?
.alert.alert-danger
%ul
@@ -13,14 +13,14 @@
- unless @user.password_automatically_set?
.form-group
- = f.label :current_password, class: 'control-label'
+ = f.label :current_password, '現在のパスワード', class: 'control-label'
.col-sm-10= f.password_field :current_password, required: true, class: 'form-control'
.form-group
- = f.label :password, class: 'control-label'
+ = f.label :password, '新しいパスワード', class: 'control-label'
.col-sm-10= f.password_field :password, required: true, class: 'form-control'
.form-group
- = f.label :password_confirmation, class: 'control-label'
+ = f.label :password_confirmation, '新しいパスワード(確認)', class: 'control-label'
.col-sm-10
= f.password_field :password_confirmation, required: true, class: 'form-control'
.form-actions
- = f.submit 'Set new password', class: "btn btn-create"
+ = f.submit '新しいパスワードを設定', class: "btn btn-create"
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 409b6b5..b8a86a2 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -1,9 +1,9 @@
%h3.page-title
- Profile Settings
+ プロフィール設定
%p.light
- This information will appear on your profile.
+ この情報はあなたのプロフィールに表示されます。
- if current_user.ldap_user?
- Some options are unavailable for LDAP accounts
+ いくつかのオプションはLDAPアカウントでは利用できません。
%hr
@@ -17,18 +17,18 @@
.row
.col-md-7
.form-group
- = f.label :name, class: "control-label"
+ = f.label :name, '名前', class: "control-label"
.col-sm-10
= f.text_field :name, class: "form-control", required: true
- %span.help-block Enter your name, so people you know can recognize you.
+ %span.help-block 皆があなたを認識できるように、あなたの名前を入力してください。
.form-group
- = f.label :email, class: "control-label"
+ = f.label :email, 'メールアドレス', class: "control-label"
.col-sm-10
- if @user.ldap_user?
= f.text_field :email, class: "form-control", required: true, readonly: true
%span.help-block.light
- Email is read-only for LDAP user
+ LDAPユーザではメールアドレスは読み取り専用です。
- else
- if @user.temp_oauth_email?
= f.text_field :email, class: "form-control", required: true, value: nil
@@ -36,11 +36,12 @@
= f.text_field :email, class: "form-control", required: true
- if @user.unconfirmed_email.present?
%span.help-block
- Please click the link in the confirmation email before continuing, it was sent to
+ 確認のメールを
%strong #{@user.unconfirmed_email}
+ へ送信しました。続行する前にメール文中のリンクをクリックしてください
- else
- %span.help-block We also use email for avatar detection if no avatar is uploaded.
+ %span.help-block メールアドレスはアバターの検出にも使用されます(アップロードされていない場合)。
.form-group
= f.label :skype, class: "control-label"
.col-sm-10= f.text_field :skype, class: "form-control"
@@ -51,13 +52,13 @@
= 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, 'Webサイト', class: "control-label"
.col-sm-10= f.text_field :website_url, class: "form-control"
.form-group
- = f.label :bio, class: "control-label"
+ = f.label :bio, '自己紹介', class: "control-label"
.col-sm-10
= f.text_area :bio, rows: 4, class: "form-control", maxlength: 250
- %span.help-block Tell us about yourself in fewer than 250 characters.
+ %span.help-block 250字以内で自己紹介してください。
.col-md-5
.light-well
@@ -67,31 +68,31 @@
.profile-avatar-form-option
%p.light
- if @user.avatar?
- You can change your avatar here
+ アバターを変更
- if Gitlab.config.gravatar.enabled
%br
- or remove the current avatar to revert to #{link_to "gravatar.com", "http://gravatar.com"}
+ またはアバターを #{link_to "gravatar.com", "http://gravatar.com"} に戻す
- else
- You can upload an avatar here
+ アバターをアップロード
- if Gitlab.config.gravatar.enabled
%br
- or change it at #{link_to "gravatar.com", "http://gravatar.com"}
+ または #{link_to "gravatar.com", "http://gravatar.com"} で変更
%hr
%a.choose-btn.btn.btn-sm.js-choose-user-avatar-button
%i.fa.fa-paperclip
- %span Choose File ...
+ %span ファイルを選択 ...
- %span.file_name.js-avatar-filename File name...
+ %span.file_name.js-avatar-filename ファイル名...
= f.file_field :avatar, class: "js-user-avatar-input hidden"
- .light The maximum file size allowed is 200KB.
+ .light ファイルの最大サイズは200KBです
- if @user.avatar?
%hr
- = link_to 'Remove avatar', profile_avatar_path, data: { confirm: "Avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-sm remove-avatar"
+ = link_to 'アバターを削除', profile_avatar_path, data: { confirm: "アバターを削除します。よろしいですか？"}, method: :delete, class: "btn btn-remove btn-sm remove-avatar"
- if @user.public_profile?
.alert.alert-info
- %h4 Public profile
- %p Your profile is publicly visible because you joined public project(s)
+ %h4 公開プロフィール
+ %p 公開プロジェクトに所属しているため、あなたのプロフィールは誰でも閲覧可能です。
.row
@@ -99,4 +100,4 @@
.form-group
.col-sm-2
.col-sm-10
- = f.submit 'Save changes', class: "btn btn-success"
+ = f.submit '変更を保存', class: "btn btn-success"
diff --git a/app/views/profiles/update.js.erb b/app/views/profiles/update.js.erb
index e664ac2..9387533 100644
--- a/app/views/profiles/update.js.erb
+++ b/app/views/profiles/update.js.erb
@@ -3,7 +3,7 @@ $('body').removeClass('ui_basic ui_mars ui_modern ui_gray ui_color light_theme d
$('body').addClass('<%= app_theme %> <%= theme_type %>')
// Re-render the header to reflect the new theme
-$('header').html('<%= escape_javascript(render("layouts/head_panel", title: "Profile")) %>')
+$('header').html('<%= escape_javascript(render("layouts/head_panel", title: "プロフィール")) %>')
// Re-initialize header tooltips
$('.has_bottom_tooltip').tooltip({placement: 'bottom'})
diff --git a/app/views/profiles/update_username.js.haml b/app/views/profiles/update_username.js.haml
index 249680b..2afb3f9 100644
--- a/app/views/profiles/update_username.js.haml
+++ b/app/views/profiles/update_username.js.haml
@@ -1,6 +1,6 @@
- if @user.valid?
:plain
- new Flash("Username sucessfully changed", "notice")
+ new Flash("ユーザ名が変更されました", "notice")
- else
:plain
- new Flash("Username change failed - #{@user.errors.full_messages.first}", "alert")
+ new Flash("ユーザ名の変更に失敗しました - #{@user.errors.full_messages.first}", "alert")
diff --git a/app/views/projects/_commit_button.html.haml b/app/views/projects/_commit_button.html.haml
index 35f7e7b..cc89609 100644
--- a/app/views/projects/_commit_button.html.haml
+++ b/app/views/projects/_commit_button.html.haml
@@ -1,6 +1,6 @@
.form-actions
.commit-button-annotation
- = button_tag 'Commit Changes',
+ = button_tag '変更をコミット',
class: 'btn commit-btn js-commit-button btn-create'
- = link_to 'Cancel', cancel_path,
+ = link_to 'キャンセル', cancel_path,
class: 'btn btn-cancel', data: {confirm: leave_edit_message}
diff --git a/app/views/projects/_dropdown.html.haml b/app/views/projects/_dropdown.html.haml
index f4f4c26..900fa36 100644
--- a/app/views/projects/_dropdown.html.haml
+++ b/app/views/projects/_dropdown.html.haml
@@ -5,29 +5,29 @@
%ul.dropdown-menu
- if @project.issues_enabled && can?(current_user, :write_issue, @project)
%li
- = link_to url_for_new_issue, title: "New Issue" do
- New issue
+ = link_to url_for_new_issue, title: "課題を作成" do
+ 課題を作成
- if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
%li
- = link_to new_namespace_project_merge_request_path(@project.namespace, @project), title: "New Merge Request" do
- New merge request
+ = link_to new_namespace_project_merge_request_path(@project.namespace, @project), title: "マージリクエストを作成" do
+ マージリクエストを作成
- if @project.snippets_enabled && can?(current_user, :write_snippet, @project)
%li
- = link_to new_namespace_project_snippet_path(@project.namespace, @project), title: "New Snippet" do
- New snippet
+ = link_to new_namespace_project_snippet_path(@project.namespace, @project), title: "スニペットを作成" do
+ スニペットを作成
- if can?(current_user, :admin_project_member, @project)
%li
- = link_to namespace_project_project_members_path(@project.namespace, @project), title: "New project member" do
- New project member
+ = link_to namespace_project_project_members_path(@project.namespace, @project), title: "メンバーを追加" do
+ メンバーを追加
- if can? current_user, :push_code, @project
%li.divider
%li
= link_to new_namespace_project_branch_path(@project.namespace, @project) do
%i.fa.fa-code-fork
- Git branch
+ Gitブランチ
%li
= link_to new_namespace_project_tag_path(@project.namespace, @project) do
%i.fa.fa-tag
- Git tag
+ Gitタグ
diff --git a/app/views/projects/_github_import_modal.html.haml b/app/views/projects/_github_import_modal.html.haml
index e88a0f7..bd261a8 100644
--- a/app/views/projects/_github_import_modal.html.haml
+++ b/app/views/projects/_github_import_modal.html.haml
@@ -3,11 +3,11 @@
.modal-content
.modal-header
%a.close{href: "#", "data-dismiss" => "modal"} ×
- %h3 Import projects from GitHub
+ %h3 GitHub からのプロジェクトのインポート
.modal-body
- To enable importing projects from GitHub,
+ GitHub からのプロジェクトのインポートを有効にするには、
- if current_user.admin?
- you need to
+ あなたが
- else
- your GitLab administrator needs to
- == #{link_to 'setup OAuth integration', 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/github.md'}.
\ No newline at end of file
+ 管理者が
+ == #{link_to 'OAuthによる統合をセットアップ', 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/github.md'}する必要があります。
diff --git a/app/views/projects/_gitlab_import_modal.html.haml b/app/views/projects/_gitlab_import_modal.html.haml
index 52212b6..1a08fa4 100644
--- a/app/views/projects/_gitlab_import_modal.html.haml
+++ b/app/views/projects/_gitlab_import_modal.html.haml
@@ -3,11 +3,11 @@
.modal-content
.modal-header
%a.close{href: "#", "data-dismiss" => "modal"} ×
- %h3 Import projects from GitLab.com
+ %h3 GitLab.com からのプロジェクトのインポート
.modal-body
- To enable importing projects from GitLab.com,
+ GitLab.com からのプロジェクトのインポートを有効にするには、
- if current_user.admin?
- you need to
+ あなたが
- else
- your GitLab administrator needs to
- == #{link_to 'setup OAuth integration', 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/gitlab.md'}.
\ No newline at end of file
+ 管理者が
+ == #{link_to 'OAuthによる統合をセットアップ', 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/gitlab.md'}する必要があります。
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index c0e13e6..d48ae39 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -8,7 +8,7 @@
= escaped_autolink(@project.description)
- if can?(current_user, :admin_project, @project)
–
- = link_to 'Edit', edit_namespace_project_path
+ = link_to '編集', edit_namespace_project_path
- elsif !@project.empty_repo? && @repository.readme
- readme = @repository.readme
–
@@ -19,19 +19,19 @@
.fork-buttons
- if current_user && can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace
- if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
- = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to my fork' do
+ = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'フォークに移動' do
= link_to_toggle_fork
- else
- = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project" do
+ = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "プロジェクトをフォーク" do
= link_to_toggle_fork
.star-buttons
%span.star.js-toggler-container{class: @show_star ? 'on' : ''}
- if current_user
- = link_to_toggle_star('Star this project.', false, true)
- = link_to_toggle_star('Unstar this project.', true, true)
+ = link_to_toggle_star('このプロジェクトにスターをつける', false, true)
+ = link_to_toggle_star('このプロジェクトのスターを解除する', true, true)
- else
- = link_to_toggle_star('You must sign in to star a project.', false, false)
+ = link_to_toggle_star('スターをつけるにはサインインしてください', false, false)
.project-home-row.hidden-xs
- if current_user && !empty_repo
diff --git a/app/views/projects/_issuable_form.html.haml b/app/views/projects/_issuable_form.html.haml
index a7cd129..4fa9712 100644
--- a/app/views/projects/_issuable_form.html.haml
+++ b/app/views/projects/_issuable_form.html.haml
@@ -7,12 +7,12 @@
%br
.form-group
= f.label :title, class: 'control-label' do
- %strong= 'Title *'
+ %strong= 'タイトル *'
.col-sm-10
= f.text_field :title, maxlength: 255, autofocus: true,
class: 'form-control pad js-gfm-input', required: true
.form-group.issuable-description
- = f.label :description, 'Description', class: 'control-label'
+ = f.label :description, '説明', class: 'control-label'
.col-sm-10
= render layout: 'projects/md_preview', locals: { preview_class: "wiki" } do
@@ -20,11 +20,10 @@
classes: 'description form-control'
.col-sm-12.hint
.pull-left
- Parsed with
- #{link_to 'GitLab Flavored Markdown', help_page_path('markdown', 'markdown'), target: '_blank'}.
+ #{link_to 'GitLab Flavored Markdown', help_page_path('markdown', 'markdown'), target: '_blank'}
+ としてパースされます
.pull-right
- Attach files by dragging & dropping
- or #{link_to 'selecting them', '#', class: 'markdown-selector' }.
+ ドラッグ & ドロップまたは#{link_to 'ファイルを選択', '#', class: 'markdown-selector' }してファイルを添付
.clearfix
.error-alert
@@ -33,55 +32,55 @@
.issue-assignee
= f.label :assignee_id, class: 'control-label' do
%i.fa.fa-user
- Assign to
+ 担当者
.col-sm-10
= project_users_select_tag("#{issuable.class.model_name.param_key}[assignee_id]",
- placeholder: 'Select a user', class: 'custom-form-control',
+ placeholder: 'ユーザを選択', class: 'custom-form-control',
selected: issuable.assignee_id)
- = link_to 'Assign to me', '#', class: 'btn assign-to-me-link'
+ = link_to '自分に割り当てる', '#', class: 'btn assign-to-me-link'
.form-group
.issue-milestone
= f.label :milestone_id, class: 'control-label' do
%i.fa.fa-clock-o
- Milestone
+ マイルストーン
.col-sm-10
- if milestone_options(issuable).present?
= f.select(:milestone_id, milestone_options(issuable),
- { include_blank: 'Select milestone' }, { class: 'select2' })
+ { include_blank: 'マイルストーンを選択' }, { class: 'select2' })
- else
.prepend-top-10
- %span.light No open milestones available.
+ %span.light オープン中のマイルストーンがありません。
- if can? current_user, :admin_milestone, issuable.project
- = link_to 'Create new milestone', new_namespace_project_milestone_path(issuable.project.namespace, issuable.project), target: :blank
+ = link_to '新しいマイルストーンを作成', new_namespace_project_milestone_path(issuable.project.namespace, issuable.project), target: :blank
.form-group
= f.label :label_ids, class: 'control-label' do
%i.fa.fa-tag
- Labels
+ ラベル
.col-sm-10
- if issuable.project.labels.any?
= f.collection_select :label_ids, issuable.project.labels.all, :id, :name,
{ selected: issuable.label_ids }, multiple: true, class: 'select2'
- else
.prepend-top-10
- %span.light No labels yet.
+ %span.light ラベルがありません。
- if can? current_user, :admin_label, issuable.project
- = link_to 'Create new label', new_namespace_project_label_path(issuable.project.namespace, issuable.project), target: :blank
+ = link_to '新しいラベルを作成', new_namespace_project_label_path(issuable.project.namespace, issuable.project), target: :blank
.form-actions
- if !issuable.project.empty_repo? && contribution_guide_url(issuable.project) && !issuable.persisted?
%p
Please review the
- %strong #{link_to 'guidelines for contribution', contribution_guide_url(issuable.project)}
+ %strong #{link_to 'コントリビューション・ガイドライン', contribution_guide_url(issuable.project)}
to this repository.
- if issuable.new_record?
- = f.submit "Submit new #{issuable.class.model_name.human.downcase}", class: 'btn btn-create'
+ = f.submit "新しい#{issuable.class.model_name.human.downcase}を作成", class: 'btn btn-create'
- else
- = f.submit 'Save changes', class: 'btn btn-save'
+ = f.submit '変更を保存', class: 'btn btn-save'
- if issuable.new_record?
- cancel_project = issuable.source_project
- else
- cancel_project = issuable.project
- = link_to 'Cancel', [cancel_project.namespace.becomes(Namespace), cancel_project, issuable], class: 'btn btn-cancel'
+ = link_to 'キャンセル', [cancel_project.namespace.becomes(Namespace), cancel_project, issuable], class: 'btn btn-cancel'
diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml
index f356a25..5e45d85 100644
--- a/app/views/projects/_md_preview.html.haml
+++ b/app/views/projects/_md_preview.html.haml
@@ -1,11 +1,11 @@
%ul.nav.nav-tabs
%li.active
= link_to '#md-write-holder', class: 'js-md-write-button' do
- Write
+ 編集
%li
= link_to '#md-preview-holder', class: 'js-md-preview-button',
data: { url: markdown_preview_namespace_project_path(@project.namespace, @project) } do
- Preview
+ プレビュー
%div
.md-write-holder
= yield
diff --git a/app/views/projects/_settings_nav.html.haml b/app/views/projects/_settings_nav.html.haml
index 281a84a..213c5ae 100644
--- a/app/views/projects/_settings_nav.html.haml
+++ b/app/views/projects/_settings_nav.html.haml
@@ -3,29 +3,29 @@
= link_to edit_project_path(@project), title: 'Project', class: "stat-tab tab " do
%i.fa.fa-pencil-square-o
%span
- Project
+ プロジェクト
= nav_link(controller: [:project_members, :teams]) do
= link_to namespace_project_project_members_path(@project.namespace, @project), title: 'Members', class: "team-tab tab" do
%i.fa.fa-users
%span
- Members
+ メンバー
= nav_link(controller: :deploy_keys) do
= link_to namespace_project_deploy_keys_path(@project.namespace, @project), title: 'Deploy Keys' do
%i.fa.fa-key
%span
- Deploy Keys
+ デプロイキー
= nav_link(controller: :hooks) do
= link_to namespace_project_hooks_path(@project.namespace, @project), title: 'Web Hooks' do
%i.fa.fa-link
%span
- Web Hooks
+ Webフック
= nav_link(controller: :services) do
= link_to namespace_project_services_path(@project.namespace, @project), title: 'Services' do
%i.fa.fa-cogs
%span
- Services
+ サービス
= nav_link(controller: :protected_branches) do
= link_to namespace_project_protected_branches_path(@project.namespace, @project), title: 'Protected Branches' do
%i.fa.fa-lock
%span
- Protected branches
+ 保護ブランチ
diff --git a/app/views/projects/_visibility_level.html.haml b/app/views/projects/_visibility_level.html.haml
index 42c8e68..e4b6242 100644
--- a/app/views/projects/_visibility_level.html.haml
+++ b/app/views/projects/_visibility_level.html.haml
@@ -1,6 +1,6 @@
.form-group.project-visibility-level-holder
= f.label :visibility_level, class: 'control-label' do
- Visibility Level
+ 可視性レベル
= link_to "(?)", help_page_path("public_access", "public_access")
.col-sm-10
- if can_change_visibility_level
@@ -17,7 +17,7 @@
- unless restricted_visibility_levels.empty?
.col-sm-10
%span.info
- Some visibility level settings have been restricted by the administrator.
+ いくつかの可視性レベル設定は管理者のみに制限されています。
- else
.col-sm-10
%span.info
diff --git a/app/views/projects/_zen.html.haml b/app/views/projects/_zen.html.haml
index cf1c55e..41d93f1 100644
--- a/app/views/projects/_zen.html.haml
+++ b/app/views/projects/_zen.html.haml
@@ -2,9 +2,9 @@
%input#zen-toggle-comment.zen-toggle-comment{ tabindex: '-1', type: 'checkbox' }
.zen-backdrop
- classes << ' js-gfm-input markdown-area'
- = f.text_area attr, class: classes, placeholder: 'Leave a comment'
+ = f.text_area attr, class: classes, placeholder: 'コメントを入力'
= link_to nil, class: 'zen-enter-link', tabindex: '-1' do
%i.fa.fa-expand
- Edit in fullscreen
+ フルスクリーンで編集
= link_to nil, class: 'zen-leave-link' do
%i.fa.fa-compress
diff --git a/app/views/projects/blob/_actions.html.haml b/app/views/projects/blob/_actions.html.haml
index 13f8271..b35198e 100644
--- a/app/views/projects/blob/_actions.html.haml
+++ b/app/views/projects/blob/_actions.html.haml
@@ -10,7 +10,7 @@
- else
= link_to 'Blame', namespace_project_blame_path(@project.namespace, @project, @id),
class: 'btn btn-sm' unless @blob.empty?
- = link_to 'History', namespace_project_commits_path(@project.namespace, @project, @id),
+ = link_to '履歴', namespace_project_commits_path(@project.namespace, @project, @id),
class: 'btn btn-sm'
- if @ref != @commit.sha
= link_to 'Permalink', namespace_project_blob_path(@project.namespace, @project,
@@ -19,4 +19,4 @@
- if allowed_tree_edit?
= button_tag class: 'remove-blob btn btn-sm btn-remove',
'data-toggle' => 'modal', 'data-target' => '#modal-remove-blob' do
- Remove
+ 削除
diff --git a/app/views/projects/blob/_remove.html.haml b/app/views/projects/blob/_remove.html.haml
index 09559a4..1d3cdbe 100644
--- a/app/views/projects/blob/_remove.html.haml
+++ b/app/views/projects/blob/_remove.html.haml
@@ -3,20 +3,20 @@
.modal-content
.modal-header
%a.close{href: "#", "data-dismiss" => "modal"} ×
- %h3.page-title Remove #{@blob.name}
+ %h3.page-title #{@blob.name}を削除
%p.light
- From branch
%strong= @ref
+ ブランチから
.modal-body
= form_tag namespace_project_blob_path(@project.namespace, @project, @id), method: :delete, class: 'form-horizontal' do
= render 'shared/commit_message_container', params: params,
- placeholder: 'Removed this file because...'
+ placeholder: '...のためファイルを削除'
.form-group
.col-sm-2
.col-sm-10
- = button_tag 'Remove file', class: 'btn btn-remove btn-remove-file'
- = link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal"
+ = button_tag 'ファイルを削除', class: 'btn btn-remove btn-remove-file'
+ = link_to "キャンセル", '#', class: "btn btn-cancel", "data-dismiss" => "modal"
:javascript
disableButtonIfEmptyField('#commit_message', '.btn-remove-file')
diff --git a/app/views/projects/blob/_text.html.haml b/app/views/projects/blob/_text.html.haml
index f6bd62f..9e559c4 100644
--- a/app/views/projects/blob/_text.html.haml
+++ b/app/views/projects/blob/_text.html.haml
@@ -10,4 +10,4 @@
- unless blob.empty?
= render 'shared/file_highlight', blob: blob
- else
- .nothing-here-block Empty file
+ .nothing-here-block 空のファイル
diff --git a/app/views/projects/blob/edit.html.haml b/app/views/projects/blob/edit.html.haml
index 1f61a0b..904518f 100644
--- a/app/views/projects/blob/edit.html.haml
+++ b/app/views/projects/blob/edit.html.haml
@@ -3,7 +3,7 @@
%li.active
= link_to '#editor' do
%i.fa.fa-edit
- Edit file
+ ファイルを編集
%li
= link_to '#preview', 'data-preview-url' => namespace_project_preview_blob_path(@project.namespace, @project, @id) do
@@ -13,11 +13,11 @@
= form_tag(namespace_project_update_blob_path(@project.namespace, @project, @id), method: :put, class: "form-horizontal") do
= render 'projects/blob/editor', ref: @ref, path: @path, blob_data: @blob.data
= render 'shared/commit_message_container', params: params,
- placeholder: "Update #{@blob.name}"
+ placeholder: "#{@blob.name} を更新"
.form-group.branch
= label_tag 'branch', class: 'control-label' do
- Branch
+ ブランチ
.col-sm-10
= text_field_tag 'new_branch', @ref, class: "form-control"
diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml
index d78a01f..c83970d 100644
--- a/app/views/projects/blob/new.html.haml
+++ b/app/views/projects/blob/new.html.haml
@@ -1,13 +1,13 @@
-%h3.page-title New file
+%h3.page-title 新しいファイル
.file-editor
= form_tag(namespace_project_create_blob_path(@project.namespace, @project, @id), method: :post, class: 'form-horizontal form-new-file') do
= render 'projects/blob/editor', ref: @ref
= render 'shared/commit_message_container', params: params,
- placeholder: 'Add new file'
+ placeholder: '新しいファイルを追加'
.form-group.branch
= label_tag 'branch', class: 'control-label' do
- Branch
+ ブランチ
.col-sm-10
= text_field_tag 'new_branch', @ref, class: "form-control"
diff --git a/app/views/projects/blob/preview.html.haml b/app/views/projects/blob/preview.html.haml
index e7c3460..971ca32 100644
--- a/app/views/projects/blob/preview.html.haml
+++ b/app/views/projects/blob/preview.html.haml
@@ -22,4 +22,4 @@
%td.new_line
%td.line_content{class: "#{line.type}"}= raw diff_line_content(line.text)
- else
- .nothing-here-block No changes.
+ .nothing-here-block 変更はありません
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index 0de8c50..e9f1e01 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -4,21 +4,21 @@
= link_to namespace_project_tree_path(@project.namespace, @project, branch.name) do
%strong.str-truncated= branch.name
- if branch.name == @repository.root_ref
- %span.label.label-info default
+ %span.label.label-info デフォルト
- if @project.protected_branch? branch.name
%span.label.label-success
%i.fa.fa-lock
- protected
+ 保護中
.pull-right
- if can?(current_user, :download_code, @project)
= render 'projects/repositories/download_archive', ref: branch.name, btn_class: 'btn-grouped btn-group-sm'
- if branch.name != @repository.root_ref
- = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: branch.name), class: 'btn btn-grouped btn-sm', method: :post, title: "Compare" do
+ = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: branch.name), class: 'btn btn-grouped btn-sm', method: :post, title: "比較" do
%i.fa.fa-files-o
- Compare
+ 比較
- if can_remove_branch?(@project, branch.name)
- = link_to namespace_project_branch_path(@project.namespace, @project, branch.name), class: 'btn btn-grouped btn-sm btn-remove remove-row', method: :delete, data: { confirm: 'Removed branch cannot be restored. Are you sure?'}, remote: true do
+ = link_to namespace_project_branch_path(@project.namespace, @project, branch.name), class: 'btn btn-grouped btn-sm btn-remove remove-row', method: :delete, data: { confirm: '削除されたブランチは元に戻すことができません。本当に削除しますか？'}, remote: true do
%i.fa.fa-trash-o
- if commit
@@ -26,4 +26,4 @@
= render 'projects/commits/inline_commit', commit: commit, project: @project
- else
%p
- Cant find HEAD commit for this branch
+ ブランチ内にHEADコミットがありません
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml
index a313ffc..fafc08d 100644
--- a/app/views/projects/branches/index.html.haml
+++ b/app/views/projects/branches/index.html.haml
@@ -1,24 +1,24 @@
= render "projects/commits/head"
%h3.page-title
- Branches
+ ブランチ
.pull-right
- if can? current_user, :push_code, @project
= link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
%i.fa.fa-add-sign
- New branch
+ 新しいブランチ
.dropdown.inline
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
- %span.light sort:
+ %span.light 並び替え:
- if @sort.present?
= @sort.humanize
- else
- Name
+ 名前
%b.caret
%ul.dropdown-menu
%li
= link_to namespace_project_branches_path(sort: nil) do
- Name
+ 名前
= link_to namespace_project_branches_path(sort: 'recently_updated') do
= sort_title_recently_updated
= link_to namespace_project_branches_path(sort: 'last_updated') do
diff --git a/app/views/projects/branches/new.html.haml b/app/views/projects/branches/new.html.haml
index e5fcb98..cbf96dc 100644
--- a/app/views/projects/branches/new.html.haml
+++ b/app/views/projects/branches/new.html.haml
@@ -4,19 +4,19 @@
= @error
%h3.page-title
%i.fa.fa-code-fork
- New branch
+ ブランチを作成
= form_tag namespace_project_branches_path, method: :post, id: "new-branch-form", class: "form-horizontal" do
.form-group
- = label_tag :branch_name, 'Name for new branch', class: 'control-label'
+ = label_tag :branch_name, 'ブランチ名', class: 'control-label'
.col-sm-10
- = text_field_tag :branch_name, params[:branch_name], placeholder: 'enter new branch name', required: true, tabindex: 1, class: 'form-control'
+ = text_field_tag :branch_name, params[:branch_name], placeholder: 'ブランチ名を入力', required: true, tabindex: 1, class: 'form-control'
.form-group
- = label_tag :ref, 'Create from', class: 'control-label'
+ = label_tag :ref, 'ブランチ元', class: 'control-label'
.col-sm-10
- = text_field_tag :ref, params[:ref], placeholder: 'existing branch name, tag or commit SHA', required: true, tabindex: 2, class: 'form-control'
+ = text_field_tag :ref, params[:ref], placeholder: '既存のブランチ名, タグまたはコミットSHA', required: true, tabindex: 2, class: 'form-control'
.form-actions
- = button_tag 'Create branch', class: 'btn btn-create', tabindex: 3
- = link_to 'Cancel', namespace_project_branches_path(@project.namespace, @project), class: 'btn btn-cancel'
+ = button_tag 'ブランチを作成', class: 'btn btn-create', tabindex: 3
+ = link_to 'キャンセル', namespace_project_branches_path(@project.namespace, @project), class: 'btn btn-cancel'
:javascript
disableButtonIfAnyEmptyField($("#new-branch-form"), ".form-control", ".btn-create");
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 7409f70..b811295 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -7,33 +7,35 @@
.pull-left.btn-group
%a.btn.btn-grouped.dropdown-toggle{ data: {toggle: :dropdown} }
%i.fa.fa-download
- Download as
+ ダウンロード
%span.caret
%ul.dropdown-menu
- %li= link_to "Email Patches", namespace_project_commit_path(@project.namespace, @project, @commit, format: :patch)
- %li= link_to "Plain Diff", namespace_project_commit_path(@project.namespace, @project, @commit, format: :diff)
+ %li= link_to "メール用パッチ", namespace_project_commit_path(@project.namespace, @project, @commit, format: :patch)
+ %li= link_to "プレーンDiff", namespace_project_commit_path(@project.namespace, @project, @commit, format: :diff)
= link_to namespace_project_tree_path(@project.namespace, @project, @commit), class: "btn btn-primary btn-grouped" do
- %span Browse Code »
+ %span コードを表示 »
%div
%p
- %span.light Commit
+ %span.light コミット
= link_to @commit.id, namespace_project_commit_path(@project.namespace, @project, @commit)
.commit-info-row
- %span.light Authored by
%strong
= commit_author_link(@commit, avatar: true, size: 24)
+ %span.light が
#{time_ago_with_tooltip(@commit.authored_date)}
+ %span.light に作成
- if @commit.different_committer?
.commit-info-row
- %span.light Committed by
%strong
= commit_committer_link(@commit, avatar: true, size: 24)
+ %span.light が
#{time_ago_with_tooltip(@commit.committed_date)}
+ %span.light に作成
.commit-info-row
- %span.cgray= pluralize(@commit.parents.count, "parent")
+ %span.cgray= "#{@commit.parents.count}つの親コミット:"
- @commit.parents.each do |parent|
= link_to parent.short_id, namespace_project_commit_path(@project.namespace, @project, parent)
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index 4c853f5..d0a2416 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -27,7 +27,7 @@
.commit-row-info
= commit_author_link(commit, avatar: true, size: 24)
- authored
+ が
.committed_ago
- #{time_ago_with_tooltip(commit.committed_date)}
+ #{time_ago_with_tooltip(commit.committed_date)} に作成
= link_to_browse_code(project, commit)
diff --git a/app/views/projects/commits/_commit_list.html.haml b/app/views/projects/commits/_commit_list.html.haml
index 2ee7d73..4c33a8c 100644
--- a/app/views/projects/commits/_commit_list.html.haml
+++ b/app/views/projects/commits/_commit_list.html.haml
@@ -1,6 +1,6 @@
%div.panel.panel-default
.panel-heading
- Commits (#{@commits.count})
+ コミット (#{@commits.count})
- if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
%ul.well-list
- Commit.decorate(@commits.first(MergeRequestDiff::COMMITS_SAFE_SIZE)).each do |commit|
diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml
index 0cd9ce1..50eaf28 100644
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
@@ -6,9 +6,9 @@
.col-md-2.hidden-xs.hidden-sm
%h5.commits-row-date
%i.fa.fa-calendar
- %span= day.stamp("28 Aug, 2010")
+ %span= day.stamp("2010/08/28")
.light
- = pluralize(commits.count, 'commit')
+ #{commits.count}コミット
.col-md-10.col-sm-12
%ul.bordered-list
= render commits, project: project
diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index 83e4d24..bf996d4 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -1,15 +1,15 @@
%ul.nav.nav-tabs
= nav_link(controller: [:commit, :commits]) do
- = link_to 'Commits', namespace_project_commits_path(@project.namespace, @project, @repository.root_ref)
+ = link_to 'コミット', namespace_project_commits_path(@project.namespace, @project, @repository.root_ref)
= nav_link(controller: :compare) do
- = link_to 'Compare', namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: @ref || @repository.root_ref)
+ = link_to '比較', namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: @ref || @repository.root_ref)
= nav_link(html_options: {class: branches_tab_class}) do
= link_to namespace_project_branches_path(@project.namespace, @project) do
- Branches
+ ブランチ
%span.badge.js-totalbranch-count= @repository.branches.size
= nav_link(controller: :tags) do
= link_to namespace_project_tags_path(@project.namespace, @project) do
- Tags
+ タグ
%span.badge.js-totaltags-count= @repository.tags.length
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index 7ea855e..a593d2a 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -5,9 +5,9 @@
- if current_user && current_user.private_token
.commits-feed-holder.hidden-xs.hidden-sm
- = link_to namespace_project_commits_path(@project.namespace, @project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed", class: 'btn' do
+ = link_to namespace_project_commits_path(@project.namespace, @project, @ref, {format: :atom, private_token: current_user.private_token}), title: "フィード", class: 'btn' do
%i.fa.fa-rss
- Commits feed
+ コミットフィード
%ul.breadcrumb.repo-breadcrumb
= commits_breadcrumbs
diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml
index dfb1dde..781334b 100644
--- a/app/views/projects/compare/_form.html.haml
+++ b/app/views/projects/compare/_form.html.haml
@@ -1,7 +1,7 @@
= form_tag namespace_project_compare_index_path(@project.namespace, @project), method: :post, class: 'form-inline' do
.clearfix.append-bottom-20
- if params[:to] && params[:from]
- = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'}
+ = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: '比較対象を入れ替え'}
.form-group
.input-group.inline-input-group
%span.input-group-addon from
@@ -12,10 +12,10 @@
%span.input-group-addon to
= text_field_tag :to, params[:to], class: "form-control"
- = button_tag "Compare", class: "btn btn-create commits-compare-btn"
+ = button_tag "比較", class: "btn btn-create commits-compare-btn"
- if compare_to_mr_button?
= link_to compare_mr_path, class: 'prepend-left-10 btn' do
- %strong Make a merge request
+ %strong マージリクエストを作成
:javascript
diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml
index 4745bfb..5862294 100644
--- a/app/views/projects/compare/index.html.haml
+++ b/app/views/projects/compare/index.html.haml
@@ -1,16 +1,16 @@
= render "projects/commits/head"
%h3.page-title
- Compare View
+ 比較ビュー
%p.slead
- Compare branches, tags or commit ranges.
+ ブランチ、タグ、コミットの範囲で比較できます。
%br
- Fill input field with commit id like
+ コミットのリストとコード差分を確認するには、入力フォームに
%code.label-branch 4eedf23
- or branch/tag name like
+ のような形式のコミットIDまたは
%code.label-branch master
- and press compare button for the commits list and a code diff.
+ のようなブランチ名やタグ名を入力し、比較ボタンを押してください。
%br
- Changes are shown
from the version in the first field
to the version in the second field.
+ 変更は1つ目の
from のバージョンから2つ目の
to のバージョンまでの範囲で表示されます。
= render "form"
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index 214b5bd..dc00f78 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -1,7 +1,7 @@
= render "projects/commits/head"
%h3.page-title
- Compare View
+ 比較ビュー
= render "form"
@@ -12,12 +12,12 @@
.light-well
.center
%h4
- There isn't anything to compare.
+ 比較するものはありません
%p.slead
- if params[:to] == params[:from]
%span.label-branch #{params[:from]}
- and
+ と
%span.label-branch #{params[:to]}
- are the same.
+ が同一です。
- else
- You'll need to use different branch names to get a valid comparison.
+ 比較するには違うブランチ名を指定してください。
diff --git a/app/views/projects/deploy_keys/_deploy_key.html.haml b/app/views/projects/deploy_keys/_deploy_key.html.haml
index a2faa9d..6730f8f 100644
--- a/app/views/projects/deploy_keys/_deploy_key.html.haml
+++ b/app/views/projects/deploy_keys/_deploy_key.html.haml
@@ -3,14 +3,14 @@
- if @available_keys.include?(deploy_key)
= link_to enable_namespace_project_deploy_key_path(@project.namespace, @project, deploy_key), class: 'btn btn-sm', method: :put do
%i.fa.fa-plus
- Enable
+ 有効にする
- else
- if deploy_key.projects.count > 1
= link_to disable_namespace_project_deploy_key_path(@project.namespace, @project, deploy_key), class: 'btn btn-sm', method: :put do
%i.fa.fa-power-off
- Disable
+ 無効にする
- else
- = link_to 'Remove', namespace_project_deploy_key_path(@project.namespace, @project, deploy_key), data: { confirm: 'You are going to remove deploy key. Are you sure?'}, method: :delete, class: "btn btn-remove delete-key btn-sm pull-right"
+ = link_to '削除', namespace_project_deploy_key_path(@project.namespace, @project, deploy_key), data: { confirm: 'デプロイキーを削除します。よろしいですか？'}, method: :delete, class: "btn btn-remove delete-key btn-sm pull-right"
- key_project = deploy_key.projects.include?(@project) ? @project : deploy_key.projects.first
@@ -22,4 +22,4 @@
- deploy_key.projects.map(&:name_with_namespace).each do |project_name|
%span.label.label-gray.deploy-project-label= project_name
%small.pull-right
- Created #{time_ago_with_tooltip(deploy_key.created_at)}
+ #{time_ago_with_tooltip(deploy_key.created_at)} に作成
diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml
index 91675b3..90a023a 100644
--- a/app/views/projects/deploy_keys/_form.html.haml
+++ b/app/views/projects/deploy_keys/_form.html.haml
@@ -7,17 +7,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"
.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", namespace_project_deploy_keys_path(@project.namespace, @project), class: "btn btn-cancel"
+ = f.submit '作成', class: "btn-create btn"
+ = link_to "キャンセル", namespace_project_deploy_keys_path(@project.namespace, @project), class: "btn btn-cancel"
diff --git a/app/views/projects/deploy_keys/index.html.haml b/app/views/projects/deploy_keys/index.html.haml
index c02a181..b097675 100644
--- a/app/views/projects/deploy_keys/index.html.haml
+++ b/app/views/projects/deploy_keys/index.html.haml
@@ -1,32 +1,30 @@
%h3.page-title
- Deploy keys allow read-only access to the repository
+ デプロイキーでリポジトリの読み取り専用アクセス
- = link_to new_namespace_project_deploy_key_path(@project.namespace, @project), class: "btn btn-new pull-right", title: "New Deploy Key" do
+ = link_to new_namespace_project_deploy_key_path(@project.namespace, @project), class: "btn btn-new pull-right", title: "新しいデプロイキー" do
%i.fa.fa-plus
- New Deploy Key
+ 新しいデプロイキー
%p.light
- Deploy keys can be used for CI, staging or production servers.
- You can create a deploy key or add an existing one
+ デプロイキーはCI、ステージング、本番サーバに使われます。
+ デプロイキーを新規作成、または既存のものを追加することができます。
%hr.clearfix
.row
.col-md-6.enabled-keys
%h5
- %strong.cgreen Enabled deploy keys
- for this project
+ %strong.cgreen このプロジェクトで有効なデプロイキー
%ul.bordered-list
= render @enabled_keys
- if @enabled_keys.blank?
.light-well
- .nothing-here-block Create a #{link_to 'new deploy key', new_namespace_project_deploy_key_path(@project.namespace, @project)} or add an existing one
+ .nothing-here-block #{link_to '新しいデプロイキー', new_namespace_project_deploy_key_path(@project.namespace, @project)}を作成 または 既存のキーを追加
.col-md-6.available-keys
%h5
- %strong Deploy keys
- from projects available to you
+ %strong 利用可能なプロジェクトのデプロイキー
%ul.bordered-list
= render @available_keys
- if @available_keys.blank?
.light-well
- .nothing-here-block Deploy keys from projects you have access to will be displayed here
+ .nothing-here-block アクセス可能なプロジェクトのデプロイキーがここに表示されます
diff --git a/app/views/projects/deploy_keys/new.html.haml b/app/views/projects/deploy_keys/new.html.haml
index 186d6b5..ee12655 100644
--- a/app/views/projects/deploy_keys/new.html.haml
+++ b/app/views/projects/deploy_keys/new.html.haml
@@ -1,4 +1,4 @@
-%h3.page-title New Deploy key
+%h3.page-title 新しいデプロイキー
%hr
= render 'form'
diff --git a/app/views/projects/deploy_keys/show.html.haml b/app/views/projects/deploy_keys/show.html.haml
index 405b5bc..6098e4b 100644
--- a/app/views/projects/deploy_keys/show.html.haml
+++ b/app/views/projects/deploy_keys/show.html.haml
@@ -1,13 +1,13 @@
%h3.page-title
- Deploy key:
+ デプロイキー:
= @key.title
%small
- created on
- = @key.created_at.stamp("Aug 21, 2011")
+ = @key.created_at.stamp("2011/08/21")
+ に作成
.back-link
= link_to namespace_project_deploy_keys_path(@project.namespace, @project) do
- ← To keys list
+ ← デプロイキー一覧
%hr
%pre= @key.key
.pull-right
- = link_to 'Remove', namespace_project_deploy_key_path(@project.namespace, @project, @key), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn-remove btn delete-key"
+ = link_to '削除', namespace_project_deploy_key_path(@project.namespace, @project, @key), data: { confirm: '本当に削除しますか？'}, method: :delete, class: "btn-remove btn delete-key"
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml
index 36d98b2..48b6214 100644
--- a/app/views/projects/diffs/_file.html.haml
+++ b/app/views/projects/diffs/_file.html.haml
@@ -25,11 +25,11 @@
- unless params[:view] == 'parallel'
%label
= check_box_tag nil, 1, false, class: 'js-toggle-diff-line-wrap'
- Wrap text
+ テキストを折り返す
= link_to '#', class: 'js-toggle-diff-comments btn btn-sm' do
%i.fa.fa-chevron-down
- Show/Hide comments
+ コメントを表示/非表示
- if @merge_request && @merge_request.source_project
diff --git a/app/views/projects/diffs/_stats.html.haml b/app/views/projects/diffs/_stats.html.haml
index d387ec2..b856c0c 100644
--- a/app/views/projects/diffs/_stats.html.haml
+++ b/app/views/projects/diffs/_stats.html.haml
@@ -1,16 +1,16 @@
.js-toggle-container
.commit-stat-summary
- Showing
- %strong.cdark #{pluralize(diffs.count, "changed file")}
+ %strong.cdark #{diffs.count}件の変更されたファイル
+ を表示中
- if current_controller?(:commit)
- unless @commit.has_zero_stats?
- with
- %strong.cgreen #{@commit.stats.additions} additions
- and
- %strong.cred #{@commit.stats.deletions} deletions
+ ,
+ %strong.cgreen #{@commit.stats.additions} 行の追加
+ と
+ %strong.cred #{@commit.stats.deletions} 行の削除
= link_to '#', class: 'btn btn-sm js-toggle-button' do
- Show diff stats
+ 差分の状態を表示
%i.fa.fa-chevron-down
.file-stats.js-toggle-content.hide
%ul.bordered-list
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index e0d7511..73f6fa8 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -3,7 +3,7 @@
.project-edit-content
%div
%h3.page-title
- Project settings
+ プロジェクト設定
%hr
.panel-body
= form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit_project form-horizontal" }, authenticity_token: true do |f|
@@ -11,21 +11,21 @@
%fieldset
.form-group.project_name_holder
= f.label :name, class: 'control-label' do
- Project name
+ プロジェクト名
.col-sm-10
= f.text_field :name, placeholder: "Example Project", class: "form-control", id: "project_name_edit"
.form-group
= f.label :description, class: 'control-label' do
- Project description
- %span.light (optional)
+ 説明
+ %span.light (任意)
.col-sm-10
- = f.text_area :description, placeholder: "Awesome project", class: "form-control", rows: 3, maxlength: 250
+ = f.text_area :description, placeholder: "すばらしいプロジェクト", class: "form-control", rows: 3, maxlength: 250
- if @project.repository.exists? && @project.repository.branch_names.any?
.form-group
- = f.label :default_branch, "Default Branch", class: 'control-label'
+ = f.label :default_branch, "デフォルトブランチ", class: 'control-label'
.col-sm-10= f.select(:default_branch, @repository.branch_names, {}, {class: 'select2 select-wide'})
@@ -33,47 +33,47 @@
%fieldset.features
%legend
- Tags:
+ タグ:
.form-group
- = f.label :tag_list, "Tags", class: 'control-label'
+ = f.label :tag_list, "タグ", class: 'control-label'
.col-sm-10
= f.text_field :tag_list, maxlength: 2000, class: "form-control"
- %p.hint Separate tags with commas.
+ %p.hint ラベルはカンマで区切ります
%fieldset.features
%legend
- Features:
+ 機能:
.form-group
- = f.label :issues_enabled, "Issues", class: 'control-label'
+ = f.label :issues_enabled, "課題管理", class: 'control-label'
.col-sm-10
.checkbox
= f.check_box :issues_enabled
- %span.descr Lightweight issue tracking system for this project
+ %span.descr このプロジェクト用の軽量な課題トラッキングシステム
.form-group
- = f.label :merge_requests_enabled, "Merge Requests", class: 'control-label'
+ = f.label :merge_requests_enabled, "マージリクエスト", class: 'control-label'
.col-sm-10
.checkbox
= f.check_box :merge_requests_enabled
- %span.descr Submit changes to be merged upstream.
+ %span.descr Upstreamにマージしてもらうように変更を送信
.form-group
= f.label :wiki_enabled, "Wiki", class: 'control-label'
.col-sm-10
.checkbox
= f.check_box :wiki_enabled
- %span.descr Pages for project documentation
+ %span.descr プロジェクトのドキュメントページ
.form-group
- = f.label :snippets_enabled, "Snippets", class: 'control-label'
+ = f.label :snippets_enabled, "スニペット", class: 'control-label'
.col-sm-10
.checkbox
= f.check_box :snippets_enabled
- %span.descr Share code pastes with others out of git repository
+ %span.descr Gitリポジトリ外でコードをペーストして共有
%fieldset.features
%legend
- Project avatar:
+ プロジェクトアバター:
.form-group
.col-sm-2
.col-sm-10
@@ -81,25 +81,25 @@
= project_icon("#{@project.namespace.to_param}/#{@project.to_param}", alt: '', class: 'avatar project-avatar s160')
%p.light
- if @project.avatar_in_git
- Project avatar in repository: #{ @project.avatar_in_git }
+ リポジトリのプロジェクトアバター: #{ @project.avatar_in_git }
%p.light
- if @project.avatar?
- You can change your project avatar here
+ プロジェクトアバターを変更できます
- else
- You can upload a project avatar here
+ プロジェクトアバターをアップロードできます
%a.choose-btn.btn.btn-sm.js-choose-project-avatar-button
%i.icon-paper-clip
- %span Choose File ...
+ %span ファイルを選択 ...
- %span.file_name.js-avatar-filename File name...
+ %span.file_name.js-avatar-filename ファイル名...
= f.file_field :avatar, class: "js-project-avatar-input hidden"
- .light The maximum file size allowed is 200KB.
+ .light ファイルの最大サイズは200KBです
- if @project.avatar?
%hr
- = link_to 'Remove avatar', namespace_project_avatar_path(@project.namespace, @project), data: { confirm: "Project avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-sm remove-avatar"
+ = link_to 'アバターを削除', namespace_project_avatar_path(@project.namespace, @project), data: { confirm: "プロジェクトアバターが削除されます。本当に削除しますか？"}, method: :delete, class: "btn btn-remove btn-sm remove-avatar"
.form-actions
- = f.submit 'Save changes', class: "btn btn-save"
+ = f.submit '変更を保存', class: "btn btn-save"
@@ -108,48 +108,48 @@
- if @project.archived?
.panel.panel-success
.panel-heading
- Unarchive project
+ プロジェクトのアーカイブを解除
.panel-body
%p
- Unarchiving the project will mark its repository as active.
+ プロジェクトのアーカイブを解除すると、リポジトリはアクティブになります。
%br
- The project can be committed to.
+ プロジェクトにはコミットできるようになります。
%br
- %strong Once active this project shows up in the search and on the dashboard.
- = link_to 'Unarchive', unarchive_namespace_project_path(@project.namespace, @project),
- data: { confirm: "Are you sure that you want to unarchive this project?\nWhen this project is unarchived it is active and can be committed to again." },
+ %strong プロジェクトをアクティブにすると、検索結果やダッシュボードに表示されるようになります。
+ = link_to 'アーカイブを解除', unarchive_namespace_project_path(@project.namespace, @project),
+ data: { confirm: "本当にこのプロジェクトのアーカイブを解除しますか？\nアーカイブが解除されるとプロジェクトはアクティブになり、再びコミット可能になります。" },
method: :post, class: "btn btn-success"
- else
.panel.panel-warning
.panel-heading
- Archive project
+ プロジェクトをアーカイブ
.panel-body
%p
- Archiving the project will mark its repository as read-only.
+ プロジェクトをアーカイブするとリポジトリは読み取り専用になります。
%br
- It is hidden from the dashboard and doesn't show up in searches.
+ ダッシュボードからは非表示になり、検索結果にも表示されません。
%br
- %strong Archived projects cannot be committed to!
- = link_to 'Archive', archive_namespace_project_path(@project.namespace, @project),
- data: { confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to." },
+ %strong アーカイブされたプロジェクトにはコミットできません！
+ = link_to 'アーカイブ', archive_namespace_project_path(@project.namespace, @project),
+ data: { confirm: "本当にこのプロジェクトをアーカイブしますか？\nアーカイブされたプロジェクトにはコミットすることができません。" },
method: :post, class: "btn btn-warning"
- else
- .nothing-here-block Only the project owner can archive a project
+ .nothing-here-block プロジェクトの所有者だけがプロジェクトをアーカイブすることができます。
.panel.panel-default.panel.panel-warning
- .panel-heading Rename repository
+ .panel-heading リポジトリの名前変更
.errors-holder
.panel-body
= form_for([@project.namespace.becomes(Namespace), @project], html: { class: 'form-horizontal' }) do |f|
.form-group.project_name_holder
= f.label :name, class: 'control-label' do
- Project name
+ プロジェクト名
.col-sm-9
.form-group
= f.text_field :name, placeholder: "Example Project", class: "form-control"
.form-group
= f.label :path, class: 'control-label' do
- %span Path
+ %span パス
.col-sm-9
.form-group
.input-group
@@ -158,52 +158,52 @@
= f.text_field :path, class: 'form-control'
%span.input-group-addon .git
%ul
- %li Be careful. Renaming a project's repository can have unintended side effects.
- %li You will need to update your local repositories to point to the new location.
+ %li リポジトリの名前変更は意図しない副作用を招く可能性があります。ご注意ください。
+ %li ローカルリポジトリが新しい場所を指すように修正する必要があります。
.form-actions
- = f.submit 'Rename', class: "btn btn-warning"
+ = f.submit '名前変更', class: "btn btn-warning"
- if can?(current_user, :change_namespace, @project)
.panel.panel-default.panel.panel-danger
- .panel-heading Transfer project
+ .panel-heading プロジェクトを移譲
.errors-holder
.panel-body
= form_for([@project.namespace.becomes(Namespace), @project], url: transfer_namespace_project_path(@project.namespace, @project), method: :put, remote: true, html: { class: 'transfer-project form-horizontal' }) do |f|
.form-group
= label_tag :new_namespace_id, nil, class: 'control-label' do
- %span Namespace
+ %span ネームスペース
.col-sm-10
.form-group
- = select_tag :new_namespace_id, namespaces_options(@project.namespace_id), { prompt: 'Choose a project namespace', class: 'select2' }
+ = select_tag :new_namespace_id, namespaces_options(@project.namespace_id), { prompt: 'プロジェクトのネームスペースを選択', class: 'select2' }
%ul
- %li Be careful. Changing the project's namespace can have unintended side effects.
- %li You can only transfer the project to namespaces you manage.
- %li You will need to update your local repositories to point to the new location.
+ %li プロジェクトのネームスペースの変更は意図しない副作用を招く可能性があります。ご注意ください。
+ %li プロジェクトはあなたが管理するネームスペースにのみ移譲することができます。
+ %li ローカルリポジトリが新しい場所を指すように修正する必要があります。
.form-actions
- = f.submit 'Transfer', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => transfer_project_message(@project) }
+ = f.submit '移譲する', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => transfer_project_message(@project) }
- else
- .nothing-here-block Only the project owner can transfer a project
+ .nothing-here-block プロジェクトの所有者だけがプロジェクトを移譲することができます。
- if can?(current_user, :remove_project, @project)
.panel.panel-default.panel.panel-danger
- .panel-heading Remove project
+ .panel-heading プロジェクトを削除
.panel-body
= form_tag(namespace_project_path(@project.namespace, @project), method: :delete, html: { class: 'form-horizontal'}) do
%p
- Removing the project will delete its repository and all related resources including issues, merge requests etc.
+ プロジェクトを削除すると、リポジトリや課題、マージリクエストなどの関連するリソースすべてが削除されます。
%br
- %strong Removed projects cannot be restored!
+ %strong 削除されたプロジェクトは元に戻すことができません！
- = link_to 'Remove project', '#', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => remove_project_message(@project) }
+ = link_to 'プロジェクトを削除', '#', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => remove_project_message(@project) }
- else
- .nothing-here-block Only project owner can remove a project
+ .nothing-here-block プロジェクトの所有者だけがプロジェクトを削除することができます。
.save-project-loader.hide
.center
%h2
%i.fa.fa-spinner.fa-spin
- Saving project.
- %p Please wait a moment, this page will automatically refresh when ready.
+ プロジェクトを保存しています
+ %p 準備ができ次第、自動的に更新されますのでお待ちください
= render 'shared/confirm_modal', phrase: @project.path
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index 49806ce..4ea23c5 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -6,25 +6,24 @@
.center.well
%h3
- The repository for this project is empty
+ このプロジェクトのリポジトリは空です
%h4
- You can
= link_to namespace_project_new_blob_path(@project.namespace, @project, 'master'), class: 'btn btn-new btn-lg' do
- add a file
- or do a push via the command line.
+ ファイルを追加
+ するかコマンドラインからプッシュしてください
%h4
- %strong Command line instructions
+ %strong コマンドラインでの手順
%div.git-empty
%fieldset
- %legend Git global setup
+ %legend Gitのグローバルなセットアップ
%pre.dark
:preserve
git config --global user.name "#{git_user_name}"
git config --global user.email "#{git_user_email}"
%fieldset
- %legend Create a new repository
+ %legend リポジトリを新しく作成する場合
%pre.dark
:preserve
mkdir #{@project.path}
@@ -37,7 +36,7 @@
git push -u origin master
%fieldset
- %legend Push an existing Git repository
+ %legend 既存のGitリポジトリがある場合
%pre.dark
:preserve
cd existing_git_repo
@@ -46,4 +45,4 @@
- if can? current_user, :remove_project, @project
.prepend-top-20
- = link_to 'Remove project', [@project.namespace.becomes(Namespace), @project], data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right"
+ = link_to 'プロジェクトを削除', [@project.namespace.becomes(Namespace), @project], data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right"
diff --git a/app/views/projects/forks/new.html.haml b/app/views/projects/forks/new.html.haml
index 5a6c46f..88d84ab 100644
--- a/app/views/projects/forks/new.html.haml
+++ b/app/views/projects/forks/new.html.haml
@@ -1,6 +1,6 @@
-%h3.page-title Fork project
+%h3.page-title プロジェクトのFork
%p.lead
- Click to fork the project to a user or group
+ プロジェクトをユーザまたはグループにForkするには、クリックしてください。
%hr
.fork-namespaces
@@ -26,14 +26,14 @@
= namespace.path
%p.light
- Fork is a copy of a project repository.
+ Forkはプロジェクトリポジトリのコピーです。
%br
- Forking a repository allows you to do changes without affecting the original project.
+ プロジェクトをForkすると、元のプロジェクトに影響を及ぼすことなく変更を加えることができます。
.save-project-loader.hide
.center
%h2
%i.fa.fa-spinner.fa-spin
- Forking repository
- %p Please wait a moment, this page will automatically refresh when ready.
+ リポジトリをForkしています
+ %p 準備ができ次第、自動的に更新されますのでお待ちください
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index e3d5094..dd1307e 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -3,14 +3,14 @@
.center
%h3.page-title
%i.fa.fa-spinner.fa-spin
- Building repository graph.
- %p.slead Please wait a moment, this page will automatically refresh when ready.
+ リポジトリグラフを構築しています
+ %p.slead 準備ができ次第、自動的に更新されますのでお待ちください
.stat-graph.hide
.header.clearfix
%h3#date_header.page-title
%p.light
- Commits to #{@project.default_branch}, excluding merge commits. Limited by 6,000 commits
+ マージコミットを除いた#{@project.default_branch}へのコミットが 6,000 コミットまで表示されます。
%input#brush_change{:type => "hidden"}
.graphs
#contributors-master
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index bbaddba..b6a0b77 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -1,9 +1,9 @@
%h3.page-title
- Web hooks
+ Webフック
%p.light
- #{link_to "Web hooks ", help_page_path("web_hooks", "web_hooks"), class: "vlink"} can be
- used for binding events when something is happening within the project.
+ #{link_to "Webフック", help_page_path("web_hooks", "web_hooks"), class: "vlink"}を使うと
+ プロジェクト内のイベントを別のアクションに紐付けることができます。
%hr.clearfix
@@ -17,49 +17,49 @@
.col-sm-10
= f.text_field :url, class: "form-control", placeholder: 'http://example.com/trigger-ci.json'
.form-group
- = f.label :url, "Trigger", class: 'control-label'
+ = f.label :url, "トリガー", class: 'control-label'
.col-sm-10
%div
= f.check_box :push_events, class: 'pull-left'
.prepend-left-20
= f.label :push_events, class: 'list-label' do
- %strong Push events
+ %strong プッシュイベント
%p.light
- This url will be triggered by a push to the repository
+ リポジトリへのプッシュイベントがあったときにこのURLをリクエストします
%div
= f.check_box :tag_push_events, class: 'pull-left'
.prepend-left-20
= f.label :tag_push_events, class: 'list-label' do
- %strong Tag push events
+ %strong タグプッシュイベント
%p.light
- This url will be triggered when a new tag is pushed to the repository
+ 新しいタグがリポジトリにプッシュされたときにこのURLをリクエストします
%div
= f.check_box :issues_events, class: 'pull-left'
.prepend-left-20
= f.label :issues_events, class: 'list-label' do
- %strong Issues events
+ %strong 課題イベント
%p.light
- This url will be triggered when an issue is created
+ 課題が作成されたときにこのURLをリクエストします
%div
= f.check_box :merge_requests_events, class: 'pull-left'
.prepend-left-20
= f.label :merge_requests_events, class: 'list-label' do
- %strong Merge Request events
+ %strong マージリクエストイベント
%p.light
- This url will be triggered when a merge request is created
+ マージリクエストが作成されたときにこのURLをリクエストします
.form-actions
- = f.submit "Add Web Hook", class: "btn btn-create"
+ = f.submit "Webフックを追加", class: "btn btn-create"
-if @hooks.any?
.panel.panel-default
.panel-heading
- Web hooks (#{@hooks.count})
+ Webフック (#{@hooks.count})
%ul.well-list
- @hooks.each do |hook|
%li
.pull-right
- = link_to 'Test Hook', test_namespace_project_hook_path(@project.namespace, @project, hook), class: "btn btn-sm btn-grouped"
- = link_to 'Remove', namespace_project_hook_path(@project.namespace, @project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-sm btn-grouped"
+ = link_to 'フックをテスト', test_namespace_project_hook_path(@project.namespace, @project, hook), class: "btn btn-sm btn-grouped"
+ = link_to '削除', namespace_project_hook_path(@project.namespace, @project, hook), data: { confirm: '本当に削除しますか？'}, method: :delete, class: "btn btn-remove btn-sm btn-grouped"
.clearfix
%span.monospace= hook.url
%p
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml
index 0d3028d..228aaca 100644
--- a/app/views/projects/issues/_discussion.html.haml
+++ b/app/views/projects/issues/_discussion.html.haml
@@ -1,22 +1,22 @@
- content_for :note_actions do
- if can?(current_user, :modify_issue, @issue)
- if @issue.closed?
- = link_to 'Reopen Issue', issue_path(@issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn btn-grouped btn-reopen js-note-target-reopen", title: 'Reopen Issue'
+ = link_to '課題を再オープン', issue_path(@issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn btn-grouped btn-reopen js-note-target-reopen", title: '課題を再オープン'
- else
- = link_to 'Close Issue', issue_path(@issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-grouped btn-close js-note-target-close", title: "Close Issue"
+ = link_to '課題をクローズ', issue_path(@issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-grouped btn-close js-note-target-close", title: "課題をクローズ"
.row
%section.col-md-9
.votes-holder.pull-right
#votes= render 'votes/votes_block', votable: @issue
.participants
- %span= pluralize(@issue.participants.count, 'participant')
+ %span= #{@issue.participants.count} 人の参加者
- @issue.participants.each do |participant|
= link_to_member(@project, participant, name: false, size: 24)
.voting_notes#notes= render "projects/notes/notes_with_form"
%aside.col-md-3
.issuable-affix
.clearfix
- %span.slead.has_tooltip{:"data-original-title" => 'Cross-project reference'}
+ %span.slead.has_tooltip{:"data-original-title" => 'プロジェクト外からの参照方法'}
= cross_project_reference(@project, @issue)
%hr
.context
@@ -24,7 +24,7 @@
- if @issue.labels.any?
.issuable-context-title
- %label Labels
+ %label ラベル
.issue-show-labels
- @issue.labels.each do |label|
= link_to namespace_project_issues_path(@project.namespace, @project, label_name: label.name) do
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index 7d7217e..986a16d 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -1,5 +1,5 @@
%div.issue-form-holder
- %h3.page-title= @issue.new_record? ? "Create Issue" : "Edit Issue ##{@issue.iid}"
+ %h3.page-title= @issue.new_record? ? "課題を作成" : "課題 ##{@issue.iid} を編集"
%hr
= form_for [@project.namespace.becomes(Namespace), @project, @issue], html: { class: 'form-horizontal issue-form gfm-form' } do |f|
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index 3b50ce0..d35bf2a 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -9,7 +9,7 @@
.pull-right.light
- if issue.closed?
%span
- CLOSED
+ クローズ
- if issue.notes.any?
%span
@@ -19,7 +19,7 @@
.issue-info
%span.light= "##{issue.iid}"
- if issue.assignee
- assigned to #{link_to_member(@project, issue.assignee)}
+ #{link_to_member(@project, issue.assignee)}が担当
- if issue.votes_count > 0
= render 'votes/votes_inline', votable: issue
- if issue.milestone
@@ -31,7 +31,7 @@
= issue.task_status
.pull-right.issue-updated-at
- %small updated #{time_ago_with_tooltip(issue.updated_at, 'bottom', 'issue_update_ago')}
+ %small 最終更新：#{time_ago_with_tooltip(issue.updated_at, 'bottom', 'issue_update_ago')}
.issue-labels
- issue.labels.each do |label|
@@ -41,11 +41,11 @@
.issue-actions
- if can? current_user, :modify_issue, issue
- if issue.closed?
- = link_to 'Reopen', issue_path(issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn btn-sm btn-grouped reopen_issue btn-reopen", remote: true
+ = link_to '再オープン', issue_path(issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn btn-sm btn-grouped reopen_issue btn-reopen", remote: true
- else
- = link_to 'Close', issue_path(issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-sm btn-grouped close_issue btn-close", remote: true
+ = link_to 'クローズ', issue_path(issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-sm btn-grouped close_issue btn-close", remote: true
= link_to edit_namespace_project_issue_path(issue.project.namespace, issue.project, issue), class: "btn btn-sm edit-issue-link btn-grouped" do
%i.fa.fa-pencil-square-o
- Edit
+ 編集
diff --git a/app/views/projects/issues/_issue_context.html.haml b/app/views/projects/issues/_issue_context.html.haml
index 91fe0b6..d3fe345 100644
--- a/app/views/projects/issues/_issue_context.html.haml
+++ b/app/views/projects/issues/_issue_context.html.haml
@@ -2,18 +2,18 @@
%div.prepend-top-20
.issuable-context-title
%label
- Assignee:
+ 担当者:
- if issue.assignee
%strong= link_to_member(@project, @issue.assignee, size: 24)
- else
- none
+ 担当なし
- if can?(current_user, :modify_issue, @issue)
- = project_users_select_tag('issue[assignee_id]', placeholder: 'Select assignee', class: 'custom-form-control js-select2 js-assignee', selected: @issue.assignee_id)
+ = project_users_select_tag('issue[assignee_id]', placeholder: '担当者を選択', class: 'custom-form-control js-select2 js-assignee', selected: @issue.assignee_id)
%div.prepend-top-20.clearfix
.issuable-context-title
%label
- Milestone:
+ マイルストーン:
- if issue.milestone
%span.back-to-milestone
= link_to namespace_project_milestone_path(@project.namespace, @project, @issue.milestone) do
@@ -21,9 +21,9 @@
%i.fa.fa-clock-o
= @issue.milestone.title
- else
- none
+ なし
- if can?(current_user, :modify_issue, @issue)
- = f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone" }, {class: 'select2 select2-compact js-select2 js-milestone'})
+ = f.select(:milestone_id, milestone_options(@issue), { include_blank: "マイルストーンを選択" }, {class: 'select2 select2-compact js-select2 js-milestone'})
= hidden_field_tag :issue_context
= f.submit class: 'btn'
@@ -31,16 +31,16 @@
%div.prepend-top-20.clearfix
.issuable-context-title
%label
- Subscription:
+ 更新の通知:
%button.btn.btn-block.subscribe-button
%i.fa.fa-eye
- %span= @issue.subscribed?(current_user) ? "Unsubscribe" : "Subscribe"
+ %span= @issue.subscribed?(current_user) ? "更新通知の受信を解除" : "更新通知を受信"
- subscribtion_status = @issue.subscribed?(current_user) ? "subscribed" : "unsubscribed"
.subscription-status{"data-status" => subscribtion_status}
.description-block.unsubscribed{class: ( "hidden" if @issue.subscribed?(current_user) )}
- You're not receiving notifications from this thread.
+ あなたはこのスレッドからの通知を受信していません。
.description-block.subscribed{class: ( "hidden" unless @issue.subscribed?(current_user) )}
- You're receiving notifications because you're subscribed to this thread.
+ あなたはこのスレッドからの通知を受信しています。
:coffeescript
$ ->
diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml
index 5d243ad..38f0fce 100644
--- a/app/views/projects/issues/_issues.html.haml
+++ b/app/views/projects/issues/_issues.html.haml
@@ -3,11 +3,11 @@
= render @issues
- if @issues.blank?
%li
- .nothing-here-block No issues to show
+ .nothing-here-block 課題はありません
- if @issues.present?
.pull-right
%span.issue_counter #{@issues.total_count}
- issues for this filter
+ 個の課題に絞り込まれています
= paginate @issues, theme: "gitlab"
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index 2cb94d1..3b4d6da 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -9,9 +9,9 @@
= render 'shared/issuable_search_form', path: namespace_project_issues_path(@project.namespace, @project)
- if can? current_user, :write_issue, @project
- = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new pull-left", title: "New Issue", id: "new_issue_link" do
+ = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new pull-left", title: "新しい課題", id: "new_issue_link" do
%i.fa.fa-plus
- New Issue
+ 新しい課題
= render 'shared/issuable_filter'
@@ -23,7 +23,7 @@
= select_tag('update[milestone_id]', bulk_update_milestone_options, prompt: "Milestone")
= hidden_field_tag 'update[issues_ids]', []
= hidden_field_tag :state_event, params[:state_event]
- = button_tag "Update issues", class: "btn update_selected_issues btn-save"
+ = button_tag "課題を更新", class: "btn update_selected_issues btn-save"
.issues-holder
= render "issues"
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index bd28d8a..b40aea2 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -3,27 +3,27 @@
%h4.page-title
.issue-box{ class: issue_box_class(@issue) }
- if @issue.closed?
- Closed
+ クローズ
- else
- Open
- Issue ##{@issue.iid}
+ オープン
+ 課題 ##{@issue.iid}
%small.creator
· created by #{link_to_member(@project, @issue.author)} #{issue_timestamp(@issue)}
.pull-right
- if can?(current_user, :write_issue, @project)
- = link_to new_namespace_project_issue_path(@project.namespace, @project), class: "btn btn-grouped new-issue-link", title: "New Issue", id: "new_issue_link" do
+ = link_to new_namespace_project_issue_path(@project.namespace, @project), class: "btn btn-grouped new-issue-link", title: "新しい課題", id: "new_issue_link" do
%i.fa.fa-plus
- New Issue
+ 新しい課題
- if can?(current_user, :modify_issue, @issue)
- if @issue.closed?
- = link_to 'Reopen', issue_path(@issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn btn-grouped btn-reopen"
+ = link_to '再オープン', issue_path(@issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn btn-grouped btn-reopen"
- else
- = link_to 'Close', issue_path(@issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-grouped btn-close", title: "Close Issue"
+ = link_to 'クローズ', issue_path(@issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-grouped btn-close", title: "課題をクローズ"
= link_to edit_namespace_project_issue_path(@project.namespace, @project, @issue), class: "btn btn-grouped issuable-edit" do
%i.fa.fa-pencil-square-o
- Edit
+ 編集
%hr
%h2.issue-title
diff --git a/app/views/projects/labels/_form.html.haml b/app/views/projects/labels/_form.html.haml
index 2305fce..b6ef661 100644
--- a/app/views/projects/labels/_form.html.haml
+++ b/app/views/projects/labels/_form.html.haml
@@ -8,19 +8,19 @@
%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 :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, placeholder: "#AA33EE", class: "form-control"
.help-block
- 6 character hex values starting with a # sign.
+ \#記号で始まる6文字の16進数文字列を入力します。
%br
- Or you can choose one of suggested colors below
+ もしくは、以下の色から選択します。
.suggest-colors
- suggested_colors.each do |color|
@@ -28,6 +28,6 @@
.form-actions
- = f.submit 'Save', class: 'btn btn-save js-save-button'
- = link_to "Cancel", namespace_project_labels_path(@project.namespace, @project), class: 'btn btn-cancel'
+ = f.submit '保存', class: 'btn btn-save js-save-button'
+ = link_to "キャンセル", namespace_project_labels_path(@project.namespace, @project), class: 'btn btn-cancel'
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index 8282945..7b8e2ec 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -3,8 +3,8 @@
.pull-right
%strong.append-right-20
= link_to namespace_project_issues_path(@project.namespace, @project, label_name: label.name) do
- = pluralize label.open_issues_count, 'open issue'
+ #{label.open_issues_count} 件の課題
- if can? current_user, :admin_label, @project
- = link_to 'Edit', edit_namespace_project_label_path(@project.namespace, @project, label), class: 'btn'
- = link_to 'Remove', namespace_project_label_path(@project.namespace, @project, label), class: 'btn btn-remove remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?"}
+ = link_to '編集', edit_namespace_project_label_path(@project.namespace, @project, label), class: 'btn'
+ = link_to '削除', namespace_project_label_path(@project.namespace, @project, label), class: 'btn btn-remove remove-row', method: :delete, remote: true, data: {confirm: "本当にこのラベルを削除しますか？"}
diff --git a/app/views/projects/labels/edit.html.haml b/app/views/projects/labels/edit.html.haml
index e003d1d..b7065d6 100644
--- a/app/views/projects/labels/edit.html.haml
+++ b/app/views/projects/labels/edit.html.haml
@@ -1,8 +1,8 @@
%h3
- Edit label
+ ラベルを編集
%span.light #{@label.name}
.back-link
= link_to namespace_project_labels_path(@project.namespace, @project) do
- ← To labels list
+ ← ラベル一覧
%hr
= render 'form'
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index 0700e72..c38265a 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -1,8 +1,8 @@
- if can? current_user, :admin_label, @project
= link_to new_namespace_project_label_path(@project.namespace, @project), class: "pull-right btn btn-new" do
- New label
+ 新しいラベル
%h3.page-title
- Labels
+ ラベル
%hr
.labels
@@ -12,4 +12,4 @@
= paginate @labels, theme: 'gitlab'
- else
.light-well
- .nothing-here-block Create first label or #{link_to 'generate', generate_namespace_project_labels_path(@project.namespace, @project), method: :post} default set of labels
+ .nothing-here-block 最初のラベルを追加 または 標準のラベルセットを#{link_to '生成', generate_namespace_project_labels_path(@project.namespace, @project), method: :post}
diff --git a/app/views/projects/labels/new.html.haml b/app/views/projects/labels/new.html.haml
index 0683ed5..c34a9fb 100644
--- a/app/views/projects/labels/new.html.haml
+++ b/app/views/projects/labels/new.html.haml
@@ -1,6 +1,6 @@
-%h3 New label
+%h3 新しいラベル
.back-link
= link_to namespace_project_labels_path(@project.namespace, @project) do
- ← To labels list
+ ← ラベル一覧
%hr
= render 'form'
diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml
index eb72eaa..967bf4e 100644
--- a/app/views/projects/merge_requests/_discussion.html.haml
+++ b/app/views/projects/merge_requests/_discussion.html.haml
@@ -1,9 +1,9 @@
- content_for :note_actions do
- if can?(current_user, :modify_merge_request, @merge_request)
- if @merge_request.open?
- = link_to 'Close', merge_request_path(@merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-grouped btn-close close-mr-link js-note-target-close", title: "Close merge request"
+ = link_to 'クローズ', merge_request_path(@merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-grouped btn-close close-mr-link js-note-target-close", title: "マージリクエストをクローズ"
- if @merge_request.closed?
- = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request"
+ = link_to '再オープン', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "マージリクエストを再オープン"
.row
%section.col-md-9
@@ -14,7 +14,7 @@
%aside.col-md-3
.issuable-affix
.clearfix
- %span.slead.has_tooltip{:"data-original-title" => 'Cross-project reference'}
+ %span.slead.has_tooltip{:"data-original-title" => 'プロジェクト外からの参照方法'}
= cross_project_reference(@project, @merge_request)
%hr
.context
@@ -22,7 +22,7 @@
- if @merge_request.labels.any?
.issuable-context-title
- %label Labels
+ %label ラベル
.merge-request-show-labels
- @merge_request.labels.each do |label|
= link_to namespace_project_merge_requests_path(@project.namespace, @project, label_name: label.name) do
diff --git a/app/views/projects/merge_requests/_head.html.haml b/app/views/projects/merge_requests/_head.html.haml
index 19e4dab..4b720e6 100644
--- a/app/views/projects/merge_requests/_head.html.haml
+++ b/app/views/projects/merge_requests/_head.html.haml
@@ -1,5 +1,5 @@
.top-tabs
= link_to namespace_project_merge_requests_path(@project.namespace, @project), class: "tab #{'active' if current_page?(namespace_project_merge_requests_path(@project.namespace, @project)) }" do
%span
- Merge Requests
+ マージリクエスト
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 1eba1a9..2602754 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -6,11 +6,11 @@
- if merge_request.merged?
%span
%i.fa.fa-check
- MERGED
+ マージ済み
- elsif merge_request.closed?
%span
%i.fa.fa-close
- CLOSED
+ クローズ
- else
%span.hidden-xs.hidden-sm
%span.label-branch<
@@ -24,9 +24,9 @@
.merge-request-info
%span.light= "##{merge_request.iid}"
- if merge_request.assignee
- assigned to #{link_to_member(merge_request.source_project, merge_request.assignee)}
+ #{link_to_member(merge_request.source_project, merge_request.assignee)} が担当
- else
- Unassigned
+ 担当なし
- if merge_request.votes_count > 0
= render 'votes/votes_inline', votable: merge_request
- if merge_request.milestone_id?
@@ -39,7 +39,7 @@
.pull-right.hidden-xs
- %small updated #{time_ago_with_tooltip(merge_request.updated_at, 'bottom', 'merge_request_updated_ago')}
+ %small #{time_ago_with_tooltip(merge_request.updated_at, 'bottom', 'merge_request_updated_ago')} に更新
.merge-request-labels
- merge_request.labels.each do |label|
diff --git a/app/views/projects/merge_requests/_merge_requests.html.haml b/app/views/projects/merge_requests/_merge_requests.html.haml
index b8a0ca9..23e92bc 100644
--- a/app/views/projects/merge_requests/_merge_requests.html.haml
+++ b/app/views/projects/merge_requests/_merge_requests.html.haml
@@ -3,11 +3,11 @@
= render @merge_requests
- if @merge_requests.blank?
%li
- .nothing-here-block No merge requests to show
+ .nothing-here-block マージリクエストはありません
- if @merge_requests.present?
.pull-right
- %span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter
+ %span.cgray.pull-right #{@merge_requests.total_count} 個のマージリクエストに絞り込まれています
= paginate @merge_requests, theme: "gitlab"
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml
index 17e7605..11305ae 100644
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/_new_compare.html.haml
@@ -1,4 +1,4 @@
-%h3.page-title Compare branches for new Merge Request
+%h3.page-title 新しいマージリクエスト: ブランチを比較
%hr
= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], url: new_namespace_project_merge_request_path(@project.namespace, @project), method: :get, html: { class: "merge-request-form form-inline" } do |f|
@@ -7,23 +7,23 @@
.col-md-6
.panel.panel-default
.panel-heading
- %strong Source branch
+ %strong マージ元ブランチ
.panel-body
= f.select(:source_project_id, [[@merge_request.source_project_path,@merge_request.source_project.id]] , {}, { class: 'source_project select2 span3', disabled: @merge_request.persisted? })
- = f.select(:source_branch, @merge_request.source_branches, { include_blank: "Select branch" }, {class: 'source_branch select2 span2'})
+ = f.select(:source_branch, @merge_request.source_branches, { include_blank: "ブランチを選択" }, {class: 'source_branch select2 span2'})
.panel-footer
.mr_source_commit
.col-md-6
.panel.panel-default
.panel-heading
- %strong Target branch
+ %strong マージ先ブランチ
.panel-body
- projects = @project.forked_from_project.nil? ? [@project] : [@project, @project.forked_from_project]
= f.select(:target_project_id, options_from_collection_for_select(projects, 'id', 'path_with_namespace', f.object.target_project_id), {}, { class: 'target_project select2 span3', disabled: @merge_request.persisted? })
- = f.select(:target_branch, @merge_request.target_branches, { include_blank: "Select branch" }, {class: 'target_branch select2 span2'})
+ = f.select(:target_branch, @merge_request.target_branches, { include_blank: "ブランチを選択" }, {class: 'target_branch select2 span2'})
.panel-footer
.mr_target_commit
@@ -53,7 +53,7 @@
%hr
- = f.submit 'Compare branches', class: "btn btn-primary mr-compare-btn"
+ = f.submit 'ブランチを比較', class: "btn btn-primary mr-compare-btn"
:javascript
var source_branch = $("#merge_request_source_branch")
@@ -82,7 +82,7 @@
$(".merge-request-form").on 'submit', ->
if $("#merge_request_source_branch").val() is "" or $('#merge_request_target_branch').val() is ""
- $(".mr-compare-errors").html("You must select source and target branch to proceed")
+ $(".mr-compare-errors").html("マージ元・マージ先のブランチを選択してください")
$(".mr-compare-errors").fadeIn()
event.preventDefault()
return
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index bf80afe..2c884be 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -1,34 +1,33 @@
%h3.page-title
- New merge request
+ 新しいマージリクエスト
%p.slead
- From
%strong.label-branch #{@merge_request.source_project_namespace}:#{@merge_request.source_branch}
- %span into
+ %span を
%strong.label-branch #{@merge_request.target_project_namespace}:#{@merge_request.target_branch}
+ %span にマージ
%span.pull-right
- = link_to 'Change branches', new_namespace_project_merge_request_path(@project.namespace, @project)
+ = link_to 'ブランチを変更', new_namespace_project_merge_request_path(@project.namespace, @project)
= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: "merge-request-form form-horizontal gfm-form" } do |f|
.merge-request-form-info
.form-group
= f.label :title, class: 'control-label' do
- %strong Title *
+ %strong タイトル *
.col-sm-10
= f.text_field :title, maxlength: 255, autofocus: true, class: 'form-control pad js-gfm-input', required: true
.form-group.issuable-description
- = f.label :description, 'Description', class: 'control-label'
+ = f.label :description, '説明', class: 'control-label'
.col-sm-10
= render layout: 'projects/md_preview', locals: { preview_class: "wiki" } do
= render 'projects/zen', f: f, attr: :description, classes: 'description form-control'
.col-sm-12-hint
.pull-left
- Parsed with
#{link_to 'Gitlab Flavored Markdown', help_page_path('markdown', 'markdown'), target: '_blank'}.
+ 形式でパースされます
.pull-right
- Attach files by dragging & dropping
- or #{link_to 'selecting them', '#', class: 'markdown-selector'}.
+ ドラッグ & ドロップまたは#{link_to 'ファイルを選択', '#', class: 'markdown-selector'}してファイルを添付
.clearfix
.error-alert
@@ -37,60 +36,60 @@
.issue-assignee
= f.label :assignee_id, class: 'control-label' do
%i.fa.fa-user
- Assign to
+ 担当者
.col-sm-10
- = project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @merge_request.assignee_id, project_id: @merge_request.target_project_id)
+ = project_users_select_tag('merge_request[assignee_id]', placeholder: 'ユーザを選択', class: 'custom-form-control', selected: @merge_request.assignee_id, project_id: @merge_request.target_project_id)
- = link_to 'Assign to me', '#', class: 'btn assign-to-me-link'
+ = link_to '自分に割り当て', '#', class: 'btn assign-to-me-link'
.form-group
.issue-milestone
= f.label :milestone_id, class: 'control-label' do
%i.fa.fa-clock-o
- Milestone
+ マイルストーン
.col-sm-10
- if milestone_options(@merge_request).present?
- = f.select(:milestone_id, milestone_options(@merge_request), {include_blank: 'Select milestone'}, {class: 'select2'})
+ = f.select(:milestone_id, milestone_options(@merge_request), {include_blank: 'マイルストーンを選択'}, {class: 'select2'})
- else
- %span.light No open milestones available.
+ %span.light マイルストーンがありません
- if can? current_user, :admin_milestone, @merge_request.target_project
- = link_to 'Create new milestone', new_namespace_project_milestone_path(@merge_request.target_project.namespace, @merge_request.target_project), target: :blank
+ = link_to 'マイルストーンを作成', new_namespace_project_milestone_path(@merge_request.target_project.namespace, @merge_request.target_project), target: :blank
.form-group
= f.label :label_ids, class: 'control-label' do
%i.fa.fa-tag
- Labels
+ ラベル
.col-sm-10
- if @merge_request.target_project.labels.any?
= f.collection_select :label_ids, @merge_request.target_project.labels.all, :id, :name, {selected: @merge_request.label_ids}, multiple: true, class: 'select2'
- else
- %span.light No labels yet.
+ %span.light ラベルがありません
- if can? current_user, :admin_label, @merge_request.target_project
- = link_to 'Create new label', new_namespace_project_label_path(@merge_request.target_project.namespace, @merge_request.target_project), target: :blank
+ = link_to 'ラベルを作成', new_namespace_project_label_path(@merge_request.target_project.namespace, @merge_request.target_project), target: :blank
.form-actions
- if contribution_guide_url(@target_project)
%p
- Please review the
- %strong #{link_to 'guidelines for contribution', contribution_guide_url(@target_project)}
- to this repository.
+ このリポジトリの
+ %strong #{link_to 'コントリビューション・ガイドライン', contribution_guide_url(@target_project)}
+ を確認してください
= f.hidden_field :source_project_id
= f.hidden_field :source_branch
= f.hidden_field :target_project_id
= f.hidden_field :target_branch
- = f.submit 'Submit merge request', class: 'btn btn-create'
+ = f.submit 'マージリクエストを送信', class: 'btn btn-create'
.mr-compare.merge-request
%ul.nav.nav-tabs.merge-request-tabs
%li.commits-tab{data: {action: 'commits'}}
= link_to url_for(params) do
%i.fa.fa-history
- Commits
+ コミット
%span.badge= @commits.size
%li.diffs-tab{data: {action: 'diffs'}}
= link_to url_for(params) do
%i.fa.fa-list-alt
- Changes
+ 変更
%span.badge= @diffs.size
.commits.tab-content
@@ -100,12 +99,12 @@
= render "projects/diffs/diffs", diffs: @diffs, project: @project
- elsif @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
.alert.alert-danger
- %h4 This comparison includes more than #{MergeRequestDiff::COMMITS_SAFE_SIZE} commits.
- %p To preserve performance the line changes are not shown.
+ %h4 この比較には #{MergeRequestDiff::COMMITS_SAFE_SIZE} コミット以上が含まれています
+ %p パフォーマンスを維持するため、変更行は表示されません。
- else
.alert.alert-danger
- %h4 This comparison includes a huge diff.
- %p To preserve performance the line changes are not shown.
+ %h4 この比較の差分は大きすぎます
+ %p パフォーマンスを維持するため、変更行は表示されません。
:javascript
$('.assign-to-me-link').on('click', function(e){
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index ca4ceec..fcfaff0 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -6,7 +6,6 @@
%hr
.append-bottom-20
.slead
- %span From
- if @merge_request.for_fork?
%strong.label-branch<
- if @merge_request.source_project
@@ -14,22 +13,24 @@
- else
\ #{@merge_request.source_project_namespace}
\:#{@merge_request.source_branch}
- %span into
+ %span から
%strong.label-branch #{@merge_request.target_project_namespace}:#{@merge_request.target_branch}
+ %span へのマージリクエスト
- else
%strong.label-branch #{@merge_request.source_branch}
- %span into
+ %span から
%strong.label-branch #{@merge_request.target_branch}
+ %span へのマージリクエスト
- if @merge_request.open?
%span.pull-right
.btn-group
%a.btn.dropdown-toggle{ data: {toggle: :dropdown} }
%i.fa.fa-download
- Download as
+ ダウンロード
%span.caret
%ul.dropdown-menu
- %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
- %li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff)
+ %li= link_to "メール用パッチ", merge_request_path(@merge_request, format: :patch)
+ %li= link_to "Diff", merge_request_path(@merge_request, format: :diff)
= render "projects/merge_requests/show/how_to_merge"
= render "projects/merge_requests/show/state_widget"
@@ -39,17 +40,17 @@
%li.notes-tab{data: {action: 'notes'}}
= link_to merge_request_path(@merge_request) do
%i.fa.fa-comments
- Discussion
+ ディスカッション
%span.badge= @merge_request.mr_and_commit_notes.count
%li.commits-tab{data: {action: 'commits'}}
= link_to merge_request_path(@merge_request), title: 'Commits' do
%i.fa.fa-history
- Commits
+ コミット
%span.badge= @commits.size
%li.diffs-tab{data: {action: 'diffs'}}
= link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request) do
%i.fa.fa-list-alt
- Changes
+ 変更
%span.badge= @merge_request.diffs.size
.notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
diff --git a/app/views/projects/merge_requests/edit.html.haml b/app/views/projects/merge_requests/edit.html.haml
index 839c639..4a80693 100644
--- a/app/views/projects/merge_requests/edit.html.haml
+++ b/app/views/projects/merge_requests/edit.html.haml
@@ -1,4 +1,4 @@
%h3.page-title
- = "Edit merge request ##{@merge_request.iid}"
+ = "マージリクエスト ##{@merge_request.iid} を編集"
%hr
= render 'form'
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index d7992bd..b8539c5 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -3,9 +3,9 @@
= render 'shared/issuable_search_form', path: namespace_project_merge_requests_path(@project.namespace, @project)
- if can? current_user, :write_merge_request, @project
- = link_to new_namespace_project_merge_request_path(@project.namespace, @project), class: "btn btn-new pull-left", title: "New Merge Request" do
+ = link_to new_namespace_project_merge_request_path(@project.namespace, @project), class: "btn btn-new pull-left", title: "新しいマージリクエスト" do
%i.fa.fa-plus
- New Merge Request
+ 新しいマージリクエスト
= render 'shared/issuable_filter'
.merge-requests-holder
= render 'merge_requests'
diff --git a/app/views/projects/merge_requests/invalid.html.haml b/app/views/projects/merge_requests/invalid.html.haml
index b9c4666..15dfc9c 100644
--- a/app/views/projects/merge_requests/invalid.html.haml
+++ b/app/views/projects/merge_requests/invalid.html.haml
@@ -4,20 +4,22 @@
.alert.alert-danger
%p
- We cannot render this merge request properly because
- if @merge_request.for_fork? && !@merge_request.source_project
- fork project was removed
+ フォークプロジェクトが削除されたため
- elsif !@merge_request.source_branch_exists?
%span.label.label-inverse= @merge_request.source_branch
- does not exist in
+ が
%span.label.label-info= @merge_request.source_project_path
+ に存在しないため
- elsif !@merge_request.target_branch_exists?
%span.label.label-inverse= @merge_request.target_branch
- does not exist in
+ が
%span.label.label-info= @merge_request.target_project_path
+ に存在しないため
- else
- of internal error
+ 内部エラーが発生したため
+ このマージリクエストを正常に表示することができません。
%strong
- Please close Merge Request or change branches with existing one
+ マージリクエストをクローズするか、存在するブランチに変更してください
diff --git a/app/views/projects/merge_requests/show/_context.html.haml b/app/views/projects/merge_requests/show/_context.html.haml
index 14ad89a..0e7a323 100644
--- a/app/views/projects/merge_requests/show/_context.html.haml
+++ b/app/views/projects/merge_requests/show/_context.html.haml
@@ -2,19 +2,19 @@
%div.prepend-top-20
.issuable-context-title
%label
- Assignee:
+ 担当者:
- if @merge_request.assignee
%strong= link_to_member(@project, @merge_request.assignee, size: 24)
- else
none
.issuable-context-selectbox
- if can?(current_user, :modify_merge_request, @merge_request)
- = project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select assignee', class: 'custom-form-control js-select2 js-assignee', selected: @merge_request.assignee_id)
+ = project_users_select_tag('merge_request[assignee_id]', placeholder: '担当者を選択', class: 'custom-form-control js-select2 js-assignee', selected: @merge_request.assignee_id)
%div.prepend-top-20.clearfix
.issuable-context-title
%label
- Milestone:
+ マイルストーン:
- if @merge_request.milestone
%span.back-to-milestone
= link_to namespace_project_milestone_path(@project.namespace, @project, @merge_request.milestone) do
@@ -22,10 +22,10 @@
%i.fa.fa-clock-o
= @merge_request.milestone.title
- else
- none
+ なし
.issuable-context-selectbox
- if can?(current_user, :modify_merge_request, @merge_request)
- = f.select(:milestone_id, milestone_options(@merge_request), { include_blank: "Select milestone" }, {class: 'select2 select2-compact js-select2 js-milestone'})
+ = f.select(:milestone_id, milestone_options(@merge_request), { include_blank: "マイルストーンを選択" }, {class: 'select2 select2-compact js-select2 js-milestone'})
= hidden_field_tag :merge_request_context
= f.submit class: 'btn'
@@ -33,19 +33,19 @@
%div.prepend-top-20.clearfix
.issuable-context-title
%label
- Subscription:
+ 更新の通知:
%button.btn.btn-block.subscribe-button
%i.fa.fa-eye
- %span= @merge_request.subscribed?(current_user) ? "Unsubscribe" : "Subscribe"
+ %span= @merge_request.subscribed?(current_user) ? "更新通知の受信を解除" : "更新通知を受信"
- subscribtion_status = @merge_request.subscribed?(current_user) ? "subscribed" : "unsubscribed"
.subscription-status{"data-status" => subscribtion_status}
.description-block.unsubscribed{class: ( "hidden" if @merge_request.subscribed?(current_user) )}
- You're not receiving notifications from this thread.
+ あなたはこのスレッドからの通知を受信していません。
.description-block.subscribed{class: ( "hidden" unless @merge_request.subscribed?(current_user) )}
- You're receiving notifications because you're subscribed to this thread.
+ あなたはこのスレッドからの通知を受信しています。
:coffeescript
$ ->
new Subscription("#{toggle_subscription_namespace_project_merge_request_path(@merge_request.project.namespace, @project, @merge_request)}")
-
\ No newline at end of file
+
diff --git a/app/views/projects/merge_requests/show/_how_to_merge.html.haml b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
index 63db4b3..9a48f08 100644
--- a/app/views/projects/merge_requests/show/_how_to_merge.html.haml
+++ b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
@@ -3,21 +3,21 @@
.modal-content
.modal-header
%a.close{href: "#", "data-dismiss" => "modal"} ×
- %h3 How to merge
+ %h3 マージする方法
.modal-body
- if @merge_request.for_fork?
- source_remote = @merge_request.source_project.namespace.nil? ? "source" :@merge_request.source_project.namespace.path
- target_remote = @merge_request.target_project.namespace.nil? ? "target" :@merge_request.target_project.namespace.path
%p
- %strong Step 1.
- Fetch the code and create a new branch pointing to it
+ %strong ステップ1.
+ ソースコードをフェッチして新しいブランチを作成し、そのコードを指すようにしてください。
%pre.dark
:preserve
git fetch #{@merge_request.source_project.http_url_to_repo} #{@merge_request.source_branch}
git checkout -b #{@merge_request.source_project_path}-#{@merge_request.source_branch} FETCH_HEAD
%p
- %strong Step 2.
- Merge the branch and push the changes to GitLab
+ %strong ステップ2.
+ ブランチをマージして変更をGitLabにプッシュしてください。
%pre.dark
:preserve
git checkout #{@merge_request.target_branch}
@@ -25,15 +25,15 @@
git push origin #{@merge_request.target_branch}
- else
%p
- %strong Step 1.
- Update the repo and checkout the branch we are going to merge
+ %strong ステップ1.
+ リポジトリを更新してマージするブランチをチェックアウトしてください。
%pre.dark
:preserve
git fetch origin
git checkout -b #{@merge_request.source_branch} origin/#{@merge_request.source_branch}
%p
- %strong Step 2.
- Merge the branch and push the changes to GitLab
+ %strong ステップ2.
+ ブランチをマージして変更をGitLabにプッシュしてください。
%pre.dark
:preserve
git checkout #{@merge_request.target_branch}
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index 9f51f84..c2e32f3 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -1,12 +1,12 @@
- unless @allowed_to_merge
- if @project.archived?
%p
- %strong Archived projects cannot be committed to!
+ %strong アーカイブされたプロジェクトにはコミットすることができません！
- else
.automerge_widget.cannot_be_merged.hide
- %strong This can't be merged automatically, even if it could be merged you don't have the permission to do so.
+ %strong あなたにはこれをマージする権限がありませんが、権限があってもこれは自動的にマージすることができません。
.automerge_widget.can_be_merged.hide
- %strong This can be merged automatically but you don't have the permission to do so.
+ %strong これは自動的にマージすることができますが、あなたにはその権限がありません。
- if @show_merge_controls
@@ -15,16 +15,16 @@
= form_for [:automerge, @project.namespace.becomes(Namespace), @project, @merge_request], remote: true, method: :post do |f|
.accept-merge-holder.clearfix.js-toggle-container
.accept-action
- = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
+ = f.submit "マージリクエストを承認", class: "btn btn-create accept_merge_request"
- if can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && !@merge_request.for_fork?
.accept-control.checkbox
= label_tag :should_remove_source_branch, class: "remove_source_checkbox" do
= check_box_tag :should_remove_source_branch
- Remove source-branch
+ マージ元のブランチを削除
.accept-control
- = link_to "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message" do
+ = link_to "#", class: "modify-merge-commit-link js-toggle-button", title: "マージコミットのメッセージを修正" do
%i.fa.fa-edit
- Modify commit message
+ コミットメッセージを修正
.js-toggle-content.hide.prepend-top-20
= render 'shared/commit_message_container', params: params,
text: @merge_request.merge_commit_message,
@@ -32,43 +32,45 @@
%br
.light
- If you still want to merge this request manually - use
+ マージコミットを手動で修正したい場合は
%strong
- = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
+ = link_to "コマンドラインでマージする方法", "#modal_merge_info", class: "how_to_merge_link vlink", title: "マージする方法", "data-toggle" => "modal"
+ を参照してください。
.automerge_widget.no_satellite.hide
%p
%span
- %strong This repository does not have satellite. Ask an administrator to fix this issue
+ %strong このリポジトリにはサテライトがありません。管理者に確認してこの問題を解決してください。
.automerge_widget.cannot_be_merged.hide
%h4
- This request can't be merged with GitLab.
- You should do it manually with
+ このリクエストはGitLabではマージできません。
+ このリクエストは手動で
%strong
- = link_to "#modal_merge_info", class: "underlined-link how_to_merge_link", title: "How To Merge", "data-toggle" => "modal" do
- command line
+ = link_to "#modal_merge_info", class: "underlined-link how_to_merge_link", title: "マージ方法", "data-toggle" => "modal" do
+ コマンドライン
+ からマージする必要があります。
%p
%button.btn.disabled
%i.fa.fa-warning
- Accept Merge Request
+ マージリクエストを承認
- This usually happens when git can not resolve conflicts between branches automatically.
+ これは通常、gitが自動的にブランチの競合を解決できない場合に発生します。
.automerge_widget.unchecked
%p
%strong
%i.fa.fa-spinner.fa-spin
- Checking for ability to automatically merge…
+ 自動マージが可能か確認しています…
.automerge_widget.already_cannot_be_merged.hide
%p
- %strong This merge request can not be merged. Try to reload the page.
+ %strong このマージリクエストはマージできません。ページを再読み込みしてください。
.merge-in-progress.hide
%p
%i.fa.fa-spinner.fa-spin
- Merge is in progress. Please wait. Page will be automatically reloaded.
+ マージを実行中です。お待ちください。ページは自動的に更新されます。
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index 46e92a9..362daa8 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -1,22 +1,22 @@
%h4.page-title
.issue-box{ class: issue_box_class(@merge_request) }
- if @merge_request.merged?
- Merged
+ マージ済み
- elsif @merge_request.closed?
- Closed
+ クローズ
- else
- Open
- = "Merge Request ##{@merge_request.iid}"
+ オープン
+ = "マージリクエスト ##{@merge_request.iid}"
%small.creator
·
- created by #{link_to_member(@project, @merge_request.author)} #{time_ago_with_tooltip(@merge_request.created_at)}
+ #{link_to_member(@project, @merge_request.author)}が#{time_ago_with_tooltip(@merge_request.created_at)}に作成
.issue-btn-group.pull-right
- if can?(current_user, :modify_merge_request, @merge_request)
- if @merge_request.open?
- = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: "btn btn-grouped btn-close", title: "Close merge request"
+ = link_to 'クローズ', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: "btn btn-grouped btn-close", title: "マージリクエストをクローズ"
= link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "btn btn-grouped issuable-edit", id: "edit_merge_request" do
%i.fa.fa-pencil-square-o
- Edit
+ 編集
- if @merge_request.closed?
- = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link", title: "Close merge request"
+ = link_to '再オープン', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link", title: "マージリクエストをクローズ"
diff --git a/app/views/projects/merge_requests/show/_no_accept.html.haml b/app/views/projects/merge_requests/show/_no_accept.html.haml
index 423fcd4..a9111ef 100644
--- a/app/views/projects/merge_requests/show/_no_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_no_accept.html.haml
@@ -1,14 +1,16 @@
%h4
- Can't be merged
+ マージ不可
%p
- This merge request can not be accepted because branch
+ このマージリクエストは以下の理由により承認できません。
- unless @merge_request.source_branch_exists?
%span.label.label-inverse= @merge_request.source_branch
- does not exist in
+ ブランチが
%span.label.label-info= @merge_request.source_project_path
+ に存在しません
- else
%span.label.label-inverse= @merge_request.target_branch
- does not exist in
+ ブランチが
%span.label.label-info= @merge_request.target_project_path
+ に存在しません
%br
- %strong Please close this merge request or change branches with existing one
+ %strong このマージリクエストをクローズするか、存在するブランチを選び直してください。
diff --git a/app/views/projects/merge_requests/show/_participants.html.haml b/app/views/projects/merge_requests/show/_participants.html.haml
index 4f34af1..7b2fbc4 100644
--- a/app/views/projects/merge_requests/show/_participants.html.haml
+++ b/app/views/projects/merge_requests/show/_participants.html.haml
@@ -1,4 +1,4 @@
.participants
- %span #{@merge_request.participants.count} participants
+ %span #{@merge_request.participants.count} 人の参加者
- @merge_request.participants.each do |participant|
= link_to_member(@project, participant, name: false, size: 24)
diff --git a/app/views/projects/merge_requests/show/_remove_source_branch.html.haml b/app/views/projects/merge_requests/show/_remove_source_branch.html.haml
index 59cb85e..0d3c9e9 100644
--- a/app/views/projects/merge_requests/show/_remove_source_branch.html.haml
+++ b/app/views/projects/merge_requests/show/_remove_source_branch.html.haml
@@ -1,17 +1,17 @@
- if @source_branch.blank?
- Source branch has been removed
+ ソースブランチは削除されました
- elsif can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && @merge_request.merged?
.remove_source_branch_widget
- %p Changes merged into #{@merge_request.target_branch}. You can remove source branch now
+ %p 変更が #{@merge_request.target_branch} にマージされました。ブランチは削除することができます
= link_to namespace_project_branch_path(@merge_request.source_project.namespace, @merge_request.source_project, @source_branch), remote: true, method: :delete, class: "btn btn-primary btn-sm remove_source_branch" do
%i.fa.fa-times
- Remove Source Branch
+ ソースブランチを削除
.remove_source_branch_widget.failed.hide
- Failed to remove source branch '#{@merge_request.source_branch}'
+ ソースブランチ '#{@merge_request.source_branch}' の削除に失敗しました
.remove_source_branch_in_progress.hide
%i.fa.fa-spinner.fa-spin
- Removing source branch '#{@merge_request.source_branch}'. Please wait. Page will be automatically reloaded.
+ ソースブランチ '#{@merge_request.source_branch}' を削除しています。お待ちください。ページは自動的に更新されます。
diff --git a/app/views/projects/merge_requests/show/_state_widget.html.haml b/app/views/projects/merge_requests/show/_state_widget.html.haml
index a4f2a89..578cf68 100644
--- a/app/views/projects/merge_requests/show/_state_widget.html.haml
+++ b/app/views/projects/merge_requests/show/_state_widget.html.haml
@@ -11,40 +11,44 @@
- if @merge_request.closed?
%h4
- Closed
- if @merge_request.closed_event
- by #{link_to_member(@project, @merge_request.closed_event.author, avatar: false)}
+ #{link_to_member(@project, @merge_request.closed_event.author, avatar: false)}
+ に
#{time_ago_with_tooltip(@merge_request.closed_event.created_at)}
- %p Changes were not merged into target branch
+ に
+ クローズされました
+ %p 変更はマージされていません
- if @merge_request.merged?
%h4
- Merged
- if @merge_request.merge_event
- by #{link_to_member(@project, @merge_request.merge_event.author, avatar: false)}
+ #{link_to_member(@project, @merge_request.merge_event.author, avatar: false)}
+ に
#{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
+ に
+ マージされました
= render "projects/merge_requests/show/remove_source_branch"
- if @merge_request.locked?
%h4
- Merge in progress...
+ マージしています...
%p
- GitLab tries to merge it right now. During this time merge request is locked and can not be closed.
+ GitLabはマージしています。終了するまでマージリクエストはロックされ、クローズできません
- unless @commits.any?
- %h4 Nothing to merge
+ %h4 マージするものはありません
%p
- Nothing to merge from
%span.label-branch #{@merge_request.source_branch}
- to
+ から
%span.label-branch #{@merge_request.target_branch}
+ にマージするものはありません。
%br
- Try to use different branches or push new code.
+ 別のブランチを選択するか、新しいコードをプッシュしてください。
- if @closes_issues.present? && @merge_request.open?
.mr-widget-footer
%span
%i.fa.fa-check
- Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
- = succeed '.' do
+ このマージリクエストを承認すると、課題がクローズされます
+ = succeed '' do
!= gfm(issues_sentence(@closes_issues))
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index 95b7070..a237604 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -1,7 +1,7 @@
-%h3.page-title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.iid}"
+%h3.page-title= @milestone.new_record? ? "新しいマイルストーン" : "マイルストーン ##{@milestone.iid} を編集"
.back-link
= link_to namespace_project_milestones_path(@project.namespace, @project) do
- ← To milestones
+ ← マイルストーン一覧
%hr
@@ -14,34 +14,34 @@
.row
.col-md-6
.form-group
- = f.label :title, "Title", class: "control-label"
+ = f.label :title, "タイトル", class: "control-label"
.col-sm-10
= f.text_field :title, maxlength: 255, class: "form-control"
- %p.hint Required
+ %p.hint 必須
.form-group.milestone-description
- = f.label :description, "Description", class: "control-label"
+ = f.label :description, "説明", class: "control-label"
.col-sm-10
= render layout: 'projects/md_preview', locals: { preview_class: "wiki" } do
= render 'projects/zen', f: f, attr: :description, classes: 'description form-control'
.hint
- .pull-left Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
- .pull-left Attach files by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }.
+ .pull-left マイルストーンは #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'} 記法でパースされます。
+ .pull-left ドラッグ & ドロップまたは#{link_to "ファイルを選択", '#', class: 'markdown-selector' }してファイルを添付
.clearfix
.error-alert
.col-md-6
.form-group
- = f.label :due_date, "Due Date", class: "control-label"
+ = f.label :due_date, "期限", class: "control-label"
.col-sm-10= f.hidden_field :due_date
.col-sm-10
.datepicker
.form-actions
- if @milestone.new_record?
- = f.submit 'Create milestone', class: "btn-create btn"
- = link_to "Cancel", namespace_project_milestones_path(@project.namespace, @project), class: "btn btn-cancel"
+ = f.submit 'マイルストーンを作成', class: "btn-create btn"
+ = link_to "キャンセル", namespace_project_milestones_path(@project.namespace, @project), class: "btn btn-cancel"
-else
- = f.submit 'Save changes', class: "btn-save btn"
- = link_to "Cancel", namespace_project_milestone_path(@project.namespace, @project, @milestone), class: "btn btn-cancel"
+ = f.submit '変更を保存', class: "btn-save btn"
+ = link_to "キャンセル", namespace_project_milestone_path(@project.namespace, @project, @milestone), class: "btn btn-cancel"
:javascript
diff --git a/app/views/projects/milestones/_issues.html.haml b/app/views/projects/milestones/_issues.html.haml
index 6e4df75..e6c2b62 100644
--- a/app/views/projects/milestones/_issues.html.haml
+++ b/app/views/projects/milestones/_issues.html.haml
@@ -3,4 +3,4 @@
%ul{ class: "well-list issues-sortable-list", id: "issues-list-#{id}", "data-state" => id }
- issues.sort_by(&:position).each do |issue|
= render 'issue', issue: issue
- %li.light.ui-sort-disabled Drag and drop available
+ %li.light.ui-sort-disabled ドラッグ & ドロップできます
diff --git a/app/views/projects/milestones/_merge_requests.html.haml b/app/views/projects/milestones/_merge_requests.html.haml
index 00889a5..d2f078a 100644
--- a/app/views/projects/milestones/_merge_requests.html.haml
+++ b/app/views/projects/milestones/_merge_requests.html.haml
@@ -3,4 +3,4 @@
%ul{ class: "well-list merge_requests-sortable-list", id: "merge_requests-list-#{id}", "data-state" => id }
- merge_requests.sort_by(&:position).each do |merge_request|
= render 'merge_request', merge_request: merge_request
- %li.light.ui-sort-disabled Drag and drop available
+ %li.light.ui-sort-disabled ドラッグ & ドロップできます
diff --git a/app/views/projects/milestones/_milestone.html.haml b/app/views/projects/milestones/_milestone.html.haml
index 7039c85..03ed73e 100644
--- a/app/views/projects/milestones/_milestone.html.haml
+++ b/app/views/projects/milestones/_milestone.html.haml
@@ -3,8 +3,8 @@
- if can?(current_user, :admin_milestone, milestone.project) and milestone.active?
= link_to edit_namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone), class: "btn btn-sm edit-milestone-link btn-grouped" do
%i.fa.fa-pencil-square-o
- Edit
- = link_to 'Close Milestone', namespace_project_milestone_path(@project.namespace, @project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-sm btn-close"
+ 編集
+ = link_to 'マイルストーンをクローズ', namespace_project_milestone_path(@project.namespace, @project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-sm btn-close"
%h4
= link_to_gfm truncate(milestone.title, length: 100), namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone)
- if milestone.expired? and not milestone.closed?
@@ -12,15 +12,15 @@
%small
= milestone.expires_at
- if milestone.is_empty?
- %span.muted Empty
+ %span.muted 空のマイルストーン
- else
%div
%div
= link_to namespace_project_issues_path(milestone.project.namespace, milestone.project, milestone_id: milestone.id) do
- = pluralize milestone.issues.count, 'Issue'
+ #{milestone.issues.count}件の課題
= link_to namespace_project_merge_requests_path(milestone.project.namespace, milestone.project, milestone_id: milestone.id) do
- = pluralize milestone.merge_requests.count, 'Merge Request'
+ #{milestone.merge_requests.count}件のマージリクエスト
- %span.light #{milestone.percent_complete}% complete
+ %span.light #{milestone.percent_complete}% 完了
= milestone_progress_bar(milestone)
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml
index d3eab8d..d42b9e3 100644
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@@ -1,8 +1,8 @@
.pull-right
- if can? current_user, :admin_milestone, @project
- = link_to new_namespace_project_milestone_path(@project.namespace, @project), class: "pull-right btn btn-new", title: "New Milestone" do
+ = link_to new_namespace_project_milestone_path(@project.namespace, @project), class: "pull-right btn btn-new", title: "新しいマイルストーン" do
%i.fa.fa-plus
- New Milestone
+ 新しいマイルストーン
= render 'shared/milestones_filter'
.milestones
@@ -12,6 +12,6 @@
- if @milestones.blank?
%li
- .nothing-here-block No milestones to show
+ .nothing-here-block マイルストーンがありません
= paginate @milestones, theme: "gitlab"
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 110d896..1429bcc 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -1,28 +1,28 @@
%h4.page-title
.issue-box{ class: issue_box_class(@milestone) }
- if @milestone.closed?
- Closed
+ クローズ
- elsif @milestone.expired?
- Expired
+ 期限超過
- else
- Open
- Milestone ##{@milestone.iid}
+ オープン
+ マイルストーン ##{@milestone.iid}
%small.creator
= @milestone.expires_at
.pull-right
- if can?(current_user, :admin_milestone, @project)
= link_to edit_namespace_project_milestone_path(@project.namespace, @project, @milestone), class: "btn btn-grouped" do
%i.fa.fa-pencil-square-o
- Edit
+ 編集
- if @milestone.active?
- = link_to 'Close Milestone', namespace_project_milestone_path(@project.namespace, @project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-close btn-grouped"
+ = link_to 'マイルストーンをクローズ', namespace_project_milestone_path(@project.namespace, @project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-close btn-grouped"
- else
- = link_to 'Reopen Milestone', namespace_project_milestone_path(@project.namespace, @project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-reopen btn-grouped"
+ = link_to 'マイルストーンを再オープン', namespace_project_milestone_path(@project.namespace, @project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-reopen btn-grouped"
%hr
- if @milestone.issues.any? && @milestone.can_be_closed?
.alert.alert-success
- %span All issues for this milestone are closed. You may close milestone now.
+ %span このマイルストーンの課題はすべてクローズされました。マイルストーンはクローズできます。
%h3.issue-title
= gfm escape_once(@milestone.title)
@@ -36,12 +36,12 @@
%hr
.context
%p.lead
- Progress:
- #{@milestone.closed_items_count} closed
+ 進捗:
+ #{@milestone.closed_items_count} クローズ
–
- #{@milestone.open_items_count} open
+ #{@milestone.open_items_count} オープン
- %span.light #{@milestone.percent_complete}% complete
+ %span.light #{@milestone.percent_complete}% 完了
%span.pull-right= @milestone.expires_at
= milestone_progress_bar(@milestone)
@@ -49,41 +49,41 @@
%ul.nav.nav-tabs
%li.active
= link_to '#tab-issues', 'data-toggle' => 'tab' do
- Issues
+ 課題
%span.badge= @issues.count
%li
= link_to '#tab-merge-requests', 'data-toggle' => 'tab' do
- Merge Requests
+ マージリクエスト
%span.badge= @merge_requests.count
%li
= link_to '#tab-participants', 'data-toggle' => 'tab' do
- Participants
+ 参加者
%span.badge= @users.count
.pull-right
- = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { milestone_id: @milestone.id }), class: "btn btn-grouped", title: "New Issue" do
+ = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { milestone_id: @milestone.id }), class: "btn btn-grouped", title: "新しい課題" do
%i.fa.fa-plus
- New Issue
- = link_to 'Browse Issues', namespace_project_issues_path(@milestone.project.namespace, @milestone.project, milestone_id: @milestone.id), class: "btn edit-milestone-link btn-grouped"
+ 新しい課題
+ = link_to '課題を確認', namespace_project_issues_path(@milestone.project.namespace, @milestone.project, milestone_id: @milestone.id), class: "btn edit-milestone-link btn-grouped"
.tab-content
.tab-pane.active#tab-issues
.row
.col-md-4
- = render('issues', title: 'Unstarted Issues (open and unassigned)', issues: @issues.opened.unassigned, id: 'unassigned')
+ = render('issues', title: '未着手の課題 (オープンかつ担当なし)', issues: @issues.opened.unassigned, id: 'unassigned')
.col-md-4
- = render('issues', title: 'Ongoing Issues (open and assigned)', issues: @issues.opened.assigned, id: 'ongoing')
+ = render('issues', title: '進行中の課題 (オープンかつ割当済み)', issues: @issues.opened.assigned, id: 'ongoing')
.col-md-4
- = render('issues', title: 'Completed Issues (closed)', issues: @issues.closed, id: 'closed')
+ = render('issues', title: '完了した課題 (クローズ)', issues: @issues.closed, id: 'closed')
.tab-pane#tab-merge-requests
.row
.col-md-3
- = render('merge_requests', title: 'Work in progress (open and unassigned)', merge_requests: @merge_requests.opened.unassigned, id: 'unassigned')
+ = render('merge_requests', title: '作業中 (オープンかつ担当なし)', merge_requests: @merge_requests.opened.unassigned, id: 'unassigned')
.col-md-3
- = render('merge_requests', title: 'Waiting for merge (open and assigned)', merge_requests: @merge_requests.opened.assigned, id: 'ongoing')
+ = render('merge_requests', title: 'マージ待ち (オープンかつ割当済み)', merge_requests: @merge_requests.opened.assigned, id: 'ongoing')
.col-md-3
- = render('merge_requests', title: 'Declined (closed)', merge_requests: @merge_requests.declined, id: 'closed')
+ = render('merge_requests', title: '拒否 (クローズ)', merge_requests: @merge_requests.declined, id: 'closed')
.col-md-3
.panel.panel-primary
.panel-heading Merged
diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml
index 415c98e..fa28837 100644
--- a/app/views/projects/network/_head.html.haml
+++ b/app/views/projects/network/_head.html.haml
@@ -1,3 +1,3 @@
.append-bottom-20
= render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
- .pull-right.visible-lg.light You can move around the graph by using the arrow keys.
+ .pull-right.visible-lg.light 矢印キーでグラフ内を移動できます。
diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml
index c36bad1..de685f9 100644
--- a/app/views/projects/network/show.html.haml
+++ b/app/views/projects/network/show.html.haml
@@ -2,14 +2,14 @@
.project-network
.controls
= form_tag namespace_project_network_path(@project.namespace, @project, @id), method: :get, class: 'form-inline network-form' do |f|
- = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: 'search-input form-control input-mx-250 search-sha'
+ = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Extended SHA1記法で入力", class: 'search-input form-control input-mx-250 search-sha'
= button_tag class: 'btn btn-success btn-search-sha' do
%i.fa.fa-search
.inline.prepend-left-20
.checkbox.light
= label_tag :filter_ref do
= check_box_tag :filter_ref, 1, @options[:filter_ref]
- %span Begin with the selected commit
+ %span 選択されたコミットで開始
.network-graph
= spinner nil, true
diff --git a/app/views/projects/network/show.json.erb b/app/views/projects/network/show.json.erb
index dc82adc..769eede 100644
--- a/app/views/projects/network/show.json.erb
+++ b/app/views/projects/network/show.json.erb
@@ -2,7 +2,7 @@
<%= raw(
{
- days: @graph.days.compact.map { |d| [d.day, d.strftime("%b")] },
+ days: @graph.days.compact.map { |d| [d.day, d.strftime("%m月")] },
commits: @graph.commits.map do |c|
{
parents: parents_zip_spaces(c.parents(@graph.map), c.parent_spaces),
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 7fc612c..72a7ed3 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -6,7 +6,7 @@
= form_for @project, html: { class: 'new_project form-horizontal' } do |f|
.form-group.project-name-holder
= f.label :path, class: 'control-label' do
- %strong Project path
+ %strong プロジェクトパス
.col-sm-10
.input-group
= f.text_field :path, placeholder: "my-awesome-project", class: "form-control", tabindex: 1, autofocus: true
@@ -16,7 +16,7 @@
- if current_user.can_select_namespace?
.form-group
= f.label :namespace_id, class: 'control-label' do
- %span Namespace
+ %span ネームスペース
.col-sm-10
= f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'select2', tabindex: 2}
@@ -27,22 +27,22 @@
.col-sm-10
= link_to "#", class: 'js-toggle-button' do
%i.fa.fa-upload
- %span Import existing repository by URL
+ %span URLで既存リポジトリをインポート
.js-toggle-content.hide
.form-group.import-url-data
= f.label :import_url, class: 'control-label' do
- %span Import existing git repo
+ %span 既存のリポジトリをインポート
.col-sm-10
= f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git'
.alert.alert-info.prepend-top-10
- This URL must be publicly accessible or you can add a username and password like this: https://username:password@gitlab.com/company/project.git.
+ このURLは公開されていなければなりません。次のようにユーザ名とパスワードをつけることもできます: https://username:password@gitlab.com/company/project.git
%br
- The import will time out after 4 minutes. For big repositories, use a clone/push combination.
- For SVN repositories, check #{link_to "this migrating from SVN doc.", "http://doc.gitlab.com/ce/workflow/migrating_from_svn.html"}
+ インポートは4分でタイムアウトします。大きなリポジトリの場合はクローンとプッシュを組み合わせてください。
+ SVNリポジトリの場合は、#{link_to "SVNからの移行についてのドキュメント", "http://doc.gitlab.com/ce/workflow/migrating_from_svn.html"}を確認してください。
.project-import.form-group
- %label.control-label Import projects from
+ %label.control-label プロジェクトをインポート
.col-sm-10
- if github_import_enabled?
= link_to status_import_github_path, class: 'btn' do
@@ -84,28 +84,28 @@
.form-group
= f.label :description, class: 'control-label' do
- Description
- %span.light (optional)
+ 説明
+ %span.light (任意)
.col-sm-10
- = f.text_area :description, placeholder: "Awesome project", class: "form-control", rows: 3, maxlength: 250, tabindex: 3
+ = f.text_area :description, placeholder: "すばらしいプロジェクト", class: "form-control", rows: 3, maxlength: 250, tabindex: 3
= render "visibility_level", f: f, visibility_level: gitlab_config.default_projects_features.visibility_level, can_change_visibility_level: true
.form-actions
- = f.submit 'Create project', class: "btn btn-create project-submit", tabindex: 4
+ = f.submit 'プロジェクトを作成', class: "btn btn-create project-submit", tabindex: 4
- if current_user.can_create_group?
.pull-right
.light
- Need a group for several dependent projects?
+ 複数のプロジェクトを管理するグループが必要ですか？
= link_to new_group_path, class: "btn btn-xs" do
- Create a group
+ グループを作成
.save-project-loader.hide
.center
%h2
%i.fa.fa-spinner.fa-spin
- Creating project & repository.
- %p Please wait a moment, this page will automatically refresh when ready.
+ プロジェクトとリポジトリを作成しています
+ %p 準備ができ次第、自動的に更新されますのでお待ちください
:coffeescript
$ ->
diff --git a/app/views/projects/no_repo.html.haml b/app/views/projects/no_repo.html.haml
index 720957e..b4a8b4b 100644
--- a/app/views/projects/no_repo.html.haml
+++ b/app/views/projects/no_repo.html.haml
@@ -1,22 +1,22 @@
%h2
%i.fa.fa-warning
- No repository
+ リポジトリがありません
%p.slead
- The repository for this project does not exist.
+ このプロジェクトにはリポジトリが存在しません。
%br
- This means you can not push code until you create an empty repository or import existing one.
+ からのリポジトリを作成するか、既存のリポジトリをインポートするまでソースコードをプッシュすることはできません。
%hr
.no-repo-actions
= link_to namespace_project_repository_path(@project.namespace, @project), method: :post, class: 'btn btn-primary' do
- Create empty bare repository
+ 空のベアリポジトリを作成
%strong.prepend-left-10.append-right-10 or
= link_to new_namespace_project_import_path(@project.namespace, @project), class: 'btn' do
- Import repository
+ リポジトリをインポート
- if can? current_user, :remove_project, @project
.prepend-top-20
- = link_to 'Remove project', project_path(@project), data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right"
+ = link_to 'プロジェクトを削除', project_path(@project), data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right"
diff --git a/app/views/projects/notes/_edit_form.html.haml b/app/views/projects/notes/_edit_form.html.haml
index acb3991..0fa9946 100644
--- a/app/views/projects/notes/_edit_form.html.haml
+++ b/app/views/projects/notes/_edit_form.html.haml
@@ -6,10 +6,10 @@
classes: 'note_text js-note-text'
.comment-hints.clearfix
- .pull-left Comments are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"),{ target: '_blank', tabindex: -1 }}
- .pull-right Attach files by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector', tabindex: -1 }.
+ .pull-left コメントは #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"),{ target: '_blank', tabindex: -1 }} 記法でパースされます
+ .pull-right ドラッグ & ドロップまたは#{link_to "ファイルを選択", '#', class: 'markdown-selector', tabindex: -1 }してファイルを添付
.note-form-actions
.buttons
- = f.submit 'Save Comment', class: "btn btn-primary btn-save btn-grouped js-comment-button"
- = link_to 'Cancel', "#", class: "btn btn-cancel note-edit-cancel"
\ No newline at end of file
+ = f.submit 'コメントを保存', class: "btn btn-primary btn-save btn-grouped js-comment-button"
+ = link_to 'キャンセル', "#", class: "btn btn-cancel note-edit-cancel"
diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml
index be96c30..39294f2 100644
--- a/app/views/projects/notes/_form.html.haml
+++ b/app/views/projects/notes/_form.html.haml
@@ -10,15 +10,15 @@
classes: 'note_text js-note-text'
.comment-hints.clearfix
- .pull-left Comments are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"),{ target: '_blank', tabindex: -1 }}
- .pull-right Attach files by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector', tabindex: -1 }.
+ .pull-left コメントは#{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"),{ target: '_blank', tabindex: -1 }}形式でパースされます
+ .pull-right ドラッグ & ドロップまたは#{link_to "ファイルを選択", '#', class: 'markdown-selector', tabindex: -1 }してファイルを添付
.note-form-actions
.buttons
- = f.submit 'Add Comment', class: "btn comment-btn btn-grouped js-comment-button"
+ = f.submit 'コメントする', class: "btn comment-btn btn-grouped js-comment-button"
= yield(:note_actions)
- %a.btn.grouped.js-close-discussion-note-form Cancel
+ %a.btn.grouped.js-close-discussion-note-form キャンセル
:javascript
window.project_uploads_path = "#{namespace_project_uploads_path @project.namespace, @project}";
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index f3d00a6..1f6db6c 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -10,16 +10,16 @@
.note-actions
= link_to "##{dom_id(note)}", name: dom_id(note) do
%i.fa.fa-link
- Link here
+ リンク
- if can?(current_user, :admin_note, note) && note.editable?
= link_to "#", title: "Edit comment", class: "js-note-edit" do
%i.fa.fa-pencil-square-o
- Edit
+ 編集
- = link_to namespace_project_note_path(@project.namespace, @project, note), title: "Remove comment", method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: "danger js-note-delete" do
+ = link_to namespace_project_note_path(@project.namespace, @project, note), title: "コメントを削除", method: :delete, data: { confirm: '本当にコメントを削除しますか？' }, remote: true, class: "danger js-note-delete" do
%i.fa.fa-trash-o.cred
- Remove
+ 削除
- if note.system
= image_tag avatar_icon(note.author_email), class: "avatar s16"
= link_to_member(@project, note.author, avatar: false)
@@ -64,6 +64,6 @@
%i.fa.fa-paperclip
= note.attachment_identifier
= link_to delete_attachment_namespace_project_note_path(@project.namespace, @project, note),
- title: "Delete this attachment", method: :delete, remote: true, data: { confirm: 'Are you sure you want to remove the attachment?' }, class: "danger js-note-attachment-delete" do
+ title: "添付ファイルの削除", method: :delete, remote: true, data: { confirm: '本当に添付ファイルを削除しますか？' }, class: "danger js-note-attachment-delete" do
%i.fa.fa-trash-o.cred
.clear
diff --git a/app/views/projects/notes/discussions/_active.html.haml b/app/views/projects/notes/discussions/_active.html.haml
index 7c6f724..fbcd6ef 100644
--- a/app/views/projects/notes/discussions/_active.html.haml
+++ b/app/views/projects/notes/discussions/_active.html.haml
@@ -4,16 +4,17 @@
.discussion-actions
= link_to "#", class: "js-toggle-button" do
%i.fa.fa-chevron-up
- Show/hide discussion
+ ディスカッションを表示/非表示
%div
= link_to_member(@project, note.author, avatar: false)
- started a discussion
+ が
= link_to diffs_namespace_project_merge_request_path(note.project.namespace, note.project, note.noteable, anchor: note.line_code) do
- %strong on the diff
+ %strong 差分
+ でディスカッションを開始しました
.last-update.hide.js-toggle-content
- last_note = discussion_notes.last
- last updated by
= link_to_member(@project, last_note.author, avatar: false)
+ 最終更新:
%span.discussion-last-update
#{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')}
.discussion-body.js-toggle-content
diff --git a/app/views/projects/notes/discussions/_commit.html.haml b/app/views/projects/notes/discussions/_commit.html.haml
index 62609cf..7dde6f0 100644
--- a/app/views/projects/notes/discussions/_commit.html.haml
+++ b/app/views/projects/notes/discussions/_commit.html.haml
@@ -4,14 +4,15 @@
.discussion-actions
= link_to "#", class: "js-toggle-button" do
%i.fa.fa-chevron-up
- Show/hide discussion
+ ディスカッションを表示/非表示
%div
= link_to_member(@project, note.author, avatar: false)
- started a discussion on commit
+ がコミット
= link_to(note.noteable.short_id, namespace_project_commit_path(note.project.namespace, note.project, note.noteable), class: 'monospace')
+ でディスカッションを開始しました
.last-update.hide.js-toggle-content
- last_note = discussion_notes.last
- last updated by
+ 最終更新:
= link_to_member(@project, last_note.author, avatar: false)
%span.discussion-last-update
#{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')}
diff --git a/app/views/projects/notes/discussions/_outdated.html.haml b/app/views/projects/notes/discussions/_outdated.html.haml
index 52a1d34..14af43c 100644
--- a/app/views/projects/notes/discussions/_outdated.html.haml
+++ b/app/views/projects/notes/discussions/_outdated.html.haml
@@ -4,14 +4,15 @@
.discussion-actions
= link_to "#", class: "js-toggle-button" do
%i.fa.fa-chevron-down
- Show/hide discussion
+ ディスカッションを表示/非表示
%div
= link_to_member(@project, note.author, avatar: false)
- started a discussion on the
+ が
%strong outdated diff
+ でディスカッションを開始しました
%div
- last_note = discussion_notes.last
- last updated by
+ 最終更新:
= link_to_member(@project, last_note.author, avatar: false)
%span.discussion-last-update
#{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')}
diff --git a/app/views/projects/project_members/_new_project_member.html.haml b/app/views/projects/project_members/_new_project_member.html.haml
index 0f824bd..c191266 100644
--- a/app/views/projects/project_members/_new_project_member.html.haml
+++ b/app/views/projects/project_members/_new_project_member.html.haml
@@ -1,15 +1,16 @@
= form_for @project_member, as: :project_member, url: namespace_project_project_members_path(@project.namespace, @project), html: { class: 'form-horizontal users-project-form' } do |f|
.form-group
- = f.label :user_ids, "People", class: 'control-label'
+ = f.label :user_ids, "ユーザ", class: 'control-label'
.col-sm-10= users_select_tag(:user_ids, multiple: true, class: 'input-large')
.form-group
- = f.label :access_level, "Project Access", class: 'control-label'
+ = f.label :access_level, "プロジェクトアクセス権", class: 'control-label'
.col-sm-10
= select_tag :access_level, options_for_select(ProjectMember.access_roles, @project_member.access_level), class: "project-access-select select2"
.help-block
- Read more about role permissions
- %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
+ アクセス権についての詳細は、
+ %strong= link_to "こちら", help_page_path("permissions", "permissions"), class: "vlink"
+ から確認できます。
.form-actions
- = f.submit 'Add users to project', class: "btn btn-create"
+ = f.submit 'ユーザをプロジェクトに追加', class: "btn btn-create"
diff --git a/app/views/projects/project_members/_project_member.html.haml b/app/views/projects/project_members/_project_member.html.haml
index 1f31d84..927fe4c 100644
--- a/app/views/projects/project_members/_project_member.html.haml
+++ b/app/views/projects/project_members/_project_member.html.haml
@@ -7,25 +7,25 @@
%strong= user.name
%span.cgray= user.username
- if user == current_user
- %span.label.label-success It's you
+ %span.label.label-success あなた
- if user.blocked?
%label.label.label-danger
- %strong Blocked
+ %strong ブロック中
- if current_user_can_admin_project
- unless @project.personal? && user == current_user
.pull-right
%strong= member.human_access
= button_tag class: "btn-xs btn js-toggle-button",
- title: 'Edit access level', type: 'button' do
+ title: 'アクセスレベルを編集', type: 'button' do
%i.fa.fa-pencil-square-o
- if current_user == user
- = link_to leave_namespace_project_project_members_path(@project.namespace, @project), data: { confirm: "Leave project?"}, method: :delete, class: "btn-xs btn btn-remove", title: 'Leave project' do
+ = link_to leave_namespace_project_project_members_path(@project.namespace, @project), data: { confirm: "プロジェクトを離脱しますか？"}, method: :delete, class: "btn-xs btn btn-remove", title: 'プロジェクトを離脱' do
%i.fa.fa-minus.fa-inverse
- else
- = link_to namespace_project_project_member_path(@project.namespace, @project, user), data: { confirm: remove_from_project_team_message(@project, user) }, method: :delete, remote: true, class: "btn-xs btn btn-remove", title: 'Remove user from team' do
+ = link_to namespace_project_project_member_path(@project.namespace, @project, user), data: { confirm: remove_from_project_team_message(@project, user) }, method: :delete, remote: true, class: "btn-xs btn btn-remove", title: 'ユーザをプロジェクトから削除' do
%i.fa.fa-minus.fa-inverse
.edit-member.hide.js-toggle-content
diff --git a/app/views/projects/project_members/_team.html.haml b/app/views/projects/project_members/_team.html.haml
index 615c425..83ae072 100644
--- a/app/views/projects/project_members/_team.html.haml
+++ b/app/views/projects/project_members/_team.html.haml
@@ -3,7 +3,7 @@
.panel.panel-default.prepend-top-20
.panel-heading
%strong #{@project.name}
- project members
+ プロジェクトのメンバー
%small
(#{members.count})
%ul.well-list
diff --git a/app/views/projects/project_members/import.html.haml b/app/views/projects/project_members/import.html.haml
index 293754c..ae2a96d 100644
--- a/app/views/projects/project_members/import.html.haml
+++ b/app/views/projects/project_members/import.html.haml
@@ -1,14 +1,14 @@
%h3.page-title
- Import members from another project
+ 別のプロジェクトからメンバーをインポート
%p.light
- Only project members will be imported. Group members will be skipped.
+ プロジェクトのメンバーだけがインポートされます。グループのメンバーはスキップされます。
%hr
= form_tag apply_import_namespace_project_project_members_path(@project.namespace, @project), method: 'post', class: 'form-horizontal' do
.form-group
- = label_tag :source_project_id, "Project", class: 'control-label'
- .col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "select2 lg", required: true)
+ = label_tag :source_project_id, "プロジェクト", class: 'control-label'
+ .col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "プロジェクトを選択", class: "select2 lg", required: true)
.form-actions
- = button_tag 'Import project members', class: "btn btn-create"
- = link_to "Cancel", namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-cancel"
+ = button_tag 'プロジェクトメンバーをインポート', class: "btn btn-create"
+ = link_to "キャンセル", namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-cancel"
diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml
index 36a6f6a..4477448 100644
--- a/app/views/projects/project_members/index.html.haml
+++ b/app/views/projects/project_members/index.html.haml
@@ -1,25 +1,26 @@
%h3.page-title
- Users with access to this project
+ このプロジェクトにアクセスできるユーザ
%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"
+ から確認できます。
%hr
.clearfix.js-toggle-container
= form_tag namespace_project_project_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form' do
.form-group
- = search_field_tag :search, params[:search], { placeholder: 'Find existing member by name', class: 'form-control search-text-input input-mn-300' }
- = button_tag 'Search', class: 'btn'
+ = search_field_tag :search, params[:search], { placeholder: '登録メンバーを名前で検索', class: 'form-control search-text-input input-mn-300' }
+ = button_tag '検索', class: 'btn'
- if can?(current_user, :admin_project_member, @project)
%span.pull-right
= button_tag class: 'btn btn-new btn-grouped js-toggle-button', type: 'button' do
- Add members
+ メンバーを追加
%i.fa.fa-chevron-down
- = link_to import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-grouped", title: "Import members from another project" do
- Import members
+ = link_to import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-grouped", title: "別のプロジェクトからメンバーをインポート" do
+ メンバーをインポート
.js-toggle-content.hide.new-group-member-holder
= render "new_project_member"
diff --git a/app/views/projects/protected_branches/_branches_list.html.haml b/app/views/projects/protected_branches/_branches_list.html.haml
index bb49f4d..21e1158 100644
--- a/app/views/projects/protected_branches/_branches_list.html.haml
+++ b/app/views/projects/protected_branches/_branches_list.html.haml
@@ -1,12 +1,12 @@
- unless @branches.empty?
%br
- %h4 Already Protected:
+ %h4 保護中のブランチ:
%table.table.protected-branches-list
%thead
%tr.no-border
- %th Branch
- %th Developers can push
- %th Last commit
+ %th ブランチ
+ %th Developerがプッシュ可能
+ %th 最終コミット
%th
%tbody
@@ -17,7 +17,7 @@
= link_to namespace_project_commits_path(@project.namespace, @project, branch.name) do
%strong= branch.name
- if @project.root_ref?(branch.name)
- %span.label.label-info default
+ %span.label.label-info デフォルト
%td
= check_box_tag "developers_can_push", branch.id, branch.developers_can_push, "data-url" => @url
%td
@@ -27,8 +27,8 @@
·
#{time_ago_with_tooltip(commit.committed_date)}
- else
- (branch was removed from repository)
+ (ブランチはリポジトリから削除されました)
%td
.pull-right
- if can? current_user, :admin_project, @project
- = link_to 'Unprotect', [@project.namespace.becomes(Namespace), @project, branch], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn btn-remove btn-sm"
+ = link_to '保護を解除', [@project.namespace.becomes(Namespace), @project, branch], data: { confirm: 'ブランチにDeveloperが書き込みできるようになります。よろしいですか？' }, method: :delete, class: "btn btn-remove btn-sm"
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml
index cfe2808..e2841e6 100644
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
@@ -1,14 +1,14 @@
-%h3.page-title Protected branches
-%p.light Keep stable branches secure and force developers to use Merge Requests
+%h3.page-title 保護ブランチ
+%p.light 安定ブランチを安全にし、開発者にマージリクエストの利用を強制します。
%hr
.alert.alert-info
- %p Protected branches are designed to
+ %p 保護ブランチは以下の目的のために設計されています。
%ul
- %li prevent pushes from everybody except #{link_to "masters", help_page_path("permissions", "permissions"), class: "vlink"}
- %li prevent anyone from force pushing to the branch
- %li prevent anyone from deleting the branch
- %p Read more about #{link_to "project permissions", help_page_path("permissions", "permissions"), class: "underlined-link"}
+ %li #{link_to "Master", help_page_path("permissions", "permissions"), class: "vlink"}権限のメンバー以外によるプッシュを防ぐ
+ %li 強制プッシュからブランチを守る
+ %li ブランチの削除から守る
+ %p プロジェクトの権限についての詳細は #{link_to "こちら", help_page_path("permissions", "permissions"), class: "underlined-link"} からご確認ください。
- if can? current_user, :admin_project, @project
= form_for [@project.namespace.becomes(Namespace), @project, @protected_branch], html: { class: 'form-horizontal' } do |f|
@@ -19,17 +19,17 @@
%li= msg
.form-group
- = f.label :name, "Branch", class: 'control-label'
+ = f.label :name, "ブランチ", class: 'control-label'
.col-sm-10
- = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "select2"})
+ = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "ブランチを選択"}, {class: "select2"})
.form-group
= f.label :developers_can_push, class: 'control-label' do
- Developers can push
+ 開発者はプッシュ可能
.col-sm-10
.checkbox
= f.check_box :developers_can_push
- %span.descr Allow developers to push to this branch
+ %span.descr 開発者にこのブランチへのプッシュを許可
.form-actions
- = f.submit 'Protect', class: "btn-create btn"
+ = f.submit '保護', class: "btn-create btn"
= render 'branches_list'
diff --git a/app/views/projects/repositories/_download_archive.html.haml b/app/views/projects/repositories/_download_archive.html.haml
index 26669fb..191ca22 100644
--- a/app/views/projects/repositories/_download_archive.html.haml
+++ b/app/views/projects/repositories/_download_archive.html.haml
@@ -5,28 +5,28 @@
%span.btn-group{class: btn_class}
= link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), class: 'btn', rel: 'nofollow' do
%i.fa.fa-download
- %span Download zip
+ %span zipをダウンロード
%a.btn.dropdown-toggle{ 'data-toggle' => 'dropdown' }
%span.caret
%span.sr-only
- Select Archive Format
+ アーカイブ形式を選択
%ul.dropdown-menu{ role: 'menu' }
%li
= link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), rel: 'nofollow' do
%i.fa.fa-download
- %span Download zip
+ %span zipをダウンロード
%li
= link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.gz'), rel: 'nofollow' do
%i.fa.fa-download
- %span Download tar.gz
+ %span tar.gzをダウンロード
%li
= link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.bz2'), rel: 'nofollow' do
%i.fa.fa-download
- %span Download tar.bz2
+ %span tar.bz2をダウンロード
%li
= link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar'), rel: 'nofollow' do
%i.fa.fa-download
- %span Download tar
+ %span tarをダウンロード
- else
%span.btn-group{class: btn_class}
= link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), class: 'btn', rel: 'nofollow' do
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index bb98322..6cd600e 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -6,7 +6,7 @@
.back-link
= link_to namespace_project_services_path(@project.namespace, @project) do
- ← to services
+ ← サービス一覧
%hr
@@ -23,7 +23,7 @@
= markdown @service.help
.form-group
- = f.label :active, "Active", class: "control-label"
+ = f.label :active, "アクティブ", class: "control-label"
.col-sm-10
= f.check_box :active
@@ -99,7 +99,7 @@
%span.help-block= help
.form-actions
- = f.submit 'Save', class: 'btn btn-save'
+ = f.submit '保存', class: 'btn btn-save'
- if @service.valid? && @service.activated? && @service.can_test?
- = link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service.to_param), class: 'btn'
+ = link_to '設定をテスト', test_namespace_project_service_path(@project.namespace, @project, @service.to_param), class: 'btn'
diff --git a/app/views/projects/services/index.html.haml b/app/views/projects/services/index.html.haml
index 0d3ccb6..cc38115 100644
--- a/app/views/projects/services/index.html.haml
+++ b/app/views/projects/services/index.html.haml
@@ -1,13 +1,13 @@
-%h3.page-title Project services
-%p.light Project services allow you to integrate GitLab with other applications
+%h3.page-title プロジェクトサービス
+%p.light プロジェクトサービスを使うと、GitLabと他のアプリケーションを統合することができます。
%table.table
%thead
%tr
%th
- %th Service
- %th Description
- %th Last edit
+ %th サービス
+ %th 説明
+ %th 最終更新
- @services.sort_by(&:title).each do |service|
%tr
%td
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 28a8a9f..a86ca9d 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -8,16 +8,16 @@
%ul.nav.nav-tabs
%li.active
= link_to '#tab-activity', 'data-toggle' => 'tab' do
- Activity
+ アクティビティ
- if readme
%li
= link_to '#tab-readme', 'data-toggle' => 'tab' do
Readme
.project-home-links
- unless @project.empty_repo?
- = link_to pluralize(number_with_delimiter(@repository.commit_count), 'commit'), namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref)
- = link_to pluralize(number_with_delimiter(@repository.branch_names.count), 'branch'), namespace_project_branches_path(@project.namespace, @project)
- = link_to pluralize(number_with_delimiter(@repository.tag_names.count), 'tag'), namespace_project_tags_path(@project.namespace, @project)
+ = link_to "#{number_with_delimiter(@repository.commit_count)} コミット", namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref)
+ = link_to "#{number_with_delimiter(@repository.branch_names.count)} ブランチ", namespace_project_branches_path(@project.namespace, @project)
+ = link_to "#{number_with_delimiter(@repository.tag_names.count)} タグ", namespace_project_tags_path(@project.namespace, @project)
%span.light.prepend-left-20= repository_size
.tab-content
@@ -36,37 +36,37 @@
.alert.alert-warning
%h4
%i.fa.fa-exclamation-triangle
- Archived project!
- %p Repository is read-only
+ アーカイブされたプロジェクト
+ %p リポジトリは読み取り専用です
- if @project.forked_from_project
.well
%i.fa.fa-code-fork.project-fork-icon
- Forked from:
+ 以下のリポジトリからフォーク:
%br
= link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)
- unless @project.empty_repo?
= link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: @ref || @repository.root_ref), class: 'btn btn-block' do
- Compare code
+ コードを比較
- if @repository.version
- version = @repository.version
= link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, version.name)), class: 'btn btn-block' do
- Version:
+ バージョン:
%span.count
= @repository.blob_by_oid(version.id).data
.prepend-top-10
%p
- %span.light Created on
- #{@project.created_at.stamp('Aug 22, 2013')}
+ #{@project.created_at.stamp('2013/08/22')}
+ %span.light に作成
%p
- %span.light Owned by
- if @project.group
- #{link_to @project.group.name, @project.group} group
+ #{link_to @project.group.name, @project.group} グループ
- else
#{link_to @project.owner_name, @project.owner}
+ %span.light が所有
- @project.ci_services.each do |ci_service|
- if ci_service.active? && ci_service.respond_to?(:builds_path)
diff --git a/app/views/projects/snippets/edit.html.haml b/app/views/projects/snippets/edit.html.haml
index 2d4d5d0..5f83c6c 100644
--- a/app/views/projects/snippets/edit.html.haml
+++ b/app/views/projects/snippets/edit.html.haml
@@ -1,4 +1,4 @@
%h3.page-title
- Edit snippet
+ スニペットを編集
%hr
= render "shared/snippets/form", url: namespace_project_snippet_path(@project.namespace, @project, @snippet)
diff --git a/app/views/projects/snippets/index.html.haml b/app/views/projects/snippets/index.html.haml
index e2d8ec6..19c704c 100644
--- a/app/views/projects/snippets/index.html.haml
+++ b/app/views/projects/snippets/index.html.haml
@@ -1,15 +1,15 @@
%h3.page-title
- Snippets
+ スニペット
- if can? current_user, :write_project_snippet, @project
- = link_to new_namespace_project_snippet_path(@project.namespace, @project), class: "btn btn-new pull-right", title: "New Snippet" do
- Add new snippet
+ = link_to new_namespace_project_snippet_path(@project.namespace, @project), class: "btn btn-new pull-right", title: "新しいスニペット" do
+ 新しいスニペットを追加
%p.light
- Share code pastes with others out of git repository
+ コードをGitリポジトリの外で共有しましょう。
%hr
%ul.bordered-list
= render partial: "projects/snippets/snippet", collection: @snippets
- if @snippets.empty?
%li
- .nothing-here-block Nothing here.
+ .nothing-here-block スニペットはありません
diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml
index d19689a..89138d1 100644
--- a/app/views/projects/snippets/show.html.haml
+++ b/app/views/projects/snippets/show.html.haml
@@ -2,8 +2,8 @@
= @snippet.title
.pull-right
- = link_to new_namespace_project_snippet_path(@project.namespace, @project), class: "btn btn-new", title: "New Snippet" do
- Add new snippet
+ = link_to new_namespace_project_snippet_path(@project.namespace, @project), class: "btn btn-new", title: "新しいスニペット" do
+ 新しいスニペットを追加
%hr
@@ -18,7 +18,7 @@
.back-link
= link_to namespace_project_snippets_path(@project.namespace, @project) do
- ← project snippets
+ ← プロジェクトスニペット
.file-holder
.file-title
@@ -28,10 +28,10 @@
.file-actions
.btn-group
- if can?(current_user, :modify_project_snippet, @snippet)
- = link_to "edit", edit_namespace_project_snippet_path(@project.namespace, @project, @snippet), class: "btn btn-sm", title: 'Edit Snippet'
+ = link_to "編集", edit_namespace_project_snippet_path(@project.namespace, @project, @snippet), class: "btn btn-sm", title: 'スニペットを編集'
= link_to "raw", raw_namespace_project_snippet_path(@project.namespace, @project, @snippet), class: "btn btn-sm", target: "_blank"
- if can?(current_user, :admin_project_snippet, @snippet)
- = link_to "remove", namespace_project_snippet_path(@project.namespace, @project, @snippet), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-sm btn-remove", title: 'Delete Snippet'
+ = link_to "削除", namespace_project_snippet_path(@project.namespace, @project, @snippet), method: :delete, data: { confirm: "本当に削除しますか？" }, class: "btn btn-sm btn-remove", title: 'スニペットを削除'
= render 'shared/snippets/blob'
%div#notes= render "projects/notes/notes_with_form"
diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml
index f22308e..d0c5f9b 100644
--- a/app/views/projects/tags/_tag.html.haml
+++ b/app/views/projects/tags/_tag.html.haml
@@ -11,7 +11,7 @@
- if can? current_user, :download_code, @project
= render 'projects/repositories/download_archive', ref: tag.name, btn_class: 'btn-grouped btn-group-sm'
- if can?(current_user, :admin_project, @project)
- = link_to namespace_project_tag_path(@project.namespace, @project, tag.name), class: 'btn btn-sm btn-remove remove-row grouped', method: :delete, data: { confirm: 'Removed tag cannot be restored. Are you sure?'}, remote: true do
+ = link_to namespace_project_tag_path(@project.namespace, @project, tag.name), class: 'btn btn-sm btn-remove remove-row grouped', method: :delete, data: { confirm: 'タグの削除は元に戻せません。本当に削除しますか？'}, remote: true do
%i.fa.fa-trash-o
- if commit
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index f1bc2bc..991c09b 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -1,15 +1,15 @@
= render "projects/commits/head"
%h3.page-title
- Git Tags
+ Gitタグ
- if can? current_user, :push_code, @project
.pull-right
= link_to new_namespace_project_tag_path(@project.namespace, @project), class: 'btn btn-create new-tag-btn' do
%i.fa.fa-add-sign
- New tag
+ タグを作成
%p.light
- Tags give the ability to mark specific points in history as being important
+ タグを使うと、コミット履歴上で重要なポイントをマークすることができます。
%hr
.tags
@@ -22,9 +22,9 @@
- else
.nothing-here-block
- Repository has no tags yet.
+ このリポジトリにはまだタグがありません。
%br
%small
- Use git tag command to add a new one:
+ git tag コマンドを使って新しいタグを作成できます:
%br
%span.monospace git tag -a v1.4 -m 'version 1.4'
diff --git a/app/views/projects/tags/new.html.haml b/app/views/projects/tags/new.html.haml
index 6550444..ae7b2d2 100644
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
@@ -4,25 +4,25 @@
= @error
%h3.page-title
%i.fa.fa-code-fork
- New tag
+ タグを作成
= form_tag namespace_project_tags_path, method: :post, id: "new-tag-form", class: "form-horizontal" do
.form-group
- = label_tag :tag_name, 'Name for new tag', class: 'control-label'
+ = label_tag :tag_name, 'タグ名', class: 'control-label'
.col-sm-10
= text_field_tag :tag_name, params[:tag_name], placeholder: 'v3.0.1', required: true, tabindex: 1, class: 'form-control'
.form-group
- = label_tag :ref, 'Create from', class: 'control-label'
+ = label_tag :ref, 'タグ対象', class: 'control-label'
.col-sm-10
= text_field_tag :ref, params[:ref], placeholder: 'master', required: true, tabindex: 2, class: 'form-control'
- .light Branch name or commit SHA
+ .light ブランチ名またはコミットSHA
.form-group
- = label_tag :message, 'Message', class: 'control-label'
+ = label_tag :message, 'メッセージ', class: 'control-label'
.col-sm-10
- = text_field_tag :message, nil, placeholder: 'Enter message.', required: false, tabindex: 3, class: 'form-control'
- .light (Optional) Entering a message will create an annotated tag.
+ = text_field_tag :message, nil, placeholder: 'メッセージを入力', required: false, tabindex: 3, class: 'form-control'
+ .light (オプション) メッセージを入力すると注釈付きタグが作成されます。
.form-actions
- = button_tag 'Create tag', class: 'btn btn-create', tabindex: 3
- = link_to 'Cancel', namespace_project_tags_path(@project.namespace, @project), class: 'btn btn-cancel'
+ = button_tag 'タグを作成', class: 'btn btn-create', tabindex: 3
+ = link_to 'キャンセル', namespace_project_tags_path(@project.namespace, @project), class: 'btn btn-cancel'
:javascript
disableButtonIfAnyEmptyField($("#new-tag-form"), ".form-control", ".btn-create");
diff --git a/app/views/projects/team_members/index.html.haml b/app/views/projects/team_members/index.html.haml
new file mode 100644
index 0000000..fe3904f
--- /dev/null
+++ b/app/views/projects/team_members/index.html.haml
@@ -0,0 +1,17 @@
+%h3.page-title
+ プロジェクトにアクセス可能なユーザ
+
+ - if can? current_user, :admin_team_member, @project
+ %span.pull-right
+ = link_to new_project_team_member_path(@project), class: "btn btn-new btn-grouped", title: "メンバーを追加" do
+ メンバーを追加
+ = link_to import_project_team_members_path(@project), class: "btn btn-grouped", title: "別のプロジェクトからメンバーをインポート" do
+ メンバーをインポート
+
+%p.light
+ プロジェクトのアクセス権についての詳細は、
+ %strong= link_to "こちら", help_page_path("permissions", "permissions"), class: "vlink"
+ から確認できます。
+= render "team", members: @project_members
+- if @group
+ = render "group_members"
diff --git a/app/views/projects/tree/_spinner.html.haml b/app/views/projects/tree/_spinner.html.haml
index b47ad0f..7aad521 100644
--- a/app/views/projects/tree/_spinner.html.haml
+++ b/app/views/projects/tree/_spinner.html.haml
@@ -1,3 +1,3 @@
%span.log_loading.hide
%i.fa.fa-spinner.fa-spin
- Loading commit data...
+ コミットデータを読み込んでいます...
diff --git a/app/views/projects/tree/_tree.html.haml b/app/views/projects/tree/_tree.html.haml
index d304690..cb50ec0 100644
--- a/app/views/projects/tree/_tree.html.haml
+++ b/app/views/projects/tree/_tree.html.haml
@@ -10,7 +10,7 @@
= link_to title, '#'
- if current_user && can_push_branch?(@project, @ref)
%li
- = link_to namespace_project_new_blob_path(@project.namespace, @project, @id), title: 'New file', id: 'new-file-link' do
+ = link_to namespace_project_new_blob_path(@project.namespace, @project, @id), title: '新しいファイル', id: 'new-file-link' do
%small
%i.fa.fa-plus
@@ -18,10 +18,15 @@
%table#tree-slider{class: "table_#{@hex_path} tree-table" }
%thead
%tr
- %th Name
- %th Last Update
+ %th ファイル名
+ %th 最終更新
+ %th.hidden-sm
+ 最終コミット
+ %span.last-commit
+ %th ファイル名
+ %th 最終更新
%th.hidden-xs
- .pull-left Last Commit
+ .pull-left 最終コミット
.last-commit.hidden-sm.pull-left
%i.fa.fa-angle-right
@@ -30,7 +35,7 @@
= link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit)
–
= truncate(@commit.title, length: 50)
- = link_to 'History', namespace_project_commits_path(@project.namespace, @project, @id), class: 'pull-right'
+ = link_to '履歴', namespace_project_commits_path(@project.namespace, @project, @id), class: 'pull-right'
- if @path.present?
%tr.tree-item
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index 9fbfa0b..240781a 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -7,7 +7,7 @@
= f.hidden_field :title, value: @page.title
.form-group
- = f.label :format, class: 'control-label'
+ = f.label :format, 'フォーマット', class: 'control-label'
.col-sm-10
= f.select :format, options_for_select(ProjectWiki::MARKUPS, {selected: @page.format}), {}, class: "form-control"
@@ -15,32 +15,32 @@
.col-sm-2
.col-sm-10
%p.cgray
- To link to a (new) page you can just type
+ (新しい)ページをリンクするには
%code [Link Title](page-slug)
- \.
+ と記述します。
.form-group.wiki-content
- = f.label :content, class: 'control-label'
+ = f.label :content, '内容', class: 'control-label'
.col-sm-10
= render layout: 'projects/md_preview', locals: { preview_class: "wiki" } do
= render 'projects/zen', f: f, attr: :content, classes: 'description form-control'
.col-sm-12.hint
- .pull-left Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}
- .pull-right Attach files by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }.
+ .pull-left Wikiの内容は#{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}記法でパースされます
+ .pull-right ドラッグ & ドロップまたは#{link_to "ファイルを選択", '#', class: 'markdown-selector' }してファイルを添付
.clearfix
.error-alert
.form-group
- = f.label :commit_message, class: 'control-label'
+ = f.label :commit_message, 'コミットメッセージ', class: 'control-label'
.col-sm-10= f.text_field :message, class: 'form-control', rows: 18
.form-actions
- if @page && @page.persisted?
- = f.submit 'Save changes', class: "btn-save btn"
- = link_to "Cancel", namespace_project_wiki_path(@project.namespace, @project, @page), class: "btn btn-cancel"
+ = f.submit '変更を保存', class: "btn-save btn"
+ = link_to "キャンセル", namespace_project_wiki_path(@project.namespace, @project, @page), class: "btn btn-cancel"
- else
- = f.submit 'Create page', class: "btn-create btn"
- = link_to "Cancel", namespace_project_wiki_path(@project.namespace, @project, :home), class: "btn btn-cancel"
+ = f.submit 'ページを作成', class: "btn-create btn"
+ = link_to "キャンセル", namespace_project_wiki_path(@project.namespace, @project, :home), class: "btn btn-cancel"
:javascript
window.project_uploads_path = "#{namespace_project_uploads_path @project.namespace, @project}";
diff --git a/app/views/projects/wikis/_main_links.html.haml b/app/views/projects/wikis/_main_links.html.haml
index 633214a..8ce4a12 100644
--- a/app/views/projects/wikis/_main_links.html.haml
+++ b/app/views/projects/wikis/_main_links.html.haml
@@ -1,8 +1,8 @@
%span.pull-right
- if (@page && @page.persisted?)
= link_to history_namespace_project_wiki_path(@project.namespace, @project, @page), class: "btn btn-grouped" do
- Page History
+ ページ更新履歴
- if can?(current_user, :write_wiki, @project)
= link_to edit_namespace_project_wiki_path(@project.namespace, @project, @page), class: "btn btn-grouped" do
%i.fa.fa-pencil-square-o
- Edit
+ 編集
diff --git a/app/views/projects/wikis/_nav.html.haml b/app/views/projects/wikis/_nav.html.haml
index 693c3fa..06ef783 100644
--- a/app/views/projects/wikis/_nav.html.haml
+++ b/app/views/projects/wikis/_nav.html.haml
@@ -1,19 +1,19 @@
%ul.nav.nav-tabs
= nav_link(html_options: {class: params[:id] == 'home' ? 'active' : '' }) do
- = link_to 'Home', namespace_project_wiki_path(@project.namespace, @project, :home)
+ = link_to 'ホーム', namespace_project_wiki_path(@project.namespace, @project, :home)
= nav_link(path: 'wikis#pages') do
- = link_to 'Pages', pages_namespace_project_wikis_path(@project.namespace, @project)
+ = link_to 'ページ', pages_namespace_project_wikis_path(@project.namespace, @project)
= nav_link(path: 'wikis#git_access') do
= link_to git_access_namespace_project_wikis_path(@project.namespace, @project) do
%i.fa.fa-download
- Git Access
+ Gitでのアクセス
- if can?(current_user, :write_wiki, @project)
.pull-right
= link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
%i.fa.fa-plus
- New Page
+ 新しいページ
= render 'projects/wikis/new'
diff --git a/app/views/projects/wikis/_new.html.haml b/app/views/projects/wikis/_new.html.haml
index 6834969..844ef8a 100644
--- a/app/views/projects/wikis/_new.html.haml
+++ b/app/views/projects/wikis/_new.html.haml
@@ -3,12 +3,12 @@
.modal-content
.modal-header
%a.close{href: "#", "data-dismiss" => "modal"} ×
- %h3.page-title New Wiki Page
+ %h3.page-title Wikiページを作成
.modal-body
= label_tag :new_wiki_path do
%span Page slug
= text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'form-control', required: true, :'data-wikis-path' => namespace_project_wikis_path(@project.namespace, @project)
%p.hint
- Please don't use spaces.
+ スペースを使わないでください。
.modal-footer
- = link_to 'Build', '#', class: 'build-new-wiki btn btn-create'
+ = link_to '作成', '#', class: 'build-new-wiki btn btn-create'
diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml
index 566850c..d1933c5 100644
--- a/app/views/projects/wikis/edit.html.haml
+++ b/app/views/projects/wikis/edit.html.haml
@@ -2,12 +2,12 @@
.pull-right
= render 'main_links'
%h3.page-title
- Editing -
%span.light #{@page.title}
+ を編集中
%hr
= render 'form'
.pull-right
- if @page.persisted? && can?(current_user, :admin_wiki, @project)
- = link_to namespace_project_wiki_path(@project.namespace, @project, @page), data: { confirm: "Are you sure you want to delete this page?"}, method: :delete, class: "btn btn-sm btn-remove" do
- Delete this page
+ = link_to namespace_project_wiki_path(@project.namespace, @project, @page), data: { confirm: "本当にこのページを削除しますか？"}, method: :delete, class: "btn btn-sm btn-remove" do
+ このページを削除
diff --git a/app/views/projects/wikis/empty.html.haml b/app/views/projects/wikis/empty.html.haml
index 4805812..7cf3a01 100644
--- a/app/views/projects/wikis/empty.html.haml
+++ b/app/views/projects/wikis/empty.html.haml
@@ -1,4 +1,4 @@
-%h3.page-title Empty page
+%h3.page-title 空のページ
%hr
.error_message
- You are not allowed to create wiki pages
+ Wikiページの作成は許可されていません
diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml
index 365edb5..ed2d0b0 100644
--- a/app/views/projects/wikis/git_access.html.haml
+++ b/app/views/projects/wikis/git_access.html.haml
@@ -2,26 +2,26 @@
.row
.col-sm-6
%h3.page-title
- Git access for
%strong= @project_wiki.path_with_namespace
+ へのGitでのアクセス
.col-sm-6
= render "shared/clone_panel", project: @project_wiki
.git-empty
%fieldset
- %legend Install Gollum:
+ %legend Gollumをインストール:
%pre.dark
:preserve
gem install gollum
- %legend Clone Your Wiki:
+ %legend このWikiをクローン:
%pre.dark
:preserve
git clone #{ content_tag(:span, default_url_to_repo(@project_wiki), class: 'clone')}
cd #{@project_wiki.path}
- %legend Start Gollum And Edit Locally:
+ %legend Gollumを開始してローカルで編集:
%pre.dark
:preserve
gollum
diff --git a/app/views/projects/wikis/history.html.haml b/app/views/projects/wikis/history.html.haml
index 91291f7..de294f3 100644
--- a/app/views/projects/wikis/history.html.haml
+++ b/app/views/projects/wikis/history.html.haml
@@ -1,16 +1,16 @@
= render 'nav'
%h3.page-title
- %span.light History for
= link_to @page.title, namespace_project_wiki_path(@project.namespace, @project, @page)
+ %span.light の更新履歴
%table.table
%thead
%tr
- %th Page version
- %th Author
- %th Commit Message
- %th Last updated
- %th Format
+ %th バージョン
+ %th 更新者
+ %th コミットメッセージ
+ %th 最終更新日
+ %th 形式
%tbody
- @page.versions.each_with_index do |version, index|
- commit = version
diff --git a/app/views/projects/wikis/pages.html.haml b/app/views/projects/wikis/pages.html.haml
index ee233d9..cf022a3 100644
--- a/app/views/projects/wikis/pages.html.haml
+++ b/app/views/projects/wikis/pages.html.haml
@@ -1,6 +1,6 @@
= render 'nav'
%h3.page-title
- All Pages
+ すべてのページ
%ul.bordered-list
- @wiki_pages.each do |wiki_page|
%li
@@ -8,5 +8,5 @@
= link_to wiki_page.title, namespace_project_wiki_path(@project.namespace, @project, wiki_page)
%small (#{wiki_page.format})
.pull-right
- %small Last edited #{time_ago_with_tooltip(wiki_page.commit.authored_date)}
+ %small 最終更新：#{time_ago_with_tooltip(wiki_page.commit.authored_date)}
= paginate @wiki_pages, theme: 'gitlab'
diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml
index a6263e9..297adfb 100644
--- a/app/views/projects/wikis/show.html.haml
+++ b/app/views/projects/wikis/show.html.haml
@@ -17,4 +17,4 @@
%hr
.wiki-last-edit-by
- Last edited by #{@page.commit.author.name} #{time_ago_with_tooltip(@page.commit.authored_date)}
+ #{@page.commit.author.name}が#{time_ago_with_tooltip(@page.commit.authored_date)}に更新
diff --git a/app/views/search/_filter.html.haml b/app/views/search/_filter.html.haml
index ffc1454..97e16c3 100644
--- a/app/views/search/_filter.html.haml
+++ b/app/views/search/_filter.html.haml
@@ -1,16 +1,16 @@
.dropdown.inline
%button.dropdown-toggle.btn.btn-sm{type: 'button', 'data-toggle' => 'dropdown'}
%i.fa.fa-tags
- %span.light Group:
+ %span.light グループ:
- if @group.present?
%strong= @group.name
- else
- Any
+ 指定なし
%b.caret
%ul.dropdown-menu
%li
= link_to search_filter_path(group_id: nil) do
- Any
+ 指定なし
- current_user.authorized_groups.sort_by(&:name).each do |group|
%li
= link_to search_filter_path(group_id: group.id, project_id: nil) do
@@ -19,16 +19,16 @@
.dropdown.inline.prepend-left-10.project-filter
%button.dropdown-toggle.btn.btn-sm{type: 'button', 'data-toggle' => 'dropdown'}
%i.fa.fa-tags
- %span.light Project:
+ %span.light プロジェクト:
- if @project.present?
%strong= @project.name_with_namespace
- else
- Any
+ 指定なし
%b.caret
%ul.dropdown-menu
%li
= link_to search_filter_path(project_id: nil) do
- Any
+ 指定なし
- current_user.authorized_projects.sort_by(&:name_with_namespace).each do |project|
%li
= link_to search_filter_path(project_id: project.id, group_id: nil) do
diff --git a/app/views/search/_global_filter.html.haml b/app/views/search/_global_filter.html.haml
index 442bd84..8be1db9 100644
--- a/app/views/search/_global_filter.html.haml
+++ b/app/views/search/_global_filter.html.haml
@@ -1,16 +1,16 @@
%ul.nav.nav-pills.nav-stacked.search-filter
%li{class: ("active" if @scope == 'projects')}
= link_to search_filter_path(scope: 'projects') do
- Projects
+ プロジェクト
.pull-right
= @search_results.projects_count
%li{class: ("active" if @scope == 'issues')}
= link_to search_filter_path(scope: 'issues') do
- Issues
+ 課題
.pull-right
= @search_results.issues_count
%li{class: ("active" if @scope == 'merge_requests')}
= link_to search_filter_path(scope: 'merge_requests') do
- Merge requests
+ マージリクエスト
.pull-right
= @search_results.merge_requests_count
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml
index 796dd75..3c61e62 100644
--- a/app/views/search/_results.html.haml
+++ b/app/views/search/_results.html.haml
@@ -1,10 +1,10 @@
%h4
- #{@search_results.total_count} results found
+ #{@search_results.total_count} 件が見つかりました
- unless @show_snippets
- if @project
- for #{link_to @project.name_with_namespace, [@project.namespace.becomes(Namespace), @project]}
+ (#{link_to @project.name_with_namespace, [@project.namespace.becomes(Namespace), @project]} プロジェクト内)
- elsif @group
- for #{link_to @group.name, @group}
+ (#{link_to @group.name, @group} グループ内)
%hr
diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml
index 2efa616..77f405e 100644
--- a/app/views/search/results/_merge_request.html.haml
+++ b/app/views/search/results/_merge_request.html.haml
@@ -11,6 +11,6 @@
#{merge_request.project.name_with_namespace}
.pull-right
- if merge_request.merged?
- %span.label.label-primary Merged
+ %span.label.label-primary マージ済み
- elsif merge_request.closed?
- %span.label.label-danger Closed
+ %span.label.label-danger クローズ済み
diff --git a/app/views/search/results/_note.html.haml b/app/views/search/results/_note.html.haml
index 5fcba2b..0d316d5 100644
--- a/app/views/search/results/_note.html.haml
+++ b/app/views/search/results/_note.html.haml
@@ -3,7 +3,7 @@
%h5.note-search-caption.str-truncated
%i.fa.fa-comment
= link_to_member(project, note.author, avatar: false)
- commented on
+ が
- if note.for_commit?
= link_to project do
@@ -19,6 +19,7 @@
·
= link_to [project.namespace.becomes(Namespace), project, note.noteable, anchor: dom_id(note)] do
= note.noteable.title
+ でコメントしました
.note-search-result
.term
diff --git a/app/views/search/show.html.haml b/app/views/search/show.html.haml
index 5b4816e..00e2298 100644
--- a/app/views/search/show.html.haml
+++ b/app/views/search/show.html.haml
@@ -2,11 +2,11 @@
.search-holder.clearfix
.form-group
= label_tag :search, class: 'control-label' do
- %span Looking for
+ %span 次を検索：
.col-sm-6
- = search_field_tag :search, params[:search], placeholder: "issue 143", class: "form-control search-text-input", id: "dashboard_search"
+ = search_field_tag :search, params[:search], placeholder: "課題143", class: "form-control search-text-input", id: "dashboard_search"
.col-sm-4
- = button_tag 'Search', class: "btn btn-create"
+ = button_tag '検索', class: "btn btn-create"
.form-group
.col-sm-2
- unless params[:snippets].eql? 'true'
diff --git a/app/views/shared/_choose_group_avatar_button.html.haml b/app/views/shared/_choose_group_avatar_button.html.haml
index 000532b..2a46587 100644
--- a/app/views/shared/_choose_group_avatar_button.html.haml
+++ b/app/views/shared/_choose_group_avatar_button.html.haml
@@ -1,7 +1,7 @@
%a.choose-btn.btn.btn-sm.js-choose-group-avatar-button
%i.fa.fa-paperclip
- %span Choose File ...
+ %span ファイルを選択 ...
-%span.file_name.js-avatar-filename File name...
+%span.file_name.js-avatar-filename ファイル名...
= f.file_field :avatar, class: 'js-group-avatar-input hidden'
-.light The maximum file size allowed is 200KB.
+.light ファイルの最大サイズは200KBです
diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml
index a112175..8a6d2d5 100644
--- a/app/views/shared/_clone_panel.html.haml
+++ b/app/views/shared/_clone_panel.html.haml
@@ -4,7 +4,7 @@
%button{ |
class: "btn #{ 'active' if default_clone_protocol == 'ssh' }#{ ' has_tooltip' if current_user && current_user.require_ssh_key? }", |
:"data-clone" => project.ssh_url_to_repo, |
- :"data-title" => "Add an SSH key to your profile
to pull or push via SSH",
+ :"data-title" => "SSHでプル/プッシュするためにはプロフィールにSSHキーを追加してください",
:"data-html" => "true",
:"data-container" => "body"}
SSH
@@ -18,6 +18,6 @@
= text_field_tag :project_clone, default_url_to_repo(project), class: "one_click_select form-control", readonly: true
- if project.kind_of?(Project)
.input-group-addon
- .visibility-level-label.has_tooltip{'data-title' => "#{visibility_level_label(project.visibility_level)} project" }
+ .visibility-level-label.has_tooltip{'data-title' => "#{visibility_level_label(project.visibility_level)} プロジェクト" }
= visibility_level_icon(project.visibility_level)
= visibility_level_label(project.visibility_level).downcase
diff --git a/app/views/shared/_commit_message_container.html.haml b/app/views/shared/_commit_message_container.html.haml
index 5071ff6..4f39f09 100644
--- a/app/views/shared/_commit_message_container.html.haml
+++ b/app/views/shared/_commit_message_container.html.haml
@@ -1,6 +1,6 @@
.form-group.commit_message-group
= label_tag 'commit_message', class: 'control-label' do
- Commit message
+ コミットメッセージ
.col-sm-10
.commit-message-container
.max-width-marker
@@ -10,5 +10,5 @@
required: true, rows: (local_assigns[:rows] || 3)
- if local_assigns[:hint]
%p.hint
- Try to keep the first line under 52 characters
- and the others under 72.
+ 1行目はなるべく52文字以下に、
+ 他の行は72文字以下にするようにしてください。
diff --git a/app/views/shared/_confirm_modal.html.haml b/app/views/shared/_confirm_modal.html.haml
index 30ba361..ef7b946 100644
--- a/app/views/shared/_confirm_modal.html.haml
+++ b/app/views/shared/_confirm_modal.html.haml
@@ -3,20 +3,20 @@
.modal-content
.modal-header
%a.close{href: "#", "data-dismiss" => "modal"} ×
- %h4 Confirmation required
+ %h4 確認が必要です
.modal-body
%p.cred.lead.js-confirm-text
%p
- This action can lead to data loss.
- To prevent accidental actions we ask you to confirm your intention.
+ このアクションはデータを損失する可能性があります。
+ 誤った操作を防ぐため、意図した操作であるかどうかを確認します。
%br
- Please type
+ 続行するには、Please type
%code.js-confirm-danger-match #{phrase}
- to proceed or close this modal to cancel
+ を入力するか、ダイアログを閉じてキャンセルしてください
.form-group
= text_field_tag 'confirm_name_input', '', class: 'form-control js-confirm-danger-input'
.form-group
- = submit_tag 'Confirm', class: "btn btn-danger js-confirm-danger-submit"
+ = submit_tag '確認', class: "btn btn-danger js-confirm-danger-submit"
diff --git a/app/views/shared/_event_filter.html.haml b/app/views/shared/_event_filter.html.haml
index d07a9e2..61cd7a9 100644
--- a/app/views/shared/_event_filter.html.haml
+++ b/app/views/shared/_event_filter.html.haml
@@ -1,19 +1,19 @@
%ul.nav.nav-pills.event_filter
- = event_filter_link EventFilter.push, 'Push events'
- = event_filter_link EventFilter.merged, 'Merge events'
- = event_filter_link EventFilter.comments, 'Comments'
- = event_filter_link EventFilter.team, 'Team'
+ = event_filter_link EventFilter.push, 'プッシュイベント'
+ = event_filter_link EventFilter.merged, 'マージイベント'
+ = event_filter_link EventFilter.comments, 'コメント'
+ = event_filter_link EventFilter.team, 'チーム'
- if current_user
- if current_controller?(:dashboard)
%li.pull-right
= link_to dashboard_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
%i.fa.fa-rss
- News Feed
+ ニュースフィード
- if current_controller?(:groups)
%li.pull-right
- = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'rss-btn' do
+ = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "フィード", class: 'rss-btn' do
%i.fa.fa-rss
- News Feed
+ ニュースフィード
%hr
diff --git a/app/views/shared/_group_form.html.haml b/app/views/shared/_group_form.html.haml
index b34dd53..b0deb70 100644
--- a/app/views/shared/_group_form.html.haml
+++ b/app/views/shared/_group_form.html.haml
@@ -1,13 +1,13 @@
- if @group.persisted?
.form-group
= f.label :name, class: 'control-label' do
- Group name
+ グループ名
.col-sm-10
= f.text_field :name, placeholder: 'open-source', class: 'form-control'
.form-group
= f.label :path, class: 'control-label' do
- Group path
+ グループパス
.col-sm-10
.input-group
.input-group-addon
@@ -17,13 +17,13 @@
- if @group.persisted?
.alert.alert-danger
%ul
- %li Changing group path can have unintended side effects.
- %li Renaming group path will rename directory for all related projects
- %li It will change web url for access group and group projects.
- %li It will change the git path to repositories under this group.
+ %li グループのパスを変更すると予期しない副作用が生じる可能性があります。
+ %li グループのパスを変更すると関連するすべてのプロジェクトのディレクトリ名が変更されます。
+ %li グループとグループ内のすべてのプロジェクトのWeb URLが変更されます。
+ %li グループ内のリポジトリのGitのパスも変更されます。
.form-group.group-description-holder
- = f.label :description, 'Details', class: 'control-label'
+ = f.label :description, '詳細', class: 'control-label'
.col-sm-10
= f.text_area :description, maxlength: 250,
class: 'form-control js-gfm-input', rows: 4
diff --git a/app/views/shared/_group_tips.html.haml b/app/views/shared/_group_tips.html.haml
index e5cf783..143000e 100644
--- a/app/views/shared/_group_tips.html.haml
+++ b/app/views/shared/_group_tips.html.haml
@@ -1,6 +1,6 @@
%ul
- %li A group is a collection of several projects
- %li Groups are private by default
- %li Members of a group may only view projects they have permission to access
- %li Group project URLs are prefixed with the group namespace
- %li Existing projects may be moved into a group
+ %li グループは複数のプロジェクトの集合です。
+ %li グループはデフォルトではプライベートです。
+ %li グループのメンバーはアクセス権のあるプロジェクトだけ参照することができます。
+ %li グループのプロジェクトのURLにはグループのネームスペースのプレフィクスが付きます。
+ %li 既存のプロジェクトをグループに移すこともできます。
diff --git a/app/views/shared/_issuable_filter.html.haml b/app/views/shared/_issuable_filter.html.haml
index 5412b9e..5e78e6c 100644
--- a/app/views/shared/_issuable_filter.html.haml
+++ b/app/views/shared/_issuable_filter.html.haml
@@ -4,15 +4,15 @@
%li{class: ("active" if params[:state] == 'opened')}
= link_to page_filter_path(state: 'opened') do
%i.fa.fa-exclamation-circle
- Open
+ オープン
%li{class: ("active" if params[:state] == 'closed')}
= link_to page_filter_path(state: 'closed') do
%i.fa.fa-check-circle
- Closed
+ クローズ
%li{class: ("active" if params[:state] == 'all')}
= link_to page_filter_path(state: 'all') do
%i.fa.fa-compass
- All
+ すべて
%div
- if controller.controller_name == 'issues'
@@ -24,20 +24,20 @@
.dropdown.inline.assignee-filter
%button.dropdown-toggle.btn{type: 'button', "data-toggle" => "dropdown"}
%i.fa.fa-user
- %span.light assignee:
+ %span.light 担当:
- if @assignee.present?
%strong= @assignee.name
- elsif params[:assignee_id] == "0"
- Unassigned
+ 担当なし
- else
- Any
+ 指定なし
%b.caret
%ul.dropdown-menu
%li
= link_to page_filter_path(assignee_id: nil) do
- Any
+ 指定なし
= link_to page_filter_path(assignee_id: 0) do
- Unassigned
+ 担当なし
- @assignees.sort_by(&:name).each do |user|
%li
= link_to page_filter_path(assignee_id: user.id) do
@@ -47,20 +47,20 @@
.dropdown.inline.prepend-left-10.author-filter
%button.dropdown-toggle.btn{type: 'button', "data-toggle" => "dropdown"}
%i.fa.fa-user
- %span.light author:
+ %span.light 作成:
- if @author.present?
%strong= @author.name
- elsif params[:author_id] == "0"
- Unassigned
+ 担当なし
- else
- Any
+ 指定なし
%b.caret
%ul.dropdown-menu
%li
= link_to page_filter_path(author_id: nil) do
- Any
+ 指定なし
= link_to page_filter_path(author_id: 0) do
- Unassigned
+ 担当なし
- @authors.sort_by(&:name).each do |user|
%li
= link_to page_filter_path(author_id: user.id) do
@@ -70,20 +70,20 @@
.dropdown.inline.prepend-left-10.milestone-filter
%button.dropdown-toggle.btn{type: 'button', "data-toggle" => "dropdown"}
%i.fa.fa-clock-o
- %span.light milestone:
+ %span.light マイルストーン:
- if @milestone.present?
%strong= @milestone.title
- elsif params[:milestone_id] == "0"
- None (backlog)
+ なし (backlog)
- else
- Any
+ 指定なし
%b.caret
%ul.dropdown-menu
%li
= link_to page_filter_path(milestone_id: nil) do
- Any
+ 指定なし
= link_to page_filter_path(milestone_id: 0) do
- None (backlog)
+ なし (backlog)
- @milestones.each do |milestone|
%li
= link_to page_filter_path(milestone_id: milestone.id) do
@@ -94,16 +94,16 @@
.dropdown.inline.prepend-left-10.labels-filter
%button.dropdown-toggle.btn{type: 'button', "data-toggle" => "dropdown"}
%i.fa.fa-tags
- %span.light label:
+ %span.light ラベル:
- if params[:label_name].present?
%strong= params[:label_name]
- else
- Any
+ 指定なし
%b.caret
%ul.dropdown-menu
%li
= link_to page_filter_path(label_name: nil) do
- Any
+ 指定なし
- if @project.labels.any?
- @project.labels.each do |label|
%li
@@ -113,7 +113,7 @@
%li
= link_to generate_namespace_project_labels_path(@project.namespace, @project, redirect: request.original_url), method: :post do
%i.fa.fa-plus-circle
- Create default labels
+ 標準のラベルを生成
.pull-right
= render 'shared/sort_dropdown'
diff --git a/app/views/shared/_issuable_search_form.html.haml b/app/views/shared/_issuable_search_form.html.haml
index 639d203..967c966 100644
--- a/app/views/shared/_issuable_search_form.html.haml
+++ b/app/views/shared/_issuable_search_form.html.haml
@@ -1,6 +1,6 @@
= form_tag(path, method: :get, id: "issue_search_form", class: 'pull-left issue-search-form') do
.append-right-10.hidden-xs.hidden-sm
- = search_field_tag :issue_search, params[:issue_search], { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input input-mn-300' }
+ = search_field_tag :issue_search, params[:issue_search], { placeholder: 'タイトル, 説明で絞り込み', class: 'form-control issue_search search-text-input input-mn-300' }
= hidden_field_tag :state, params['state']
= hidden_field_tag :scope, params['scope']
= hidden_field_tag :assignee_id, params['assignee_id']
diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml
index 0dbb6a0..e13ff38 100644
--- a/app/views/shared/_issues.html.haml
+++ b/app/views/shared/_issues.html.haml
@@ -4,12 +4,12 @@
- project = group[0]
.panel-heading
= link_to_project project
- = link_to 'show all', namespace_project_issues_path(project.namespace, project), class: 'pull-right'
+ = link_to 'すべて表示', namespace_project_issues_path(project.namespace, project), class: 'pull-right'
%ul.well-list.issues-list
- group[1].each do |issue|
= render 'projects/issues/issue', issue: issue
= paginate @issues, theme: "gitlab"
- else
- .nothing-here-block No issues to show
+ .nothing-here-block 課題はありません
diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml
index c02c5af..47c01e8 100644
--- a/app/views/shared/_merge_requests.html.haml
+++ b/app/views/shared/_merge_requests.html.haml
@@ -4,11 +4,11 @@
- project = group[0]
.panel-heading
= link_to_project project
- = link_to 'show all', namespace_project_merge_requests_path(project.namespace, project), class: 'pull-right'
+ = link_to 'すべて表示', namespace_project_merge_requests_path(project.namespace, project), class: 'pull-right'
%ul.well-list.mr-list
- group[1].each do |merge_request|
= render 'projects/merge_requests/merge_request', merge_request: merge_request
= paginate @merge_requests, theme: "gitlab"
- else
- .nothing-here-block No merge requests to show
+ .nothing-here-block マージリクエストはありません
diff --git a/app/views/shared/_milestones_filter.html.haml b/app/views/shared/_milestones_filter.html.haml
index f685ae7..06c531d 100644
--- a/app/views/shared/_milestones_filter.html.haml
+++ b/app/views/shared/_milestones_filter.html.haml
@@ -3,12 +3,12 @@
%li{class: ("active" if params[:state].blank? || params[:state] == 'opened')}
= link_to milestones_filter_path(state: 'opened') do
%i.fa.fa-exclamation-circle
- Open
+ オープン
%li{class: ("active" if params[:state] == 'closed')}
= link_to milestones_filter_path(state: 'closed') do
%i.fa.fa-check-circle
- Closed
+ クローズ
%li{class: ("active" if params[:state] == 'all')}
= link_to milestones_filter_path(state: 'all') do
%i.fa.fa-compass
- All
+ すべて
diff --git a/app/views/shared/_no_ssh.html.haml b/app/views/shared/_no_ssh.html.haml
index 089179e..03943f2 100644
--- a/app/views/shared/_no_ssh.html.haml
+++ b/app/views/shared/_no_ssh.html.haml
@@ -1,8 +1,8 @@
- if cookies[:hide_no_ssh_message].blank? && !current_user.hide_no_ssh_key && current_user.require_ssh_key?
.no-ssh-key-message.alert.alert-warning.hidden-xs
- You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', new_profile_key_path, class: 'alert-link'} to your profile
+ プロフィールに#{link_to 'SSHキーを追加', new_profile_key_path, class: 'alert-link'}するまでプロジェクトのコードをSSH経由でプッシュ、プルすることはできません
.pull-right
- = link_to "Don't show again", profile_path(user: {hide_no_ssh_key: true}), method: :put, class: 'alert-link'
+ = link_to "次から表示しない", profile_path(user: {hide_no_ssh_key: true}), method: :put, class: 'alert-link'
|
- = link_to 'Remind later', '#', class: 'hide-no-ssh-message alert-link'
+ = link_to '後で表示', '#', class: 'hide-no-ssh-message alert-link'
diff --git a/app/views/shared/_outdated_browser.html.haml b/app/views/shared/_outdated_browser.html.haml
index 0eba1fe..0cef7df 100644
--- a/app/views/shared/_outdated_browser.html.haml
+++ b/app/views/shared/_outdated_browser.html.haml
@@ -1,8 +1,8 @@
- if outdated_browser?
- link = "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/requirements.md#supported-web-browsers"
.browser-alert
- GitLab may not work properly because you are using an outdated web browser.
+ お使いのブラウザでは GitLab は正常に動作しない可能性があります。
%br
- Please install a
- = link_to 'supported web browser', link
- for a better experience.
+ より良いエクスペリエンスのために
+ = link_to 'サポートされているWebブラウザ', link
+ をインストールしてください。
diff --git a/app/views/shared/_projects_list.html.haml b/app/views/shared/_projects_list.html.haml
index 4c58092..57653a2 100644
--- a/app/views/shared/_projects_list.html.haml
+++ b/app/views/shared/_projects_list.html.haml
@@ -7,11 +7,11 @@
= render "shared/project", project: project, avatar: avatar, stars: stars
- if projects.blank?
%li
- .nothing-here-block There are no projects here.
+ .nothing-here-block プロジェクトがありません
- if projects.count > projects_limit
%li.bottom
%span.light
- #{projects_limit} of #{pluralize(projects.count, 'project')} displayed.
+ #{projects.count} 件中 #{projects_limit} 件を表示中
%span
= link_to '#', class: 'js-expand' do
- Show all
+ すべて表示
diff --git a/app/views/shared/_promo.html.haml b/app/views/shared/_promo.html.haml
index 3596aab..3ac6049 100644
--- a/app/views/shared/_promo.html.haml
+++ b/app/views/shared/_promo.html.haml
@@ -1,5 +1,5 @@
.gitlab-promo
- = link_to 'Homepage', promo_url
- = link_to "Blog", promo_url + '/blog/'
+ = link_to 'ホームページ', promo_url
+ = link_to "ブログ", promo_url + '/blog/'
= link_to "@gitlab", "https://twitter.com/gitlab"
- = link_to "Requests", "http://feedback.gitlab.com/"
+ = link_to "ご要望", "http://feedback.gitlab.com/"
diff --git a/app/views/shared/_sort_dropdown.html.haml b/app/views/shared/_sort_dropdown.html.haml
index af3d35d..1ede0b2 100644
--- a/app/views/shared/_sort_dropdown.html.haml
+++ b/app/views/shared/_sort_dropdown.html.haml
@@ -1,6 +1,6 @@
.dropdown.inline.prepend-left-10
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
- %span.light sort:
+ %span.light 並び替え:
- if @sort.present?
= sort_options_hash[@sort]
- else
diff --git a/app/views/shared/snippets/_blob.html.haml b/app/views/shared/snippets/_blob.html.haml
index 3045879..d01b62b 100644
--- a/app/views/shared/snippets/_blob.html.haml
+++ b/app/views/shared/snippets/_blob.html.haml
@@ -11,4 +11,4 @@
= render 'shared/file_highlight', blob: @snippet
- else
.file-content.code
- .nothing-here-block Empty file
+ .nothing-here-block 空のファイル
diff --git a/app/views/shared/snippets/_form.html.haml b/app/views/shared/snippets/_form.html.haml
index 4e0663e..fc44939 100644
--- a/app/views/shared/snippets/_form.html.haml
+++ b/app/views/shared/snippets/_form.html.haml
@@ -7,14 +7,14 @@
%li= msg
.form-group
- = f.label :title, class: 'control-label'
+ = f.label :title, 'タイトル', class: 'control-label'
.col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'form-control', required: true
= render "shared/snippets/visibility_level", f: f, visibility_level: gitlab_config.default_projects_features.visibility_level, can_change_visibility_level: true
.form-group
.file-editor
- = f.label :file_name, "File", class: 'control-label'
+ = f.label :file_name, "ファイル", class: 'control-label'
.col-sm-10
.file-holder.snippet
.file-title
@@ -25,14 +25,14 @@
.form-actions
- if @snippet.new_record?
- = f.submit 'Create snippet', class: "btn-create btn"
+ = f.submit 'スニペットを作成', class: "btn-create btn"
- else
- = f.submit 'Save', class: "btn-save btn"
+ = f.submit '保存', class: "btn-save btn"
- if @snippet.respond_to?(:project)
- = link_to "Cancel", namespace_project_snippets_path(@project.namespace, @project), class: "btn btn-cancel"
+ = link_to "キャンセル", namespace_project_snippets_path(@project.namespace, @project), class: "btn btn-cancel"
- else
- = link_to "Cancel", snippets_path(@project), class: "btn btn-cancel"
+ = link_to "キャンセル", snippets_path(@project), class: "btn btn-cancel"
:javascript
var editor = ace.edit("editor");
diff --git a/app/views/shared/snippets/_visibility_level.html.haml b/app/views/shared/snippets/_visibility_level.html.haml
index 9acff18..4a3f93b 100644
--- a/app/views/shared/snippets/_visibility_level.html.haml
+++ b/app/views/shared/snippets/_visibility_level.html.haml
@@ -1,6 +1,6 @@
.form-group.project-visibility-level-holder
= f.label :visibility_level, class: 'control-label' do
- Visibility Level
+ 可視性レベル
= link_to "(?)", help_page_path("public_access", "public_access")
.col-sm-10
- if can_change_visibility_level
@@ -17,7 +17,7 @@
- unless restricted_visibility_levels.empty?
.col-sm-10
%span.info
- Some visibility level settings have been restricted by the administrator.
+ いくつかの可視性レベル設定は管理者のみに制限されています。
- else
.col-sm-10
%span.info
diff --git a/app/views/snippets/_snippet.html.haml b/app/views/snippets/_snippet.html.haml
index 5bb2866..7c88b47 100644
--- a/app/views/snippets/_snippet.html.haml
+++ b/app/views/snippets/_snippet.html.haml
@@ -5,7 +5,7 @@
- if snippet.private?
%span.label.label-gray
%i.fa.fa-lock
- private
+ プライベート
%span.cgray.monospace.tiny.pull-right
= snippet.file_name
diff --git a/app/views/snippets/_snippets.html.haml b/app/views/snippets/_snippets.html.haml
index 40df42b..8fa4a65 100644
--- a/app/views/snippets/_snippets.html.haml
+++ b/app/views/snippets/_snippets.html.haml
@@ -2,6 +2,6 @@
= render partial: 'snippet', collection: @snippets
- if @snippets.empty?
%li
- .nothing-here-block Nothing here.
+ .nothing-here-block 何もありません。
= paginate @snippets, theme: 'gitlab'
diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml
index b2b7ea4..c64619e 100644
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@@ -1,13 +1,13 @@
%h3.page-title
- My Snippets
+ マイスニペット
.pull-right
- = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
- Add new snippet
+ = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "新しいスニペット" do
+ 新しいスニペットを追加
= link_to snippets_path, class: "btn btn-grouped" do
- Discover snippets
+ スニペットを探す
%p.light
- Share code pastes with others out of git repository
+ コードをGitリポジトリの外で共有しましょう。
%hr
.row
@@ -15,22 +15,22 @@
%ul.nav.nav-pills.nav-stacked
= nav_tab :scope, nil do
= link_to user_snippets_path(@user) do
- All
+ すべて
%span.pull-right
= @user.snippets.count
= nav_tab :scope, 'are_private' do
= link_to user_snippets_path(@user, scope: 'are_private') do
- Private
+ プライベート
%span.pull-right
= @user.snippets.are_private.count
= nav_tab :scope, 'are_internal' do
= link_to user_snippets_path(@user, scope: 'are_internal') do
- Internal
+ 内部
%span.pull-right
= @user.snippets.are_internal.count
= nav_tab :scope, 'are_public' do
= link_to user_snippets_path(@user, scope: 'are_public') do
- Public
+ 公開
%span.pull-right
= @user.snippets.are_public.count
diff --git a/app/views/snippets/edit.html.haml b/app/views/snippets/edit.html.haml
index 7042d07..9e90109 100644
--- a/app/views/snippets/edit.html.haml
+++ b/app/views/snippets/edit.html.haml
@@ -1,4 +1,4 @@
%h3.page-title
- Edit snippet
+ スニペットを編集
%hr
= render "shared/snippets/form", url: snippet_path(@snippet)
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 0d71c41..d91d7b5 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -1,16 +1,16 @@
%h3.page-title
- Public snippets
+ 公開スニペット
.pull-right
- if current_user
- = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
- Add new snippet
+ = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "新しいスニペット" do
+ 新しいスニペットを作成
= link_to user_snippets_path(current_user), class: "btn btn-grouped" do
- My snippets
+ マイスニペット
%p.light
- Public snippets created by you and other users are listed here
+ あなたや他のユーザが作成した公開スニペットが表示されています。
%hr
= render 'snippets'
diff --git a/app/views/snippets/new.html.haml b/app/views/snippets/new.html.haml
index 694d705..a3cd8b6 100644
--- a/app/views/snippets/new.html.haml
+++ b/app/views/snippets/new.html.haml
@@ -1,4 +1,4 @@
%h3.page-title
- New snippet
+ 新しいスニペット
%hr
= render "shared/snippets/form", url: snippets_path(@snippet)
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index edfa209..a2e4e5f 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -4,11 +4,11 @@
- if @snippet.private?
%span.label.label-success
%i.fa.fa-lock
- private
+ プライベート
.pull-right
- = link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
- Add new snippet
+ = link_to new_snippet_path, class: "btn btn-new", title: "新しいスニペット" do
+ 新しいスニペットを追加
%hr
.append-bottom-20
@@ -23,10 +23,10 @@
.back-link
- if @snippet.author == current_user
= link_to user_snippets_path(current_user) do
- ← my snippets
+ ← マイスニペット
- else
= link_to snippets_path do
- ← discover snippets
+ ← スニペットを探す
.file-holder
.file-title
@@ -36,8 +36,8 @@
.file-actions
.btn-group
- if can?(current_user, :modify_personal_snippet, @snippet)
- = link_to "edit", edit_snippet_path(@snippet), class: "btn btn-sm", title: 'Edit Snippet'
+ = link_to "編集", edit_snippet_path(@snippet), class: "btn btn-sm", title: 'スニペットを編集'
= link_to "raw", raw_snippet_path(@snippet), class: "btn btn-sm", target: "_blank"
- if can?(current_user, :admin_personal_snippet, @snippet)
- = link_to "remove", snippet_path(@snippet), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-sm btn-remove", title: 'Delete Snippet'
+ = link_to "削除", snippet_path(@snippet), method: :delete, data: { confirm: "本当に削除しますか？" }, class: "btn btn-sm btn-remove", title: 'スニペットを削除'
= render 'shared/snippets/blob'
diff --git a/app/views/snippets/user_index.html.haml b/app/views/snippets/user_index.html.haml
index df524cd..b06958b 100644
--- a/app/views/snippets/user_index.html.haml
+++ b/app/views/snippets/user_index.html.haml
@@ -3,10 +3,10 @@
= @user.name
%span
\/
- Snippets
+ スニペット
- if current_user
- = link_to new_snippet_path, class: "btn btn-sm add_new pull-right", title: "New Snippet" do
- Add new snippet
+ = link_to new_snippet_path, class: "btn btn-sm add_new pull-right", title: "新しいスニペット" do
+ 新しいスニペットを追加
%hr
diff --git a/app/views/users/_profile.html.haml b/app/views/users/_profile.html.haml
index 0a70b73..6aedb51 100644
--- a/app/views/users/_profile.html.haml
+++ b/app/views/users/_profile.html.haml
@@ -1,10 +1,10 @@
.panel.panel-default
.panel-heading
- Profile
+ プロフィール
%ul.well-list
%li
- %span.light Member since
- %strong= user.created_at.stamp("Aug 21, 2011")
+ %span.light 登録日:
+ %strong= user.created_at.stamp("2011/08/21")
- unless user.skype.blank?
%li
%span.light Skype:
@@ -19,9 +19,9 @@
%strong= link_to user.twitter, "http://www.twitter.com/#{user.twitter}"
- unless user.website_url.blank?
%li
- %span.light Website:
+ %span.light Webサイト:
%strong= link_to user.short_website_url, user.full_website_url
- unless user.bio.blank?
%li
- %span.light Bio:
+ %span.light 自己紹介:
%span= user.bio
diff --git a/app/views/users/_projects.html.haml b/app/views/users/_projects.html.haml
index 6c7779b..52a2b26 100644
--- a/app/views/users/_projects.html.haml
+++ b/app/views/users/_projects.html.haml
@@ -1,13 +1,13 @@
- if @contributed_projects.present?
.panel.panel-default
- .panel-heading Projects contributed to
+ .panel-heading コントリビュートしたプロジェクト
= render 'shared/projects_list',
projects: @contributed_projects.sort_by(&:star_count).reverse,
projects_limit: 5, stars: true, avatar: false
- if @projects.present?
.panel.panel-default
- .panel-heading Personal projects
+ .panel-heading パーソナルプロジェクト
= render 'shared/projects_list',
projects: @projects.sort_by(&:star_count).reverse,
projects_limit: 10, stars: true, avatar: false
diff --git a/app/views/users/calendar.html.haml b/app/views/users/calendar.html.haml
index 1d1c974..0972ea4 100644
--- a/app/views/users/calendar.html.haml
+++ b/app/views/users/calendar.html.haml
@@ -1,4 +1,4 @@
-%h4 Commits calendar
+%h4 コミットカレンダー
#cal-heatmap.calendar
:javascript
new calendar(
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index abd6b22..4749ef1 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -9,15 +9,15 @@
.pull-right
= link_to profile_path, class: 'btn' do
%i.fa.fa-pencil-square-o
- Edit Profile settings
+ プロフィール設定を編集
%br
%span.user-show-username #{@user.username}
%br
- %small member since #{@user.created_at.stamp("Nov 12, 2031")}
+ %small 登録日: #{@user.created_at.stamp("2031/11/12")}
.clearfix
- if @groups.any?
- %h4 Groups
+ %h4 グループ
= render 'groups', groups: @groups
%hr
@@ -27,7 +27,7 @@
%i.fa.fa-spinner.fa-spin
%hr
%h4
- User Activity
+ ユーザアクティビティ
- if current_user
%span.rss-icon.pull-right
diff --git a/config/application.rb b/config/application.rb
index fa39953..88d7522 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -26,6 +26,8 @@ module Gitlab
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de
config.i18n.enforce_available_locales = false
+ config.i18n.locale = :ja
+ config.i18n.default_locale = :ja
# Configure the default encoding used in templates for Ruby 1.9.
config.encoding = "utf-8"
diff --git a/config/locales/devise.ja.yml b/config/locales/devise.ja.yml
new file mode 100644
index 0000000..ca863f7
--- /dev/null
+++ b/config/locales/devise.ja.yml
@@ -0,0 +1,100 @@
+#SOURCE https://gist.github.com/orzccc/3104030
+
+ja:
+ devise:
+ confirmations:
+ confirmed: 'アカウントを登録しました。'
+# confirmed: 'Your account was successfully confirmed. You are now signed in.'
+ send_instructions: '登録方法を数分以内にメールでご連絡します。'
+# send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
+ send_paranoid_instructions: 'もしあなたのEメールアドレスが見つかった場合、本人確認についてのメールが数分以内に送られます。'
+# send_paranoid_instructions: 'If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes.'
+ failure:
+ already_authenticated: '既にログインしています。'
+# already_authenticated: 'You are already signed in.'
+ inactive: 'アカウントがアクティベートされていません。'
+# inactive: 'Your account was not activated yet.'
+ invalid: 'メールアドレスかパスワードが違います。'
+# invalid: 'Invalid email or password.'
+ invalid_token: '認証キーが不正です。'
+# invalid_token: 'Invalid authentication token.'
+ locked: 'あなたのアカウントは凍結されています。'
+# locked: 'Your account is locked.'
+ not_found_in_database: 'メールアドレスかパスワードが違います。'
+# not_found_in_database: "Invalid email or password."
+ timeout: 'セッションがタイムアウトしました。もう一度ログインしてください。'
+# timeout: 'Your session expired, please sign in again to continue.'
+ unauthenticated: 'ログインしてください。'
+# unauthenticated: 'You need to sign in or sign up before continuing.'
+ unconfirmed: '本登録を行ってください。'
+# unconfirmed: 'You have to confirm your account before continuing.'
+ mailer:
+ confirmation_instructions:
+ subject: 'アカウントの登録方法'
+# subject: 'Confirmation instructions'
+ reset_password_instructions:
+ subject: 'パスワードの再設定'
+# subject: 'Reset password instructions'
+ unlock_instructions:
+ subject: 'アカウントの凍結解除'
+# subject: 'Unlock Instructions'
+ omniauth_callbacks:
+ success: '%{kind} アカウントによる個人認証に成功しました。'
+# success: 'Successfully authenticated from %{kind} account.'
+ failure: '%{kind} アカウントによる個人認証に失敗しました（%{reason}）。'
+# failure: 'Could not authenticate you from %{kind} because "%{reason}".'
+ passwords:
+ no_token: "このページにはアクセスできません。パスワード復元メールのリンクをコピーした場合には、正しい URL かどうかをお確かめください。"
+# no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+ send_instructions: 'パスワードのリセット方法を数分以内にメールでご連絡します。'
+# send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
+ send_paranoid_instructions: "もしあなたのEメールアドレスが見つかった場合、パスワード復元用のメールが数分以内に送られます。"
+# send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+ updated: 'パスワードを変更しました。'
+# updated: 'Your password was changed successfully. You are now signed in.'
+ updated_not_active: 'パスワードが正しく変更されました。'
+# updated_not_active: 'Your password was changed successfully.'
+ registrations:
+ destroyed: 'アカウントを削除しました。またのご利用をお待ちしております。'
+# destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
+ signed_up: 'ようこそ！ アカウント登録を受け付けました。'
+# signed_up: 'Welcome! You have signed up successfully.'
+ signed_up_but_inactive: 'アカウント登録を受け付けました。しかしまだ有効化されておらず、ログインできません。'
+# signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
+ signed_up_but_locked: 'アカウント登録を受け付けました。しかし、アカウントが凍結されているためログインできません。'
+# signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
+ signed_up_but_unconfirmed: '本人確認用のメールがあなたのEメールアドレスに送られました。メール内のリンクからアカウントを有効化させてください。'
+# signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
+ updated: 'アカウント情報を変更しました。'
+# updated: 'You updated your account successfully.'
+ update_needs_confirmation: "アカウント情報を変更しましたが、Eメールアドレスの本人確認用Eメールをお送りしましたので、中のリンクをクリックして証明してください。"
+# update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
+ sessions:
+ signed_in: 'ログインしました。'
+# signed_in: 'Signed in successfully.'
+ signed_out: 'ログアウトしました。'
+# signed_out: 'Signed out successfully.'
+ unlocks:
+ send_instructions: 'アカウントの凍結解除方法を数分以内にメールでご連絡します。'
+# send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
+ send_paranoid_instructions: 'アカウントが見つかった場合、アカウントの凍結解除方法を数分以内にメールでご連絡します。'
+# send_paranoid_instructions: 'If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.'
+ unlocked: 'アカウントを凍結解除しました。ログインしています。'
+# unlocked: 'Your account was successfully unlocked. You are now signed in.'
+ errors:
+ messages:
+ already_confirmed: "は既に登録済みですのでログインしてください"
+# already_confirmed: "was already confirmed, please try signing in"
+ confirmation_period_expired: "の確認期限が切れました。%{period}以内に確認する必要があります。 新しくリクエストしてください"
+# confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+ expired: "の期限が切れましたので、新しくリクエストしてください"
+# expired: "has expired, please request a new one"
+ not_found: "は見つかりませんでした"
+# not_found: "not found"
+ not_locked: "は凍結されていません"
+# not_locked: "was not locked"
+ not_saved:
+ one: "1 つのエラーにより %{resource} は保存されませんでした:"
+# one: "1 error prohibited this %{resource} from being saved:"
+ other: "%{count} つのエラーにより %{resource} は保存されませんでした:"
+# other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
new file mode 100644
index 0000000..cee0bea
--- /dev/null
+++ b/config/locales/ja.yml
@@ -0,0 +1,236 @@
+# svenfuchs/rails-i18n
+# MIT License
+# https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/ja.yml
+ja:
+ date:
+ abbr_day_names:
+ - 日
+ - 月
+ - 火
+ - 水
+ - 木
+ - 金
+ - 土
+ abbr_month_names:
+ -
+ - 1月
+ - 2月
+ - 3月
+ - 4月
+ - 5月
+ - 6月
+ - 7月
+ - 8月
+ - 9月
+ - 10月
+ - 11月
+ - 12月
+ day_names:
+ - 日曜日
+ - 月曜日
+ - 火曜日
+ - 水曜日
+ - 木曜日
+ - 金曜日
+ formats:
+ default: "%Y/%m/%d"
+ long: "%Y年%m月%d日(%a)"
+ short: "%m/%d"
+ month_names:
+ -
+ - 1月
+ - 2月
+ - 3月
+ - 4月
+ - 5月
+ - 6月
+ - 7月
+ - 8月
+ - 9月
+ - 10月
+ - 11月
+ - 12月
+ order:
+ - :year
+ - :month
+ - :day
+ datetime:
+ distance_in_words:
+ about_x_hours:
+ one: 約1時間
+ other: 約%{count}時間
+ about_x_months:
+ one: 約1ヶ月
+ other: 約%{count}ヶ月
+ about_x_years:
+ one: 約1年
+ other: 約%{count}年
+ almost_x_years:
+ one: 1年弱
+ other: "%{count}年弱"
+ half_a_minute: 30秒前後
+ less_than_x_minutes:
+ one: 1分以内
+ other: "%{count}分未満"
+ less_than_x_seconds:
+ one: 1秒以内
+ other: "%{count}秒未満"
+ over_x_years:
+ one: 1年以上
+ other: "%{count}年以上"
+ x_days:
+ one: 1日
+ other: "%{count}日"
+ x_minutes:
+ one: 1分
+ other: "%{count}分"
+ x_months:
+ one: 1ヶ月
+ other: "%{count}ヶ月"
+ x_seconds:
+ one: 1秒
+ other: "%{count}秒"
+ prompts:
+ day: 日
+ hour: 時
+ minute: 分
+ month: 月
+ second: 秒
+ year: 年
+ errors:
+ format: "%{attribute}%{message}"
+ messages:
+ accepted: を受諾してください。
+ blank: を入力してください。
+ present: は入力しないでください。
+ confirmation: と%{attribute}の入力が一致しません。
+ empty: を入力してください。
+ equal_to: は%{count}にしてください。
+ even: は偶数にしてください。
+ exclusion: は予約されています。
+ greater_than: は%{count}より大きい値にしてください。
+ greater_than_or_equal_to: は%{count}以上の値にしてください。
+ inclusion: は一覧にありません。
+ invalid: は不正な値です。
+ less_than: は%{count}より小さい値にしてください。
+ less_than_or_equal_to: は%{count}以下の値にしてください。
+ not_a_number: は数値で入力してください。
+ not_an_integer: は整数で入力してください。
+ odd: は奇数にしてください。
+ record_invalid: バリデーションに失敗しました。 %{errors}
+ restrict_dependent_destroy: "%{record}が存在しているので削除できません。"
+ taken: はすでに存在します。
+ too_long: は%{count}文字以内で入力してください。
+ too_short: は%{count}文字以上で入力してください。
+ wrong_length: は%{count}文字で入力してください。
+ other_than: は%{count}以外の値にしてください。
+ template:
+ body: 次の項目を確認してください。
+ header:
+ one: "%{model}にエラーが発生しました。"
+ other: "%{model}に%{count}個のエラーが発生しました。"
+ helpers:
+ select:
+ prompt: 選択してください。
+ submit:
+ create: 登録する
+ submit: 保存する
+ update: 更新する
+ number:
+ currency:
+ format:
+ delimiter: ","
+ format: "%n%u"
+ precision: 0
+ separator: "."
+ significant: false
+ strip_insignificant_zeros: false
+ unit: 円
+ format:
+ delimiter: ","
+ precision: 3
+ separator: "."
+ significant: false
+ strip_insignificant_zeros: false
+ human:
+ decimal_units:
+ format: "%n %u"
+ units:
+ billion: 十億
+ million: 百万
+ quadrillion: 千兆
+ thousand: 千
+ trillion: 兆
+ unit: ''
+ format:
+ delimiter: ''
+ precision: 3
+ significant: true
+ strip_insignificant_zeros: true
+ storage_units:
+ format: "%n%u"
+ units:
+ byte: バイト
+ gb: ギガバイト
+ kb: キロバイト
+ mb: メガバイト
+ tb: テラバイト
+ percentage:
+ format:
+ delimiter: ''
+ format: "%n%"
+ precision:
+ format:
+ delimiter: ''
+ support:
+ array:
+ last_word_connector: と
+ two_words_connector: と
+ words_connector: と
+ time:
+ am: 午前
+ formats:
+ default: "%Y/%m/%d %H:%M:%S"
+ long: "%Y年%m月%d日(%a) %H時%M分%S秒 %z"
+ short: "%y/%m/%d %H:%M"
+ pm: 午後
+ views:
+ pagination:
+ previous: 前へ
+ next: 次へ
+ activerecord:
+ models:
+ project: プロジェクト
+ issue: 課題
+ merge_request: マージリクエスト
+ attributes:
+ project:
+ name: プロジェクト名
+ path: リポジトリパス
+ import_url: インポートURL
+ errors:
+ models:
+ project:
+ attributes:
+ name:
+ blank: プロジェクトパスは必須です
+ group:
+ attributes:
+ name:
+ blank: グループ名は必須です
+ wiki:
+ attributes:
+ content:
+ blank: 内容は必須です
+ system_hook:
+ attributes:
+ url:
+ blank: URLは必須です
+ doorkeeper/application:
+ attributes:
+ name:
+ blank: 名前は必須です
+ doorkeeper/application:
+ attributes:
+ redirect_uri:
+ blank: リダイレクトURIは必須です
diff --git a/doc/README.md b/doc/README.md
index 4e00dce..4527e21 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,34 +1,34 @@
-# Documentation
+# ドキュメント
-## User documentation
+## ユーザ向けドキュメント
- [API](api/README.md) Automate GitLab via a simple and powerful API.
- [Markdown](markdown/markdown.md) GitLab's advanced formatting system.
-- [Permissions](permissions/permissions.md) Learn what each role in a project (guest/reporter/developer/master/owner) can do.
-- [Project Services](project_services/project_services.md) Integrate a project with external services, such as CI and chat.
-- [Public access](public_access/public_access.md) Learn how you can allow public and internal access to projects.
+- [アクセス権](permissions/permissions.md) Learn what each role in a project (guest/reporter/developer/master/owner) can do.
+- [プロジェクトサービス](project_services/project_services.md) Integrate a project with external services, such as CI and chat.
+- [公開アクセス](public_access/public_access.md) Learn how you can allow public and internal access to projects.
- [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects.
-- [Web hooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project.
-- [Workflow](workflow/README.md) Using GitLab functionality and importing projects from GitHub and SVN.
-- [GitLab as OAuth2 authentication service provider](integration/oauth_provider.md). It allows you to login to other applications from GitLab.
+- [Webフック](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project.
+- [ワークフロー](workflow/README.md) Using GitLab functionality and importing projects from GitHub and SVN.
+- [OAuth2認証サービスプロバイダとしてのGitLab](integration/oauth_provider.md). It allows you to login to other applications from GitLab.
-## Administrator documentation
+## 管理者向けドキュメント
-- [Install](install/README.md) Requirements, directory structures and installation from source.
-- [Integration](integration/README.md) How to integrate with systems such as JIRA, Redmine, LDAP and Twitter.
-- [Raketasks](raketasks/README.md) Backups, maintenance, automatic web hook setup and the importing of projects.
-- [Custom git hooks](hooks/custom_hooks.md) Custom git hooks (on the filesystem) for when web hooks aren't enough.
-- [System hooks](system_hooks/system_hooks.md) Notifications when users, projects and keys are changed.
-- [Security](security/README.md) Learn what you can do to further secure your GitLab instance.
-- [Update](update/README.md) Update guides to upgrade your installation.
-- [Welcome message](customization/welcome_message.md) Add a custom welcome message to the sign-in page.
-- [Issue closing](customization/issue_closing.md) Customize how to close an issue from commit messages.
+- [インストール](install/README.md) Requirements, directory structures and installation from source.
+- [統合](integration/README.md) How to integrate with systems such as JIRA, Redmine, LDAP and Twitter.
+- [Rakeタスク](raketasks/README.md) Backups, maintenance, automatic web hook setup and the importing of projects.
+- [カスタムgitフック](hooks/custom_hooks.md) Custom git hooks (on the filesystem) for when web hooks aren't enough.
+- [システムフック](system_hooks/system_hooks.md) Notifications when users, projects and keys are changed.
+- [セキュリティ](security/README.md) Learn what you can do to further secure your GitLab instance.
+- [アップデート](update/README.md) Update guides to upgrade your installation.
+- [ウェルカムメッセージ](customization/welcome_message.md) Add a custom welcome message to the sign-in page.
+- [課題のクローズ](customization/issue_closing.md) Customize how to close an issue from commit messages.
- [Libravatar](customization/libravatar.md) Use Libravatar for user avatars.
-- [Operations](operations/README.md) Keeping GitLab up and running
-- [Log system](logs/logs.md) Log system
+- [運用](operations/README.md) Keeping GitLab up and running
+- [ログシステム](logs/logs.md) Log system
-## Contributor documentation
+## コントリビュータ向けドキュメント
-- [Development](development/README.md) Explains the architecture and the guidelines for shell commands.
-- [Legal](legal/README.md) Contributor license agreements.
-- [Release](release/README.md) How to make the monthly and security releases.
+- [開発](development/README.md) Explains the architecture and the guidelines for shell commands.
+- [法的情報](legal/README.md) Contributor license agreements.
+- [リリース](release/README.md) How to make the monthly and security releases.
diff --git a/doc/api/README.md b/doc/api/README.md
index dec530d..5b28fa0 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -1,25 +1,25 @@
# GitLab API
-## Resources
-
-- [Users](users.md)
-- [Session](session.md)
-- [Projects](projects.md)
-- [Project Snippets](project_snippets.md)
-- [Repositories](repositories.md)
-- [Repository Files](repository_files.md)
-- [Commits](commits.md)
-- [Branches](branches.md)
-- [Merge Requests](merge_requests.md)
-- [Issues](issues.md)
-- [Labels](labels.md)
-- [Milestones](milestones.md)
-- [Notes](notes.md) (comments)
-- [Deploy Keys](deploy_keys.md)
-- [System Hooks](system_hooks.md)
-- [Groups](groups.md)
-
-## Clients
+## リソース
+
+- [ユーザ](users.md)
+- [セッション](session.md)
+- [プロジェクト](projects.md)
+- [プロジェクトスニペット](project_snippets.md)
+- [リポジトリ](repositories.md)
+- [リポジトリファイル](repository_files.md)
+- [コミット](commits.md)
+- [ブランチ](branches.md)
+- [マージリクエスト](merge_requests.md)
+- [課題](issues.md)
+- [ラベル](labels.md)
+- [マイルストーン](milestones.md)
+- [ノート](notes.md) (comments)
+- [デプロイキー](deploy_keys.md)
+- [システムフック](system_hooks.md)
+- [グループ](groups.md)
+
+## クライアント
Find API Clients for GitLab [on our website](https://about.gitlab.com/applications/#api-clients).
You can use [GitLab as an OAuth2 client](oauth2.md) to make API calls.
diff --git a/doc/api/notes.md b/doc/api/notes.md
index c22e493..c92f783 100644
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
@@ -1,8 +1,8 @@
-# Notes
+# ノート
Notes are comments on snippets, issues or merge requests.
-## Issues
+## 課題
### List project issue notes
@@ -93,7 +93,7 @@ Parameters:
- `note_id` (required) - The ID of a note
- `body` (required) - The content of a note
-## Snippets
+## スニペット
### List all snippet notes
@@ -170,7 +170,7 @@ Parameters:
- `note_id` (required) - The ID of a note
- `body` (required) - The content of a note
-## Merge Requests
+## マージリクエスト
### List all merge request notes
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index 64f28d4..316d3b1 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -1,52 +1,52 @@
# Markdown
-## Table of Contents
+## 目次
**[GitLab Flavored Markdown](#gitlab-flavored-markdown-gfm)**
-* [Newlines](#newlines)
-* [Multiple underscores in words](#multiple-underscores-in-words)
-* [URL auto-linking](#url-autolinking)
-* [Code and Syntax Highlighting](#code-and-syntax-highlighting)
-* [Emoji](#emoji)
-* [Special GitLab references](#special-gitlab-references)
-* [Task lists](#task-lists)
-
-**[Standard Markdown](#standard-markdown)**
-
-* [Headers](#headers)
-* [Emphasis](#emphasis)
-* [Lists](#lists)
-* [Links](#links)
-* [Images](#images)
-* [Blockquotes](#blockquotes)
-* [Inline HTML](#inline-html)
-* [Horizontal Rule](#horizontal-rule)
-* [Line Breaks](#line-breaks)
-* [Tables](#tables)
-
-**[References](#references)**
+* [改行](#newlines)
+* [単語内の複数のアンダースコア](#multiple-underscores-in-words)
+* [URLの自動リンク](#url-autolinking)
+* [コードとシンタックスハイライト](#code-and-syntax-highlighting)
+* [絵文字](#emoji)
+* [GitLabでの参照](#special-gitlab-references)
+* [タスクリスト](#task-lists)
+
+**[標準のMarkdown](#standard-markdown)**
+
+* [ヘッダ](#headers)
+* [強調](#emphasis)
+* [リスト](#lists)
+* [リンク](#links)
+* [画像](#images)
+* [引用](#blockquotes)
+* [インライン HTML](#inline-html)
+* [水平線](#horizontal-rule)
+* [改行](#line-breaks)
+* [表](#tables)
+
+**[リファレンス](#references)**
## GitLab Flavored Markdown (GFM)
-For GitLab we developed something we call "GitLab Flavored Markdown" (GFM). It extends the standard Markdown in a few significant ways to add some useful functionality.
+GitLabでは、"GitLab Flavored Markdown" (GFM)と呼ばれるものを開発しました。これは、いくつかの重要な点で便利な機能を追加するために標準の Markdown を拡張するものです。
-You can use GFM in
+GFM は以下の場所で使うことができます。
-- commit messages
-- comments
-- issues
-- merge requests
-- milestones
-- wiki pages
+- コミットメッセージ
+- コメント
+- 課題
+- マージリクエスト
+- マイルストーン
+- Wikiページ
-You can also use other rich text files in GitLab. You might have to install a dependency to do so. Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information.
+依存するソフトウェアをインストールして、GitLab上の他のリッチテキストファイルでも使うことができます。その場合、依存関係をインストールする必要があるかもしれません。詳しい情報は、 [github-markup gem readme](https://github.com/gitlabhq/markup#markups) を参照してください。
-## Newlines
+## 改行
-GFM honors the markdown specification in how [paragraphs and line breaks are handled](http://daringfireball.net/projects/markdown/syntax#p).
+GFMは [段落と改行の取り扱い](http://daringfireball.net/projects/markdown/syntax#p) での Markdown 仕様にならっています。
-A paragraph is simply one or more consecutive lines of text, separated by one or more blank lines.:
+段落は単純に1行以上の空行で分けられた、1行以上のテキストです。
Roses are red
Violets are blue
@@ -58,9 +58,9 @@ Violets are blue
Sugar is sweet
-## Multiple underscores in words
+## 単語内の複数のアンダースコア
-It is not reasonable to italicize just _part_ of a word, especially when you're dealing with code and names that often appear with multiple underscores. Therefore, GFM ignores multiple underscores in words.
+単語の _一部_ だけをイタリック体にしてしまうのは便利とは言えません。複数のアンダースコアを含むコードと名前を扱う場合には特にそうです。このため、GFMは単語内の複数のアンダースコアを無視します。
perform_complicated_task
do_this_and_do_that_and_another_thing
@@ -68,25 +68,25 @@ It is not reasonable to italicize just _part_ of a word, especially when you're
perform_complicated_task
do_this_and_do_that_and_another_thing
-## URL auto-linking
+## URLの自動リンク
-GFM will autolink standard URLs you copy and paste into your text. So if you want to link to a URL (instead of a textural link), you can simply put the URL in verbatim and it will be turned into a link to that URL.
+GFM は、標準的なURLをコピー＆ペーストすると自動的にリンクします。つまり、(テキストのリンクの代わりに)URLをリンクしたければ、単純にURLを記述すればそのURLへのリンクができあがります。
http://www.google.com
http://www.google.com
-## Code and Syntax Highlighting
+## コードとシンタックスハイライト
-Blocks of code are either fenced by lines with three back-ticks
```, or are indented with four spaces. Only the fenced code blocks support syntax highlighting.
+コードのブロックは3つのバッククオート
```からなる行で仕切りを入れるか、4つのスペースでインデントすることで表現できます。行で仕切る方法でのみ、シンタックスハイライトがサポートされます。
```no-highlight
-Inline `code` has `back-ticks around` it.
+インラインの`コード`は`バッククオート`で括られています。
```
-Inline `code` has `back-ticks around` it.
+インラインの`コード`は`バッククオート`で括られています。
-Example:
+例:
```javascript
var s = "JavaScript syntax highlighting";
@@ -95,7 +95,7 @@ Example:
```python
def function():
- #indenting works just fine in the fenced code block
+ #仕切られたコードブロックではインデントが有効です
s = "Python syntax highlighting"
print s
```
@@ -107,12 +107,12 @@ Example:
```
```
- No language indicated, so no syntax highlighting.
+ 言語が示されていない場合は、シンタックスハイライトされません。
s = "There is no highlighting for this."
But let's throw in a
tag.
```
-becomes:
+これは次のように表示されます。
```javascript
var s = "JavaScript syntax highlighting";
@@ -121,7 +121,7 @@ alert(s);
```python
def function():
- #indenting works just fine in the fenced code block
+ #仕切られたコードブロックではインデントが有効です
s = "Python syntax highlighting"
print s
```
@@ -133,50 +133,50 @@ puts markdown.to_html
```
```
-No language indicated, so no syntax highlighting.
+言語が示されていない場合は、シンタックスハイライトされません。
s = "There is no highlighting for this."
But let's throw in a
tag.
```
-## Emoji
+## 絵文字
- Sometimes you want to :monkey: around a bit and add some :star2: to your :speech_balloon:. Well we have a gift for you:
+ 時には、 :monkey: になり :speech_balloon: に :star2: を追加したいこともあるでしょう。そんなあなたにプレゼントがあります。
- :zap: You can use emoji anywhere GFM is supported. :v:
+ :zap: あなたはGFMがサポートされた場所ならどこでも、絵文字を使うことができます :v:
- You can use it to point out a :bug: or warn about :speak_no_evil: patches. And if someone improves your really :snail: code, send them some :birthday:. People will :heart: you for that.
+ :bug: の指摘や :speak_no_evil: パッチの警告に使うこともできます。そして、もし誰かが本当に :snail: なコードを改善したら、彼らに :birthday: を送りましょう。皆あなたを :heart: になるでしょう。
- If you are new to this, don't be :fearful:. You can easily join the emoji :family:. All you need to do is to look up on the supported codes.
+ あなたが絵文字の初心者だとしても、 :fearful: にならないでください。あなたも簡単に絵文字の :family: に入ることができます。サポートされたコードを使うだけです。
- Consult the [Emoji Cheat Sheet](http://emoji.codes) for a list of all supported emoji codes. :thumbsup:
+ サポートされている絵文字コードの一覧は、 [Emoji Cheat Sheet](http://emoji.codes) を確認してください。 :thumbsup:
-Sometimes you want to :monkey: around a bit and add some :star2: to your :speech_balloon:. Well we have a gift for you:
+時には、 :monkey: になり :speech_balloon: に :star2: を追加したいこともあるでしょう。そんなあなたにプレゼントがあります。
-:zap: You can use emoji anywhere GFM is supported. :v:
+:zap: あなたはGFMがサポートされた場所ならどこでも、絵文字を使うことができます :v:
-You can use it to point out a :bug: or warn about :speak_no_evil: patches. And if someone improves your really :snail: code, send them some :birthday:. People will :heart: you for that.
+:bug: の指摘や :speak_no_evil: パッチの警告に使うこともできます。そして、もし誰かが本当に :snail: なコードを改善したら、彼らに :birthday: を送りましょう。皆あなたを :heart: になるでしょう。
-If you are new to this, don't be :fearful:. You can easily join the emoji :family:. All you need to do is to look up on the supported codes.
+あなたが絵文字の初心者だとしても、 :fearful: にならないでください。あなたも簡単に絵文字の :family: に入ることができます。サポートされたコードを使うだけです。
-Consult the [Emoji Cheat Sheet](http://emoji.codes) for a list of all supported emoji codes. :thumbsup:
+サポートされている絵文字コードの一覧は、 [Emoji Cheat Sheet](http://emoji.codes) を確認してください。 :thumbsup:
-## Special GitLab References
+## GitLabでの特別な参照
-GFM recognized special references.
+GFM は特別な参照を認識します。
-You can easily reference e.g. an issue, a commit, a team member or even the whole team within a project.
+例えばプロジェクト内のチームメンバー、課題、コミットメッセージを簡単に参照することができます。
-GFM will turn that reference into a link so you can navigate between them easily.
+GFM は参照をリンクに変換するため、それらの参照に対して簡単にナビゲーションすることができます。
-GFM will recognize the following:
+GFM は以下を認識します。
-- @foo : for specific team members or groups
-- @all : for the whole team
-- #123 : for issues
-- !123 : for merge requests
-- $123 : for snippets
-- 1234567 : for commits
-- \[file\](path/to/file) : for file references
+- @foo : 特定のチームメンバーやグループへの参照
+- @all : チーム全体への参照
+- #123 : 課題への参照
+- !123 : マージリクエストへの参照
+- $123 : スニペットへの参照
+- 1234567 : コミットへの参照
+- \[file\](path/to/file) : ファイルへの参照
GFM also recognizes references to commits, issues, and merge requests in other projects:
@@ -196,9 +196,9 @@ You can add task lists to merge request and issue descriptions to keep track of
Task lists can only be created in descriptions, not in titles or comments. Task item state can be managed by editing the description's Markdown or by clicking the rendered checkboxes.
-# Standard Markdown
+# 標準のMarkdown
-## Headers
+## ヘッダ
```no-highlight
# H1
@@ -208,12 +208,12 @@ Task lists can only be created in descriptions, not in titles or comments. Task
##### H5
###### H6
-Alternatively, for H1 and H2, an underline-ish style:
+H1とH2では下線を使ったスタイルも使うことができます。
-Alt-H1
+H1の別表現
======
-Alt-H2
+H2の別表現
------
```
@@ -224,308 +224,306 @@ Alt-H2
##### H5
###### H6
-Alternatively, for H1 and H2, an underline-ish style:
+H1とH2では下線を使ったスタイルも使うことができます。
-Alt-H1
+H1の別表現
======
-Alt-H2
+H2の別表現
------
-### Header IDs and links
+### ヘッダのIDとリンク
-All markdown rendered headers automatically get IDs, except for comments.
+すべての Markdown からレンダリングされたヘッダは、コメントを除いて自動的にIDを取得します。
-On hover a link to those IDs becomes visible to make it easier to copy the link to the header to give it to someone else.
+ヘッダへのリンクを誰かに知らせやすくするために、リンク上にカーソルをあてるとIDが表示されます。
-The IDs are generated from the content of the header according to the following rules:
+コンテンツのヘッダから生成されたIDは以下のルールになっています。
-1. remove the heading hashes `#` and process the rest of the line as it would be processed if it were not a header
-2. from the result, remove all HTML tags, but keep their inner content
-3. convert all characters to lowercase
-4. convert all characters except `[a-z0-9_-]` into hyphens `-`
-5. transform multiple adjacent hyphens into a single hyphen
-6. remove trailing and heading hyphens
+1. 先頭のハッシュ `#` を削除し、行の残りの部分をヘッダでなかった場合のように処理します
+2. その結果から、すべてのHTMLタグを削除し、ただしタグの中のコンテンツは残すように処理します
+3. すべての文字を小文字に変換します
+4. `[a-z0-9_-]` 以外のすべての文字をハイフン `-` に変換します
+5. 連続するハイフンを1つのハイフンに変換します
+6. 先頭と末尾のハイフンを削除します
-For example:
+例:
```
###### ..Ab_c-d. e [anchor](URL) ..
```
-which renders as:
+以下のように表示されます。
###### ..Ab_c-d. e [anchor](URL) ..
-will first be converted by step 1) into a string like:
+これはステップ 1) によって次のような文字列に変換されます。
```
..Ab_c-d. e <a href="URL">anchor</a> <img src="URL" alt="alt text"/>..
```
-After removing the tags in step 2) we get:
+ステップ 2) でタグを削除すると次のようになります。
```
..Ab_c-d. e anchor ..
```
-And applying all the other steps gives the id:
+そして以降のステップを適用するとIDができあがります。
```
ab_c-d-e-anchor
```
-Note in particular how:
+特に以下の点に注意してください。
-- for markdown anchors `[text](URL)`, only the `text` is used
-- markdown images `` are completely ignored
+- Markdown のアンカー `[text](URL)` は `text` だけが使用されます
+- Markdown のイメージ `` は完全に無視されます
-## Emphasis
+## 強調
```no-highlight
-Emphasis, aka italics, with *asterisks* or _underscores_.
+強調(イタリック体)は *アスタリスク* や _アンダースコア_ で表現します。
-Strong emphasis, aka bold, with **asterisks** or __underscores__.
+さらに強い強調(太字)は **アスタリスク** or __アンダースコア__ で表現します。
-Combined emphasis with **asterisks and _underscores_**.
+組み合わせた強調は **アスタリスクと _アンダースコア_** のように表現します。
-Strikethrough uses two tildes. ~~Scratch this.~~
+取消線には二つのチルダを使います。 ~~ここを削除~~
```
-Emphasis, aka italics, with *asterisks* or _underscores_.
+強調(イタリック体)は *asterisks* や _underscores_ で表現します。
-Strong emphasis, aka bold, with **asterisks** or __underscores__.
+さらに強い強調(太字)は **アスタリスク** or __アンダースコア__ で表現します。
-Combined emphasis with **asterisks and _underscores_**.
+組み合わせた強調は **アスタリスクと _アンダースコア_** のように表現します。
-Strikethrough uses two tildes. ~~Scratch this.~~
+取消線には二つのチルダを使います。 ~~ここを削除~~
-## Lists
+## リスト
```no-highlight
-1. First ordered list item
-2. Another item
- * Unordered sub-list.
-1. Actual numbers don't matter, just that it's a number
- 1. Ordered sub-list
-4. And another item.
-
- Some text that should be aligned with the above item.
-
-* Unordered list can use asterisks
-- Or minuses
-+ Or pluses
+1. 先頭のリスト項目
+2. 別の項目
+ * 番号のないサブリスト
+1. 実際の番号は問題ではなく、数字であることが必要です
+ 1. 番号付きのサブリスト
+4. さらに別の項目
+
+ テキストは上の項目と位置を合わせる必要があります。
+
+* 番号のないリストはアスタリスクを使います
+- またはマイナス
++ またはプラス
```
-1. First ordered list item
-2. Another item
- * Unordered sub-list.
-1. Actual numbers don't matter, just that it's a number
- 1. Ordered sub-list
-4. And another item.
+1. 先頭のリスト項目
+2. 別の項目
+ * 番号のないサブリスト
+1. 実際の番号は問題ではなく、数字であることが必要です
+ 1. 番号付きのサブリスト
+4. さらに別の項目
- Some text that should be aligned with the above item.
+ テキストは上の項目と位置を合わせる必要があります。
-* Unordered list can use asterisks
-- Or minuses
-+ Or pluses
+* 番号のないリストはアスタリスクを使います
+- またはマイナス
++ またはプラス
-## Links
+## リンク
-There are two ways to create links, inline-style and reference-style.
+リンクを作るには、インラインスタイルとリファレンススタイルの二つの方法があります。
- [I'm an inline-style link](https://www.google.com)
+ [インラインスタイルのリンクです](https://www.google.com)
- [I'm a reference-style link][Arbitrary case-insensitive reference text]
+ [リファレンススタイルのリンクです][Arbitrary case-insensitive reference text]
- [I'm a relative reference to a repository file](LICENSE)
+ [リポジトリのファイルへの相対パスでの参照です](LICENSE)
- [You can use numbers for reference-style link definitions][1]
+ [リファレンススタイルのリンク定義に番号を使うこともできます][1]
- Or leave it empty and use the [link text itself][]
+ あるいは中身を空にすることもできます [link text itself][]
- Some text to show that the reference links can follow later.
+ リファレンスのリンク先は後に続けて書きます。
[arbitrary case-insensitive reference text]: https://www.mozilla.org
[1]: http://slashdot.org
[link text itself]: http://www.reddit.com
-[I'm an inline-style link](https://www.google.com)
+[インラインスタイルのリンクです](https://www.google.com)
-[I'm a reference-style link][Arbitrary case-insensitive reference text]
+[リファレンススタイルのリンクです][Arbitrary case-insensitive reference text]
-[I'm a relative reference to a repository file](LICENSE)
+[リポジトリのファイルへの相対パスでの参照です](LICENSE)
-[You can use numbers for reference-style link definitions][1]
+[リファレンススタイルのリンク定義に番号を使うこともできます][1]
-Or leave it empty and use the [link text itself][]
+あるいは中身を空にすることもできます [link text itself][]
-Some text to show that the reference links can follow later.
+リファレンスのリンク先は後に続けて書きます。
[arbitrary case-insensitive reference text]: https://www.mozilla.org
[1]: http://slashdot.org
[link text itself]: http://www.reddit.com
-**Note**
+**注意**
-Relative links do not allow referencing project files in a wiki page or wiki page in a project file. The reason for this is that, in GitLab, wiki is always a separate git repository. For example:
+相対パスのリンクでは、Wikiページ内のプロジェクトファイルやプロジェクトファイル内のWikiページを参照することはできません。理由は、GitLabではWikiが常に別のGitリポジトリに分けられているためです。例えば
-`[I'm a reference-style link][style]`
+`[リファレンススタイルのリンクです][style]`
-will point the link to `wikis/style` when the link is inside of a wiki markdown file.
+は Wiki の Markdown ファイル内でのリンクならば `wikis/style` へリンクします。
-## Images
+## 画像
- Here's our logo (hover to see the title text):
+ 私たちのロゴです(マウスオーバーでタイトル文字列を表示します)。
- Inline-style:
+ インラインスタイル:
- Reference-style:
+ リファレンススタイル:
![alt text1][logo]
[logo]: assets/logo-white.png
-Here's our logo:
+私たちのロゴです。
-Inline-style:
+インラインスタイル:
-Reference-style:
+リファレンススタイル:
![alt text][logo]
[logo]: /assets/logo-white.png
-## Blockquotes
+## 引用
```no-highlight
-> Blockquotes are very handy in email to emulate reply text.
-> This line is part of the same quote.
+> 引用はメールの返信をエミュレートするのに非常に便利です。
+> この行は引用の一部です。
-Quote break.
+引用は終わります。
-> This is a very long line that will still be quoted properly when it wraps. Oh boy let's keep writing to make sure this is long enough to actually wrap for everyone. Oh, you can *put* **Markdown** into a blockquote.
+> これはとても長い行ですが正常にワードラップされて引用することができます。さあ、これが実際にワードラップしてくれることを皆が確かめられるように、十分に長く書き続けましょう。この引用にも **Markdown** を入れることができます。
```
-> Blockquotes are very handy in email to emulate reply text.
-> This line is part of the same quote.
+> 引用はメールの返信をエミュレートするのに非常に便利です。
+> この行は引用の一部です。
-Quote break.
+引用は終わります。
-> This is a very long line that will still be quoted properly when it wraps. Oh boy let's keep writing to make sure this is long enough to actually wrap for everyone. Oh, you can *put* **Markdown** into a blockquote.
+> これはとても長い行ですが正常にワードラップされて引用することができます。さあ、これが実際にワードラップしてくれることを皆が確かめられるように、十分に長く書き続けましょう。この引用にも **Markdown** を入れることができます。
-## Inline HTML
+## インライン HTML
-You can also use raw HTML in your Markdown, and it'll mostly work pretty well.
+生のHTMLを Markdown で使うことができ、大半はうまく機能するでしょう。
Note that inline HTML is disabled in the default Gitlab configuration, although it is [possible](https://github.com/gitlabhq/gitlabhq/pull/8007/commits) for the system administrator to enable it.
```no-highlight
- - Definition list
- - Is something people use sometimes.
+ - 定義リスト
+ - は時々使われるものです。
- - Markdown in HTML
- - Does *not* work **very** well. Use HTML tags.
+ - HTMLでのMarkdown
+ - これは **うまく** 機能 *しません* 。HTML タグを使ってください。
```
- - Definition list
- - Is something people use sometimes.
+ - 定義リスト
+ - は時々使われるものです。
- - Markdown in HTML
- - Does *not* work **very** well. Use HTML tags.
+ - HTMLでのMarkdown
+ - これは **うまく** 機能 *しません* 。HTML タグを使ってください。
-## Horizontal Rule
+## 水平線
```
-Three or more...
+3つ以上...
---
-Hyphens
+ハイフン
***
-Asterisks
+アスタリスク
___
-Underscores
+アンダースコア
```
-Three or more...
+3つ以上...
---
-Hyphens
+ハイフン
***
-Asterisks
+アスタリスク
___
-Underscores
+アンダースコア
-## Line Breaks
+## 改行
-My basic recommendation for learning how line breaks work is to experiment and discover -- hit <Enter> once (i.e., insert one newline), then hit it twice (i.e., insert two newlines), see what happens. You'll soon learn to get what you want. "Markdown Toggle" is your friend.
+基本的に、改行がどのような挙動になるか学ぶには、実験して発見することをおすすめします。 <Enter> を1回押し(改行を挿入し)、2回押し(2つの改行を挿入し)、何が起きるを見てください。すぐに知りたいことを知ることができるでしょう。"Markdownのトグル"が役に立ちます。
-Here are some things to try out:
+以下を試してみてください。
```
-Here's a line for us to start with.
+ここが最初の行です。
-This line is separated from the one above by two newlines, so it will be a *separate paragraph*.
+この行は2つの改行で上の行と分けられており *別の段落*になります。
-This line is also a separate paragraph, but...
-This line is only separated by a single newline, so it's a separate line in the *same paragraph*.
+この行も段落が分かれていますが...
+この行は1つの改行だけで分けられているため、 *同じ段落* の別の行になります。
-This line is also a separate paragraph, and...
-This line is on its own line, because the previous line ends with two
-spaces.
+この行も段落が分かれており...
+前の行が2つのスペースで終わっているため、この行はこの行だけで表示されます。
```
-Here's a line for us to start with.
+ここが最初の行です。
-This line is separated from the one above by two newlines, so it will be a *separate paragraph*.
+この行は2つの改行で上の行と分けられており *別の段落*になります。
-This line is also begins a separate paragraph, but...
-This line is only separated by a single newline, so it's a separate line in the *same paragraph*.
+この行も段落が分かれていますが...
+この行は1つの改行だけで分けられているため、 *同じ段落* の別の行になります。
-This line is also a separate paragraph, and...
-This line is on its own line, because the previous line ends with two
-spaces.
+この行も段落が分かれており...
+前の行が2つのスペースで終わっているため、この行はこの行だけで表示されます。
-## Tables
+## 表
-Tables aren't part of the core Markdown spec, but they are part of GFM and Markdown Here supports them.
+テーブルはコアの Markdown の使用には含まれていませんが、GFMやここでのMarkdownではサポートされています。
```
-| header 1 | header 2 |
+| ヘッダ 1 | ヘッダ 2 |
| -------- | -------- |
-| cell 1 | cell 2 |
-| cell 3 | cell 4 |
+| セル 1 | セル 2 |
+| セル 3 | セル 4 |
```
-Code above produces next output:
+上記のコードでは、次のように表示されます。
-| header 1 | header 2 |
+| ヘッダ 1 | ヘッダ 2 |
| -------- | -------- |
-| cell 1 | cell 2 |
-| cell 3 | cell 4 |
+| セル 1 | セル 2 |
+| セル 3 | セル 4 |
**Note**
The row of dashes between the table header and body must have at least three dashes in each column.
-## References
+## リファレンス
-- This document leveraged heavily from the [Markdown-Cheatsheet](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet).
-- The [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) at Daring Fireball is an excellent resource for a detailed explanation of standard markdown.
-- [Dillinger.io](http://dillinger.io) is a handy tool for testing standard markdown.
+- このドキュメントは [Markdown-Cheatsheet](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet) に多いに参考にしています。
+- Daring Fireball の [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) は標準の Markdown について詳細に説明しているすばらしいリソースです。
+- [Dillinger.io](http://dillinger.io) は標準の Markdown をテストできる便利なツールです。
diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md
index c9928e1..193edda 100644
--- a/doc/permissions/permissions.md
+++ b/doc/permissions/permissions.md
@@ -1,52 +1,52 @@
-# Permissions
-
-Users have different abilities depending on the access level they have in a particular group or project.
-
-If a user is both in a project group and in the project itself, the highest permission level is used.
-
-If a user is a GitLab administrator they receive all permissions.
-
-## Project
-
-| Action | Guest | Reporter | Developer | Master | Owner |
-|---------------------------------------|---------|------------|-------------|----------|--------|
-| Create new issue | ✓ | ✓ | ✓ | ✓ | ✓ |
-| Leave comments | ✓ | ✓ | ✓ | ✓ | ✓ |
-| Pull project code | | ✓ | ✓ | ✓ | ✓ |
-| Download project | | ✓ | ✓ | ✓ | ✓ |
-| Create code snippets | | ✓ | ✓ | ✓ | ✓ |
-| Create new merge request | | | ✓ | ✓ | ✓ |
-| Create new branches | | | ✓ | ✓ | ✓ |
-| Push to non-protected branches | | | ✓ | ✓ | ✓ |
-| Force push to non-protected branches | | | ✓ | ✓ | ✓ |
-| Remove non-protected branches | | | ✓ | ✓ | ✓ |
-| Add tags | | | ✓ | ✓ | ✓ |
-| Write a wiki | | | ✓ | ✓ | ✓ |
-| Manage issue tracker | | | ✓ | ✓ | ✓ |
-| Manage labels | | | ✓ | ✓ | ✓ |
-| Create new milestones | | | | ✓ | ✓ |
-| Add new team members | | | | ✓ | ✓ |
-| Push to protected branches | | | | ✓ | ✓ |
-| Enable/disable branch protection | | | | ✓ | ✓ |
-| Turn on/off prot. branch push for devs| | | | ✓ | ✓ |
-| Rewrite/remove git tags | | | | ✓ | ✓ |
-| Edit project | | | | ✓ | ✓ |
-| Add deploy keys to project | | | | ✓ | ✓ |
-| Configure project hooks | | | | ✓ | ✓ |
-| Switch visibility level | | | | | ✓ |
-| Transfer project to another namespace | | | | | ✓ |
-| Remove project | | | | | ✓ |
-| Force push to protected branches | | | | | |
-| Remove protected branches | | | | | |
-
-## Group
-
-| Action | Guest | Reporter | Developer | Master | Owner |
-|-------------------------|-------|----------|-----------|--------|-------|
-| Browse group | ✓ | ✓ | ✓ | ✓ | ✓ |
-| Edit group | | | | | ✓ |
-| Create project in group | | | | ✓ | ✓ |
-| Manage group members | | | | | ✓ |
-| Remove group | | | | | ✓ |
-
-Any user can remove themselves from a group, unless they are the last Owner of the group.
+# アクセス権
+
+それぞれのグループやプロジェクトでユーザが与えられているアクセス権レベルによって、できることは異なります。
+
+ユーザがグループとプロジェクトの両方に属する場合はもっとも強力なアクセス権レベルが適用されます。
+
+ユーザがGitLabの管理者である場合は、すべてのアクセス権が与えられます。
+
+## プロジェクト
+
+| アクション | Guest | Reporter | Developer | Master | Owner |
+|--------------------------------------------|---------|------------|-------------|----------|--------|
+| 新しい課題を作成する | ✓ | ✓ | ✓ | ✓ | ✓ |
+| コメントを作成する | ✓ | ✓ | ✓ | ✓ | ✓ |
+| プロジェクトのコードをプルする | | ✓ | ✓ | ✓ | ✓ |
+| プロジェクトをダウンロードする | | ✓ | ✓ | ✓ | ✓ |
+| コードスニペットを作成する | | ✓ | ✓ | ✓ | ✓ |
+| マージリクエストを作成する | | | ✓ | ✓ | ✓ |
+| ブランチを作成する | | | ✓ | ✓ | ✓ |
+| 保護されていないブランチにプッシュする | | | ✓ | ✓ | ✓ |
+| 保護されていないブランチに強制プッシュする | | | ✓ | ✓ | ✓ |
+| 保護されていないブランチを削除する | | | ✓ | ✓ | ✓ |
+| タグを追加する | | | ✓ | ✓ | ✓ |
+| Wikiを書く | | | ✓ | ✓ | ✓ |
+| 課題トラッカーを管理する | | | ✓ | ✓ | ✓ |
+| ラベルを管理する | | | ✓ | ✓ | ✓ |
+| マイルストーンを作成する | | | | ✓ | ✓ |
+| メンバーを追加する | | | | ✓ | ✓ |
+| 保護されたブランチにプッシュする | | | | ✓ | ✓ |
+| ブランチの保護を有効/無効にする | | | | ✓ | ✓ |
+| 保護ブランチへのプッシュを有効/無効にする | | | | ✓ | ✓ |
+| Gitタグを更新/削除する | | | | ✓ | ✓ |
+| プロジェクトを編集する | | | | ✓ | ✓ |
+| デプロイキーをプロジェクトに追加する | | | | ✓ | ✓ |
+| プロジェクトフックを設定する | | | | ✓ | ✓ |
+| 可視性レベルを変更する | | | | | ✓ |
+| プロジェクトを移譲する | | | | | ✓ |
+| プロジェクトを削除する | | | | | ✓ |
+| 保護されているブランチに強制プッシュする | | | | | |
+| 保護されているブランチを削除する | | | | | |
+
+## グループ
+
+| アクション | Guest | Reporter | Developer | Master | Owner |
+|------------------------------------|-------|----------|-----------|--------|-------|
+| グループを閲覧する | ✓ | ✓ | ✓ | ✓ | ✓ |
+| グループを編集する | | | | | ✓ |
+| グループ内にプロジェクトを作成する | | | | ✓ | ✓ |
+| メンバーを管理する | | | | | ✓ |
+| グループを削除する | | | | | ✓ |
+
+ユーザが唯一のグループのOwnerでない限り、すべてのユーザは自分自身をグループから削除することができます。
diff --git a/doc/public_access/public_access.md b/doc/public_access/public_access.md
index 7c5a6c0..c871652 100644
--- a/doc/public_access/public_access.md
+++ b/doc/public_access/public_access.md
@@ -1,44 +1,44 @@
-# Public access
+# 公開アクセス
-GitLab allows you to open selected projects to be accessed **publicly** or **internally**.
+GitLabは選択されたプロジェクトを **公開** または **内部のみ** のアクセス権で開けるようにすることができます。
-Projects with either of these visibility levels will be listed in the [public access directory](/public).
+どちらかの可視性が設定されているプロジェクトは [公開プロジェクト一覧](/public) に一覧表示されています。
-Internal projects will only be available to authenticated users.
+内部のみのプロジェクトは、ログインしたユーザだけが利用することができます。
-## Public projects
+## 公開プロジェクト
-Public projects can be cloned **without any** authentication.
+公開プロジェクトは **一切の認証なしで** クローンすることができます。
-It will also be listed on the [public access directory](/public).
+公開プロジェクトは [公開プロジェクト一覧](/public) にも一覧表示されます。
-**Any logged in user** will have [Guest](../permissions/permissions) permissions on the repository.
+**ログインしたユーザは誰でも** リポジトリに対して [Guest](../permissions/permissions) のアクセス権を持ちます。
-## Internal projects
+## 内部プロジェクト
-Internal projects can be cloned by any logged in user.
+内部プロジェクトはログインしたユーザであれば誰でもクローンすることができます。
-It will also be listed on the [public access directory](/public) for logged in users.
+内部プロジェクトは、ログインしたユーザの場合 [公開プロジェクト一覧](/public) にも表示されます。
-Any logged in user will have [Guest](../permissions/permissions) permissions on the repository.
+ログインしたユーザは誰でもリポジトリに対して [Guest](../permissions/permissions) のアクセス権を持ちます。
-## How to change project visibility
+## プロジェクトの可視性レベルの変更方法
-1. Go to your project dashboard
-1. Click on the "Edit" tab
-1. Change "Visibility Level"
+1. プロジェクトのダッシュボードに移動します
+1. "編集"をクリックします
+1. "可視性レベル"を変更します
-## Visibility of users
+## ユーザの可視性
-The public page of users, located at `/u/username` is visible if either:
+ユーザの公開ページは `/u/username` にあり、以下の場合に閲覧することができます。
-- You are logged in.
-- You are logged out, and the target user is authorized to (is Guest, Reporter, etc.) at least one public project.
+- ログインしている場合。
+- ログアウトしており、対象のユーザが1つ以上の公開プロジェクトで認可されている(Guest, Reporter など)場合。
-Otherwise, you will be redirected to the sign in page.
+その他の場合はサインインのページにリダイレクトされます。
-When visiting the public page of an user, you will only see listed projects which you can view yourself.
+ユーザの公開ページを表示したとき、あなたが見ることのできるプロジェクトだけが一覧表示されます。
-## Restricting the use of public or internal projects
+## 公開または内部プロジェクトの利用を制限する
-In [gitlab.yml](https://gitlab.com/gitlab-org/gitlab-ce/blob/dbd88d453b8e6c78a423fa7e692004b1db6ea069/config/gitlab.yml.example#L64) you can disable public projects or public and internal projects for the entire GitLab installation to prevent people making code public by accident. The restricted visibility settings do not apply to admin users.
+[gitlab.yml](https://gitlab.com/gitlab-org/gitlab-ce/blob/dbd88d453b8e6c78a423fa7e692004b1db6ea069/config/gitlab.yml.example#L64)では、メンバーが誤ってコードを公開してしまわないように、GitLabの全体インストールで公開プロジェクトまたは公開・内部プロジェクトを無効化するように設定することができます。制限された可視性設定は管理者ユーザには適用されません。
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 99cdfff..5e63ae9 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -1,13 +1,13 @@
-# Backup restore
+# バックアップ・リストア
-## Create a backup of the GitLab system
+## GitLabシステムのバックアップの作成
-A backup creates an archive file that contains the database, all repositories and all attachments.
-This archive will be saved in backup_path (see `config/gitlab.yml`).
-The filename will be `[TIMESTAMP]_gitlab_backup.tar`. This timestamp can be used to restore an specific backup.
-You can only restore a backup to exactly the same version of GitLab that you created it on, for example 7.2.1.
+データベース、すべてのリポジトリ、すべての添付ファイルのバックアップアーカイブを作成します。
+このアーカイブは backup_path ( `config/gitlab.yml` を参照)に保存されます。
+ファイル名は `[TIMESTAMP]_gitlab_backup.tar` の形式です。このタイムスタンプはバックアップをリストアするときに使用されます。
+バックアップは、それを取得したGitLabと同じバージョンにのみリストアできます。(例えば、7.2.1)
```
# use this command if you've installed GitLab with the Omnibus package
@@ -17,7 +17,7 @@ sudo gitlab-rake gitlab:backup:create
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-Example output:
+出力例:
```
Dumping database tables:
@@ -132,16 +132,16 @@ with the name of your bucket:
}
```
-## Storing configuration files
+## 設定ファイルの保存
-Please be informed that a backup does not store your configuration files.
-If you use an Omnibus package please see the [instructions in the readme to backup your configuration](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#backup-and-restore-omnibus-gitlab-configuration).
-If you have a cookbook installation there should be a copy of your configuration in Chef.
-If you have an installation from source, please consider backing up your `gitlab.yml` file, any SSL keys and certificates, and your [SSH host keys](https://superuser.com/questions/532040/copy-ssh-keys-from-one-server-to-another-server/532079#532079).
+バックアップでは設定ファイルは保存されないことに注意してください。
+Omnibusパッケージを使用している場合は、 [READMEの設定のバックアップ方法](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#backup-and-restore-omnibus-gitlab-configuration) を参照してください。
+Cookbookでインストールしている場合は、Chefに設定のコピーがあるはずです。
+ソースコードからインストールした場合は、gitlab.ymlファイル、SSLキー、証明書、[SSHホストキー](https://superuser.com/questions/532040/copy-ssh-keys-from-one-server-to-another-server/532079#532079)のバックアップを検討してください。
-## Restore a previously created backup
+## 以前のバックアップへのリストア
-You can only restore a backup to exactly the same version of GitLab that you created it on, for example 7.2.1.
+バックアップは、それを取得したGitLabと同じバージョンにのみリストアできます。(例えば、7.2.1)
```
# Omnibus package installation
@@ -151,13 +151,13 @@ sudo gitlab-rake gitlab:backup:restore
bundle exec rake gitlab:backup:restore RAILS_ENV=production
```
-Options:
+オプション:
```
BACKUP=timestamp_of_backup (required if more than one backup exists)
```
-Example output:
+出力例:
```
Unpacking backup... [DONE]
@@ -188,7 +188,7 @@ Restoring repositories:
Deleting tmp directories...[DONE]
```
-## Configure cron to make daily backups
+## 日次バックアップを行うためのcronの設定
For Omnibus package installations, see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#scheduling-a-backup .
@@ -199,7 +199,7 @@ sudo -u git -H editor config/gitlab.yml # Enable keep_time in the backup section
sudo -u git crontab -e # Edit the crontab for the git user
```
-Add the following lines at the bottom:
+以下の行を末尾に追加します。
```
# Create a full backup of the GitLab repositories and SQL database every day at 4am
diff --git a/doc/raketasks/cleanup.md b/doc/raketasks/cleanup.md
index 96d67f7..0cc4671 100644
--- a/doc/raketasks/cleanup.md
+++ b/doc/raketasks/cleanup.md
@@ -1,8 +1,8 @@
-# Cleanup
+# クリーンアップ
-## Remove garbage from filesystem. Important! Data loss!
+## ファイルシステム上のゴミを削除。重要：データを損失します！
-Remove namespaces(dirs) from `/home/git/repositories` if they don't exist in GitLab database.
+`/home/git/repositories` から、GitLabのデータベースに存在しないネームスペース(ディレクトリ)を削除します。
```
# omnibus-gitlab
@@ -12,7 +12,7 @@ sudo gitlab-rake gitlab:cleanup:dirs
bundle exec rake gitlab:cleanup:dirs RAILS_ENV=production
```
-Remove repositories (global only for now) from `/home/git/repositories` if they don't exist in GitLab database.
+`/home/git/repositories` から、GitLabのデータベースに存在しないリポジトリ(現在のところはグローバルなもののみ)を削除します。
```
# omnibus-gitlab
diff --git a/doc/raketasks/features.md b/doc/raketasks/features.md
index f9a4619..7dfa903 100644
--- a/doc/raketasks/features.md
+++ b/doc/raketasks/features.md
@@ -1,19 +1,20 @@
-# Features
+# フィーチャー
-## Enable usernames and namespaces for user projects
+## ユーザのプロジェクトでのユーザ名とネームスペースを有効化
-This command will enable the namespaces feature introduced in v4.0. It will move every project in its namespace folder.
+このコマンドは、v4.0 で導入されたネームスペースの機能を有効にします。
+すべてのプロジェクトをネームスペースフォルダに移動します。
-Note:
+注意:
-- Because the **repository location will change**, you will need to **update all your git URLs** to point to the new location.
-- Username can be changed at [Profile / Account](/profile/account)
+- **リポジトリの場所が変更されるため** 、新しい場所を指すように **すべてのGitのURLを更新** する必要があります。
+- ユーザ名は [プロフィール / アカウント設定](/profile/account) から変更することができます。
-**Example:**
+**例:**
-Old path: `git@example.org:myrepo.git`
+古いパス: `git@example.org:myrepo.git`
-New path: `git@example.org:username/myrepo.git` or `git@example.org:groupname/myrepo.git`
+新しいパス: `git@example.org:username/myrepo.git` または `git@example.org:groupname/myrepo.git`
```
bundle exec rake gitlab:enable_namespaces RAILS_ENV=production
diff --git a/doc/raketasks/maintenance.md b/doc/raketasks/maintenance.md
index 41a994f..45aa506 100644
--- a/doc/raketasks/maintenance.md
+++ b/doc/raketasks/maintenance.md
@@ -1,8 +1,8 @@
-# Maintenance
+# メンテナンス
-## Gather information about GitLab and the system it runs on
+## GitLabやシステムに関する情報の収集
-This command gathers information about your GitLab installation and the System it runs on. These may be useful when asking for help or reporting issues.
+このコマンドは、GitLabと、GitLabを実行するシステムの情報を収集します。これらはヘルプを求めたり問題をレポートするのに便利です。
```
# omnibus-gitlab
@@ -12,7 +12,7 @@ sudo gitlab-rake gitlab:env:info
bundle exec rake gitlab:env:info RAILS_ENV=production
```
-Example output:
+出力例:
```
System information
@@ -43,18 +43,18 @@ Hooks: /home/git/gitlab-shell/hooks/
Git: /usr/bin/git
```
-## Check GitLab configuration
+## GitLab設定の確認
-Runs the following rake tasks:
+以下の rake タスクを実行します。
- `gitlab:env:check`
- `gitlab:gitlab_shell:check`
- `gitlab:sidekiq:check`
- `gitlab:app:check`
-It will check that each component was setup according to the installation guide and suggest fixes for issues found.
+各コンポーネントがインストールガイドの通りにインストールされたかどうかチェックし、問題があれば修正方法を提示します。
-You may also have a look at our [Trouble Shooting Guide](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide).
+[Trouble Shooting Guide](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide) も確認しておいた方が良いでしょう。
```
# omnibus-gitlab
@@ -64,9 +64,9 @@ sudo gitlab-rake gitlab:check
bundle exec rake gitlab:check RAILS_ENV=production
```
-NOTE: Use SANITIZE=true for gitlab:check if you want to omit project names from the output.
+注意: プロジェクト名を出力しない場合は、 gitlab:check に対して SANITIZE=true を使用してください。
-Example output:
+出力例:
```
Checking Environment ...
@@ -112,11 +112,11 @@ Redis version >= 2.0.0? ... yes
Checking GitLab ... Finished
```
-## (Re-)Create satellite repositories
+## サテライトリポジトリの(再)作成
-This will create satellite repositories for all your projects.
+このコマンドはすべてのプロジェクトのサテライトリポジトリを作成します。
-If necessary, remove the `repo_satellites` directory and rerun the commands below.
+必要に応じて、 `repo_satellites` ディレクトリを削除して以下のコマンドを再実行します。
```
sudo -u git -H mkdir -p /home/git/gitlab-satellites
diff --git a/doc/raketasks/user_management.md b/doc/raketasks/user_management.md
index 80b01ca..60a4613 100644
--- a/doc/raketasks/user_management.md
+++ b/doc/raketasks/user_management.md
@@ -1,6 +1,6 @@
-# User management
+# ユーザ管理
-## Add user as a developer to all projects
+## ユーザを開発者としてすべてのプロジェクトに追加
```bash
# omnibus-gitlab
@@ -10,11 +10,11 @@ sudo gitlab-rake gitlab:import:user_to_projects[username@domain.tld]
bundle exec rake gitlab:import:user_to_projects[username@domain.tld] RAILS_ENV=production
```
-## Add all users to all projects
+## すべてのユーザをすべてのプロジェクトへ追加
-Notes:
+注意:
-- admin users are added as masters
+- 管理者ユーザは Master として追加されます
```bash
# omnibus-gitlab
@@ -24,7 +24,7 @@ sudo gitlab-rake gitlab:import:all_users_to_all_projects
bundle exec rake gitlab:import:all_users_to_all_projects RAILS_ENV=production
```
-## Add user as a developer to all groups
+## ユーザを開発者としてすべてのグループに追加
```bash
# omnibus-gitlab
@@ -34,11 +34,11 @@ sudo gitlab-rake gitlab:import:user_to_groups[username@domain.tld]
bundle exec rake gitlab:import:user_to_groups[username@domain.tld] RAILS_ENV=production
```
-## Add all users to all groups
+## すべてのユーザをすべてのグループに追加
-Notes:
+注意:
-- admin users are added as owners so they can add additional users to the group
+- 管理者ユーザは、グループにユーザを追加できるように所有者として追加されます
```bash
# omnibus-gitlab
diff --git a/doc/security/rack_attack.md b/doc/security/rack_attack.md
index 9206699..539ca31 100644
--- a/doc/security/rack_attack.md
+++ b/doc/security/rack_attack.md
@@ -1,25 +1,25 @@
# Rack attack
-To prevent abusive clients doing damage GitLab uses rack-attack gem.
+クライアントからの大量アクセスによる被害を防ぐため、GitLabは rack-attack の gem を使っています。
-If you installed or upgraded GitLab by following the official guides this should be enabled by default.
+公式ガイドに沿ってGitLabをインストールまたはアップデートしている場合は、デフォルトで有効になっています。
-If you are missing `config/initializers/rack_attack.rb` the following steps need to be taken in order to enable protection for your GitLab instance:
+もし `config/initializers/rack_attack.rb` が存在しない場合は、GitLabインスタンスの保護を有効にするために次のステップを実行する必要があります。
-1. In config/application.rb find and uncomment the following line:
+1. config/application.rb の中で次の行を探してコメントを外します：
config.middleware.use Rack::Attack
-1. Rename `config/initializers/rack_attack.rb.example` to `config/initializers/rack_attack.rb`.
+1. `config/initializers/rack_attack.rb.example` を `config/initializers/rack_attack.rb` にリネームします。
-1. Review the `paths_to_be_protected` and add any other path you need protecting.
+1. `paths_to_be_protected` を確認し、他に保護すべきパスがあれば追加します。
-1. Restart GitLab instance.
+1. GitLabインスタンスを再起動します。
-By default, user sign-in, user sign-up(if enabled) and user password reset is limited to 6 requests per minute. After trying for 6 times, client will have to wait for the next minute to be able to try again. These settings can be found in `config/initializers/rack_attack.rb`
+デフォルトでは、ユーザのサインイン、サインアップ(有効な場合)、ユーザのパスワードリセットは 6 リクエスト/ 分 に制限されています。6 回試行すると、クライアントは次の1分間はアクセスできなくなります。この設定は `config/initializers/rack_attack.rb` にあります。
-If you want more restrictive/relaxed throttle rule change the `limit` or `period` values. For example, more relaxed throttle rule will be if you set limit: 3 and period: 1.second(this will allow 3 requests per second). You can also add other paths to the protected list by adding to `paths_to_be_protected` variable. If you change any of these settings do not forget to restart your GitLab instance.
+さらに制限を厳しい、または緩いスロットル・ルールを設定したい場合は、 `limit` または `period` の値を変更します。例えば、 limit: 3 、 period: 1.second と設定するとより緩やかなスロットル・ルールになります(これは秒間 3 リクエストの制限になります)。 さらに他のパスを保護の対象としたい場合は `paths_to_be_protected` 変数にパスを追加します。これらの設定を変更した後は、GitLabインスタンスを再起動する必要があります。
-In case you find throttling is not enough to protect you against abusive clients, rack-attack gem offers IP whitelisting, blacklisting, Fail2ban style filter and tracking.
+大量アクセスするクライアントから保護するのにスロットルでは不十分な場合のために、 rack-attack gem はIPホワイトリスト、ブラックリスト、Fail2ban 形式のフィルターと追跡の機能も備えています。
-For more information on how to use these options check out [rack-attack README](https://github.com/kickstarter/rack-attack/blob/master/README.md).
+これらのオプションに関するさらに詳細な情報については [rack-attack README](https://github.com/kickstarter/rack-attack/blob/master/README.md) を参照してください。
diff --git a/doc/ssh/README.md b/doc/ssh/README.md
index 6fe23df..5042156 100644
--- a/doc/ssh/README.md
+++ b/doc/ssh/README.md
@@ -1,6 +1,6 @@
# SSH
-## SSH keys
+## SSHキー
An SSH key allows you to establish a secure connection between your
computer and GitLab.
@@ -50,7 +50,7 @@ pbcopy < ~/.ssh/id_rsa.pub
xclip -sel clip < ~/.ssh/id_rsa.pub
```
-## Deploy keys
+## デプロイキー
Deploy keys allow read-only access to multiple projects with a single SSH
key.
diff --git a/doc/system_hooks/system_hooks.md b/doc/system_hooks/system_hooks.md
index f9b6d37..8744947 100644
--- a/doc/system_hooks/system_hooks.md
+++ b/doc/system_hooks/system_hooks.md
@@ -1,12 +1,12 @@
-# System hooks
+# システムフック
-Your GitLab instance can perform HTTP POST requests on the following events: `project_create`, `project_destroy`, `user_add_to_team`, `user_remove_from_team`, `user_create`, `user_destroy`, `key_create`, `key_destroy`, `group_create`, `group_destroy`, `user_add_to_group` and `user_remove_from_group`.
+GitLabインスタンスは、`project_create`, `project_destroy`, `user_add_to_team`, `user_remove_from_team`, `user_create`, `user_destroy`, `key_create`, `key_destroy`, `group_create`, `group_destroy`, `user_add_to_group`, `user_remove_from_group` のイベントが発生したときにHTTP POSTリクエストを実行できます。
-System hooks can be used, e.g. for logging or changing information in a LDAP server.
+システムフックは、例えばログインやLDAPサーバ情報変更に利用することができます。
-## Hooks request example
+## フックリクエストの例
-**Project created:**
+**プロジェクトの作成:**
```json
{
@@ -22,7 +22,7 @@ System hooks can be used, e.g. for logging or changing information in a LDAP ser
}
```
-**Project destroyed:**
+**プロジェクトの削除:**
```json
{
@@ -38,7 +38,7 @@ System hooks can be used, e.g. for logging or changing information in a LDAP ser
}
```
-**New Team Member:**
+**新しいメンバーの追加:**
```json
{
@@ -55,7 +55,7 @@ System hooks can be used, e.g. for logging or changing information in a LDAP ser
}
```
-**Team Member Removed:**
+**メンバーの削除:**
```json
{
@@ -72,7 +72,7 @@ System hooks can be used, e.g. for logging or changing information in a LDAP ser
}
```
-**User created:**
+**ユーザの作成:**
```json
{
@@ -84,7 +84,7 @@ System hooks can be used, e.g. for logging or changing information in a LDAP ser
}
```
-**User removed:**
+**ユーザの削除:**
```json
{
diff --git a/doc/update/6.x-or-7.x-to-7.9.md b/doc/update/6.x-or-7.x-to-7.9.md
index bd6eb6b..c726e73 100644
--- a/doc/update/6.x-or-7.x-to-7.9.md
+++ b/doc/update/6.x-or-7.x-to-7.9.md
@@ -164,9 +164,15 @@ TIP: to see what changed in `gitlab.yml.example` in this release use next comman
git diff 6-0-stable:config/gitlab.yml.example 7-9-stable:config/gitlab.yml.example
```
+<<<<<<< HEAD:doc/update/6.x-or-7.x-to-7.8.md
+* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-8-stable/config/gitlab.yml.example but with your settings.
+* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-8-stable/config/unicorn.rb.example but with your settings.
+* Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v2.4.3/config.yml.example but with your settings.
+=======
* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-9-stable/config/gitlab.yml.example but with your settings.
* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-9-stable/config/unicorn.rb.example but with your settings.
* Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v2.6.0/config.yml.example but with your settings.
+>>>>>>> 16d6f0e35b8bd3a88e3a2e2e3ae8bf98be426f85:doc/update/6.x-or-7.x-to-7.9.md
* Copy rack attack middleware config
```bash
@@ -181,8 +187,13 @@ sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
### Change Nginx settings
+<<<<<<< HEAD:doc/update/6.x-or-7.x-to-7.8.md
+* HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-8-stable/lib/support/nginx/gitlab but with your settings.
+* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-8-stablef/lib/support/nginx/gitlab-ssl but with your settings.
+=======
* HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-9-stable/lib/support/nginx/gitlab but with your settings.
* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-9-stable/lib/support/nginx/gitlab-ssl but with your settings.
+>>>>>>> 16d6f0e35b8bd3a88e3a2e2e3ae8bf98be426f85:doc/update/6.x-or-7.x-to-7.9.md
* A new `location /uploads/` section has been added that needs to have the same content as the existing `location @gitlab` section.
## 9. Start application
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index 851f50f..a3658bd 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -1,18 +1,18 @@
-# Web hooks
+# Webフック
-Project web hooks allow you to trigger an URL if new code is pushed or a new issue is created.
+プロジェクトWebフックを使うと、新しいコードのプッシュや課題の作成をトリガーとして指定のURLへリクエストすることができます。
-You can configure web hooks to listen for specific events like pushes, issues or merge requests. GitLab will send a POST request with data to the web hook URL.
+プッシュ、課題、マージリクエストといったイベントから特定のものに対してWebフックを設定することができます。GitLab はWebフックのURLに対して POST リクエストでデータを送信します。
-Web hooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server.
+Webフックは、外部の課題トラッカーの更新、CIビルドの起動、バックアップミラーの更新、本番サーバへのデプロイなどに利用することができます。
-If you send a web hook to an SSL endpoint [the certificate will not be verified](https://gitlab.com/gitlab-org/gitlab-ce/blob/ccd617e58ea71c42b6b073e692447d0fe3c00be6/app/models/web_hook.rb#L35) since many people use self-signed certificates.
+WebフックをSSLエンドポイントへ送信した場合、自己署名の証明書が使われている場合が多いため [証明書は検証されません](https://gitlab.com/gitlab-org/gitlab-ce/blob/ccd617e58ea71c42b6b073e692447d0fe3c00be6/app/models/web_hook.rb#L35)。
-## Push events
+## プッシュイベント
-Triggered when you push to the repository except when pushing tags.
+リポジトリへのタグ以外のプッシュで実行されます。
-**Request body:**
+**リクエストボディ:**
```json
{
@@ -59,11 +59,11 @@ Triggered when you push to the repository except when pushing tags.
}
```
-## Tag events
+## タグイベント
-Triggered when you create (or delete) tags to the repository.
+リポジトリにタグを作成または削除したときに実行されます。
-**Request body:**
+**リクエストボディ:**
```json
{
@@ -88,11 +88,11 @@ Triggered when you create (or delete) tags to the repository.
}
```
-## Issues events
+## 課題イベント
-Triggered when a new issue is created or an existing issue was updated/closed/reopened.
+課題の作成/更新/クローズ/再オープンで実行されます。
-**Request body:**
+**リクエストボディ:**
```json
{
@@ -122,11 +122,11 @@ Triggered when a new issue is created or an existing issue was updated/closed/re
}
```
-## Merge request events
+## マージリクエストイベント
-Triggered when a new merge request is created or an existing merge request was updated/merged/closed.
+マージリクエストの作成/更新/マージ/クローズで実行されます。
-**Request body:**
+**リクエストボディ:**
```json
{
diff --git a/doc/workflow/README.md b/doc/workflow/README.md
index 6e70235..32d6eae 100644
--- a/doc/workflow/README.md
+++ b/doc/workflow/README.md
@@ -1,14 +1,14 @@
-# Workflow
+# ワークフロー
-- [Feature branch workflow](workflow.md)
-- [Project Features](project_features.md)
-- [Authorization for merge requests](authorization_for_merge_requests.md)
-- [Groups](groups.md)
-- [Labels](labels.md)
+- [フィーチャーブランチワークフロー](workflow.md)
+- [プロジェクトの機能](project_features.md)
+- [マージリクエストの承認](authorization_for_merge_requests.md)
+- [グループ](groups.md)
+- [ラベル](labels.md)
- [GitLab Flow](gitlab_flow.md)
-- [Notifications](notifications.md)
-- [Migrating from SVN to GitLab](migrating_from_svn.md)
-- [Project importing from GitHub to GitLab](import_projects_from_github.md)
-- [Project importing from GitLab.com to your private GitLab instance](import_projects_from_gitlab_com.md)
-- [Protected branches](protected_branches.md)
-- [Web Editor](web_editor.md)
+- [通知](notifications.md)
+- [SVNからGitLabへの移行](migrating_from_svn.md)
+- [GitHubプロジェクトのGitLabへのインポート](import_projects_from_github.md)
+- [GitLab.comプロジェクトのプライベートGitLabインスタンスへのインポート](import_projects_from_gitlab_com.md)
+- [保護ブランチ](protected_branches.md)
+- [Webエディタ](web_editor.md)
diff --git a/doc/workflow/project_features.md b/doc/workflow/project_features.md
index a523b3f..d9aabd6 100644
--- a/doc/workflow/project_features.md
+++ b/doc/workflow/project_features.md
@@ -1,35 +1,35 @@
-# Project features
+# プロジェクトの機能
-When in a Project -> Settings, you will find Features on the bottom of the page that you can toggle.
+プロジェクトの設定画面には、ページ下部に、ON/OFFを切り替えられる機能があります。
-Below you will find a more elaborate explanation of each of these.
+以下では、各機能をより詳しく説明します。
-## Issues
+## 課題
-Issues is a really powerful, but lightweight issue tracking system.
+"課題"は本当に強力ですが軽量な課題トラッキングシステムです。
-You can make tickets, assign them to people, file them under milestones, order them with labels and have discussion in them.
+チケットを作成し、メンバーにアサインし、マイルストーンを設定し、ラベルをつけてディスカッションすることができます。
-They integrate deeply into GitLab and are easily referenced from anywhere by using `#` and the issue number.
+課題はGitLabに深く統合されており、`#`と課題番号を使うことで、どこからでも簡単に参照することができます。
-## Merge Requests
+## マージリクエスト
-Using a merge request, you can review and discuss code before it is merged in the branch of your code.
+マージリクエストを使うと、ブランチ上のソースコードをマージする前にレビューし、ディスカッションすることができます。
-As with issues, it can be assigned; people, issues, etc. can be referenced; milestones attached.
+課題と同じように、メンバーや課題などをアサインすることができ、マイルストーンとともに参照できます。
-We see it as an integral part of working together on code and couldn't work without it.
+私たちは、これをソースコード上での共同作業に欠かすことのできない重要な部分だと考えています。
## Wiki
-This is a separate system for documentation, built right into GitLab.
+これはドキュメンテーションのための別のシステムですが、GitLabの一部として組み込まれています。
-It is source controlled and is very convenient if you don't want to keep you documentation in your source code, but you do want to keep it in your GitLab project.
+Wikiはソースコードとして管理され、ドキュメントをソースコードの一部には入れたくないけれどもGitLabのプロジェクトの一部としておきたい場合に便利です。
-## Snippets
+## スニペット
-Snippets are little bits of code or text.
+スニペットはソースコードやテキストの断片です。
-This is a nice place to put code or text that is used semi-regularly within the project, but does not belong in source control.
+スニペットは、プロジェクトで半定期的に参照するけれどもソースコード管理はしないようなソースコードやテキストを置いておくのに良い場所です。
-For example, a specific config file that is used by > the team that is only valid for the people that work on the code.
+例えば、あるコードを扱うメンバーにのみ有効な特定の設定ファイルなどです。
diff --git a/doc/workflow/workflow.md b/doc/workflow/workflow.md
index f70e41d..ed4d970 100644
--- a/doc/workflow/workflow.md
+++ b/doc/workflow/workflow.md
@@ -1,31 +1,31 @@
-# Feature branch workflow
+# フィーチャーブランチワークフロー
-1. Clone project:
+1. プロジェクトをクローンします
```bash
git clone git@example.com:project-name.git
```
-1. Create branch with your feature:
+1. 機能追加用のブランチを作成します
```bash
git checkout -b $feature_name
```
-1. Write code. Commit changes:
+1. コードを書いて変更をコミットします
```bash
git commit -am "My feature is ready"
```
-1. Push your branch to GitLab:
+1. ブランチをGitLabにプッシュします
```bash
git push origin $feature_name
```
-1. Review your code on commits page.
+1. コミットのページでコードをレビューします
-1. Create a merge request.
+1. マージリクエストを作成します
-1. Your team lead will review the code & merge it to the main branch.
+1. チームリーダがコードレビューしメインのブランチにマージします