 -  = "Issue ##{@issue.iid}"
 +  = "課題 ##{@issue.iid}"
    = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
+diff -urN gitlab-rails.bk/app/views/notify/merged_merge_request_email.html.haml gitlab-rails/app/views/notify/merged_merge_request_email.html.haml
+--- gitlab-rails.bk/app/views/notify/merged_merge_request_email.html.haml	2014-03-22 09:00:00.000000000 +0900
++++ gitlab-rails/app/views/notify/merged_merge_request_email.html.haml	2014-03-22 09:00:00.000000000 +0900
+@@ -1,9 +1,9 @@
+ %p
+-  = "Merge Request #{@merge_request.iid} was merged"
++  = "マージリクエスト #{@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/new_email_email.html.haml gitlab-rails/app/views/notify/new_email_email.html.haml
 --- gitlab-rails.bk/app/views/notify/new_email_email.html.haml	2014-03-22 09:00:00.000000000 +0900
 +++ gitlab-rails/app/views/notify/new_email_email.html.haml	2014-03-22 09:00:00.000000000 +0900

-    %p Please wait a moment, this page will automatically refresh when ready.
+      プロジェクトとリポジトリを作成しています
+    %p 準備ができ次第、自動的に更新されますのでお待ちください
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/show.html.haml gitlab-rails/app/views/projects/show.html.haml
--- gitlab-rails.bk/app/views/projects/show.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/projects/show.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -19,25 +19,25 @@
       - if @project.forked_from_project
         .alert.alert-success
           %i.icon-code-fork.project-fork-icon
