 -  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
 +  <%= link_to "ロック解除方法のメールを受信していませんか？", new_unlock_path(resource_name) %><br />
  <% end -%>
+diff -urN gitlab-rails.bk/app/views/events/_event_last_push.html.haml gitlab-rails/app/views/events/_event_last_push.html.haml
+--- gitlab-rails.bk/app/views/events/_event_last_push.html.haml	2014-03-22 09:00:00.000000000 +0900
++++ gitlab-rails/app/views/events/_event_last_push.html.haml	2014-03-22 09:00:00.000000000 +0900
+@@ -1,13 +1,15 @@
+ - if show_last_push_widget?(event)
+   .event-last-push
+-    %span You pushed to
++    %span あなたは
+     = link_to project_commits_path(event.project, event.ref_name) do
+       %strong= truncate(event.ref_name, length: 28)
+-    at
++    ブランチを
+     %strong= link_to_project event.project
++    プロジェクトに
+     #{time_ago_with_tooltip(event.created_at)}
++    にプッシュしました。
+ 
+     .pull-right
+-      = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-small" do
+-        Create Merge Request
++      = link_to new_mr_path_from_push_event(event), title: "新しいマージリクエスト", class: "btn btn-create btn-small" do
++        マージリクエストを作成
+   %hr
 diff -urN gitlab-rails.bk/app/views/events/event/_common.html.haml gitlab-rails/app/views/events/event/_common.html.haml
 --- gitlab-rails.bk/app/views/events/event/_common.html.haml	2014-03-22 09:00:00.000000000 +0900
 +++ gitlab-rails/app/views/events/event/_common.html.haml	2014-03-22 09:00:00.000000000 +0900

diff -urN gitlab-rails.bk/app/views/projects/merge_requests/show/_how_to_merge.html.haml gitlab-rails/app/views/projects/merge_requests/show/_how_to_merge.html.haml
--- gitlab-rails.bk/app/views/projects/merge_requests/show/_how_to_merge.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/projects/merge_requests/show/_how_to_merge.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -3,7 +3,7 @@
     .modal-content
       .modal-header
         %a.close{href: "#", "data-dismiss" => "modal"} ×

       .modal-body
         - if @merge_request.for_fork?
           - source_remote = @merge_request.source_project.namespace.nil? ? "source" :@merge_request.source_project.namespace.path
           - target_remote = @merge_request.target_project.namespace.nil? ? "target" :@merge_request.target_project.namespace.path
           %p
-            %strong Step 1.
-            Checkout the branch we are going to merge and pull in the code
+            %strong ステップ1.
+            マージするブランチをチェックアウトしてソースコードをプルしてください。
           %pre.dark
             :preserve
               git checkout -b #{@merge_request.source_project_path}-#{@merge_request.source_branch} #{@merge_request.target_branch}
               git pull #{@merge_request.source_project.http_url_to_repo} #{@merge_request.source_branch}
           %p
-            %strong Step 2.
-            Merge the branch and push the changes to GitLab
+            %strong ステップ2.
+            ブランチをマージして変更をGitLabにプッシュしてください。
           %pre.dark
             :preserve
               git checkout #{@merge_request.target_branch}
@@ -25,15 +25,15 @@
               git push origin #{@merge_request.target_branch}
         - else
           %p
-            %strong Step 1.
-            Update the repo and checkout the branch we are going to merge
+            %strong ステップ1.
+            リポジトリを更新してマージするブランチをチェックアウトしてください。
           %pre.dark
             :preserve
               git fetch origin
               git checkout -b #{@merge_request.source_branch} origin/#{@merge_request.source_branch}
           %p
-            %strong Step 2.
-            Merge the branch and push the changes to GitLab
+            %strong ステップ2.
+            ブランチをマージして変更をGitLabにプッシュしてください。
           %pre.dark
             :preserve
               git checkout #{@merge_request.target_branch}
diff -urN gitlab-rails.bk/app/views/projects/merge_requests/show/_mr_accept.html.haml gitlab-rails/app/views/projects/merge_requests/show/_mr_accept.html.haml
--- gitlab-rails.bk/app/views/projects/merge_requests/show/_mr_accept.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/projects/merge_requests/show/_mr_accept.html.haml	2014-03-22 09:00:00.000000000 +0900
