 -    %p Please wait a moment, this page will automatically refresh when ready.
 +      プロジェクトとリポジトリを作成しています
 +    %p 準備ができ次第、自動的に更新されますのでお待ちください
+diff -urN gitlab-rails.bk/app/views/projects/notes/_discussion.html.haml gitlab-rails/app/views/projects/notes/_discussion.html.haml
+--- gitlab-rails.bk/app/views/projects/notes/_discussion.html.haml	2014-03-22 09:00:00.000000000 +0900
++++ gitlab-rails/app/views/projects/notes/_discussion.html.haml	2014-03-22 09:00:00.000000000 +0900
+@@ -4,32 +4,34 @@
+     .discussion-actions
+       = link_to "javascript:;", class: "js-details-target turn-on js-toggler-target" do
+         %i.icon-eye-close
+-        Hide discussion
++        ディスカッションを非表示
+       = link_to "javascript:;", class: "js-details-target turn-off js-toggler-target" do
+         %i.icon-eye-open
+-        Show discussion
++        ディスカッションを表示
+     = image_tag avatar_icon(note.author_email), class: "avatar s32"
+     %div
+       = link_to_member(@project, note.author, avatar: false)
+       - if note.for_merge_request?
+         - if note.diff
+-          started a discussion on this merge request diff
++          がこのマージリクエストの差分
+           = link_to_merge_request_diff_line_note(note)
++          についてディスカッションを始めました
+         - else
+-          started
++          がこのマージリクエストの差分について
+           %strong
+             %i.icon-remove
+-            outdated
+-          discussion on this merge request diff
++            無効な
++          ディスカッションを始めました
+       - elsif note.for_commit?
+-        started a discussion on commit
++        がコミット
+         #{link_to note.noteable.short_id, project_commit_path(note.project, note.noteable)}
+         = link_to_commit_diff_line_note(note) if note.for_diff_line?
++        についてディスカッションを始めました
+       - else
+-        %cite.cgray started a discussion
++        %cite.cgray がディスカッションを始めました
+     %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')}
+@@ -39,7 +41,7 @@
+         .content
+           .file= render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
+       - else
+-        = link_to 'show outdated discussion', '#', class: 'js-show-outdated-discussion'
++        = link_to '無効なディスカッションを表示', '#', class: 'js-show-outdated-discussion'
+         %div.hide.outdated-discussion
+           .content
+             .notes{ rel: discussion_notes.first.discussion_id }
+@@ -55,8 +57,8 @@
+     -# will be shown when the other one is hidden
+     .discussion-hidden.content.hide
+       .note
+-        %em Hidden discussion.
++        %em ディスカッションは非表示にされています
+         = link_to "javascript:;", class: "js-details-target js-toggler-target" do
+           %i.icon-eye-open
+-          Show
++          表示
+ 
 diff -urN gitlab-rails.bk/app/views/projects/notes/_discussion_reply_button.html.haml gitlab-rails/app/views/projects/notes/_discussion_reply_button.html.haml
 --- gitlab-rails.bk/app/views/projects/notes/_discussion_reply_button.html.haml	2014-03-22 09:00:00.000000000 +0900
 +++ gitlab-rails/app/views/projects/notes/_discussion_reply_button.html.haml	2014-03-22 09:00:00.000000000 +0900

diff -urN gitlab-rails.bk/app/views/projects/merge_requests/show/_commits.html.haml gitlab-rails/app/views/projects/merge_requests/show/_commits.html.haml
--- gitlab-rails.bk/app/views/projects/merge_requests/show/_commits.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/projects/merge_requests/show/_commits.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -11,7 +11,7 @@
           %li.bottom
             8 of #{@commits.count} commits displayed.
             %strong
-              %a.show-all-commits Click here to show all
+              %a.show-all-commits クリックしてすべて表示
         - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
           %ul.all-commits.hide.well-list
             - @commits.first(MergeRequestDiff::COMMITS_SAFE_SIZE).each do |commit|
diff -urN gitlab-rails.bk/app/views/projects/merge_requests/show/_mr_title.html.haml gitlab-rails/app/views/projects/merge_requests/show/_mr_title.html.haml
--- gitlab-rails.bk/app/views/projects/merge_requests/show/_mr_title.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/projects/merge_requests/show/_mr_title.html.haml	2014-03-22 09:00:00.000000000 +0900

diff -urN gitlab-rails.bk/app/views/notify/closed_merge_request_email.html.haml gitlab-rails/app/views/notify/closed_merge_request_email.html.haml
--- gitlab-rails.bk/app/views/notify/closed_merge_request_email.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/notify/closed_merge_request_email.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -1,9 +1,9 @@
 %p
-  = "Merge Request #{@merge_request.iid} was closed by #{@updated_by.name}"
+  = "#{@updated_by.name} がマージリクエスト #{@merge_request.iid} をクローズしました。"
 %p
   = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
 %p
   != merge_path_description(@merge_request, '&rarr;')
 %p
-  Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
+  担当者: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
 
diff -urN gitlab-rails.bk/app/views/notify/closed_merge_request_email.text.haml gitlab-rails/app/views/notify/closed_merge_request_email.text.haml
--- gitlab-rails.bk/app/views/notify/closed_merge_request_email.text.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/notify/closed_merge_request_email.text.haml	2014-03-22 09:00:00.000000000 +0900
@@ -1,8 +1,8 @@
-= "Merge Request #{@merge_request.iid} was closed by #{@updated_by.name}"
+= "マージリクエスト #{@merge_request.iid} は #{@updated_by.name} にクローズされました"
 
-Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
+マージリクエストのURL: #{project_merge_request_url(@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 -urN gitlab-rails.bk/app/views/notify/group_access_granted_email.html.haml gitlab-rails/app/views/notify/group_access_granted_email.html.haml
--- gitlab-rails.bk/app/views/notify/group_access_granted_email.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/notify/group_access_granted_email.html.haml	2014-03-22 09:00:00.000000000 +0900
