  module NotesHelper
    # Helps to distinguish e.g. commit notes in mr notes list
    def note_for_main_target?(note)
+@@ -77,9 +78,9 @@
+     }
+ 
+     button_tag class: 'btn reply-btn js-discussion-reply-button',
+-               data: data, title: 'Add a reply' do
++               data: data, title: '返信を追加' do
+       link_text = icon('comment')
+-      link_text << ' Reply'
++      link_text << ' 返信'
+     end
+   end
+ end
 diff -urN gitlab-rails.bk/app/helpers/projects_helper.rb gitlab-rails/app/helpers/projects_helper.rb
 --- gitlab-rails.bk/app/helpers/projects_helper.rb	2014-03-22 09:00:00.000000000 +0900
 +++ gitlab-rails/app/helpers/projects_helper.rb	2014-03-22 09:00:00.000000000 +0900

   end
 
   def commit_author
diff -urN gitlab-rails.bk/app/models/notification.rb gitlab-rails/app/models/notification.rb
--- gitlab-rails.bk/app/models/notification.rb	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/models/notification.rb	2014-03-22 09:00:00.000000000 +0900

 
       if existing_commits.length > 0
         commit_ids =
@@ -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
