  
        if existing_commits.length > 0
          commit_ids =
-@@ -313,6 +311,19 @@
+@@ -248,14 +246,14 @@
+       where("note like :query", query: "%#{query}%")
+     end
+ 
+-    def cross_reference_note_prefix
+-      '_mentioned in '
++    def cross_reference_note_suffix
++      'から参照しました_'
+     end
+ 
+     private
+ 
+     def cross_reference_note_content(gfm_reference)
+-      cross_reference_note_prefix + "#{gfm_reference}_"
++      "_#{gfm_reference}" + cross_reference_note_suffix
+     end
+ 
+     # Prepend the mentioner's namespaced project path to the GFM reference for
+@@ -302,17 +300,30 @@
+       else
+         if mentioner.is_a?(Commit)
+           mentioner.gfm_reference.sub(
+-            /(commit )/,
++            /(コミット )/,
+             "\\1#{mentioning_project.path_with_namespace}@"
+           )
+         else
+           mentioner.gfm_reference.sub(
+-            /(issue |merge request )/,
++            /(課題 |マージリクエスト )/,
+             "\\1#{mentioning_project.path_with_namespace}"
+           )
          end
        end
      end

diff -urN gitlab-rails.bk/app/views/projects/diffs/_stats.html.haml gitlab-rails/app/views/projects/diffs/_stats.html.haml
--- gitlab-rails.bk/app/views/projects/diffs/_stats.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/projects/diffs/_stats.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -1,7 +1,7 @@
 .js-toggle-container
   .commit-stat-summary
-    Showing

diff -urN gitlab-rails.bk/app/views/projects/merge_requests/show/_state_widget.html.haml gitlab-rails/app/views/projects/merge_requests/show/_state_widget.html.haml
--- gitlab-rails.bk/app/views/projects/merge_requests/show/_state_widget.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/projects/merge_requests/show/_state_widget.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -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
