    .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 -urN gitlab-rails.bk/app/views/projects/notes/discussions/_active.html.haml gitlab-rails/app/views/projects/notes/discussions/_active.html.haml
+--- gitlab-rails.bk/app/views/projects/notes/discussions/_active.html.haml	2014-03-22 09:00:00.000000000 +0900
++++ gitlab-rails/app/views/projects/notes/discussions/_active.html.haml	2014-03-22 09:00:00.000000000 +0900
+@@ -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 -urN gitlab-rails.bk/app/views/projects/notes/discussions/_commit.html.haml gitlab-rails/app/views/projects/notes/discussions/_commit.html.haml
+--- gitlab-rails.bk/app/views/projects/notes/discussions/_commit.html.haml	2014-03-22 09:00:00.000000000 +0900
++++ gitlab-rails/app/views/projects/notes/discussions/_commit.html.haml	2014-03-22 09:00:00.000000000 +0900
+@@ -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 -urN gitlab-rails.bk/app/views/projects/notes/discussions/_outdated.html.haml gitlab-rails/app/views/projects/notes/discussions/_outdated.html.haml
+--- gitlab-rails.bk/app/views/projects/notes/discussions/_outdated.html.haml	2014-03-22 09:00:00.000000000 +0900
++++ gitlab-rails/app/views/projects/notes/discussions/_outdated.html.haml	2014-03-22 09:00:00.000000000 +0900
+@@ -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 -urN gitlab-rails.bk/app/views/projects/notes/_edit_form.html.haml gitlab-rails/app/views/projects/notes/_edit_form.html.haml
 --- gitlab-rails.bk/app/views/projects/notes/_edit_form.html.haml	2014-03-22 09:00:00.000000000 +0900
 +++ gitlab-rails/app/views/projects/notes/_edit_form.html.haml	2014-03-22 09:00:00.000000000 +0900

+    を表示中
     - if current_controller?(:commit)
       - unless @commit.has_zero_stats?
         with
@@ -10,7 +10,7 @@
         %strong.cred #{@commit.stats.deletions} deletions
     &nbsp;
     = link_to '#', class: 'btn btn-sm js-toggle-button' do
-      Show diff stats

       .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 &amp; dropping
