          - project_active_milestones.each do |milestone|
            %li
              = link_to project_filter_path(milestone_id: milestone.id) do
-@@ -54,9 +54,9 @@
+@@ -54,23 +54,23 @@
    .clearfix
      .issues_bulk_update.hide
        = form_tag bulk_update_project_issues_path(@project), method: :post  do
 -        = select_tag('update[status]', options_for_select(['Open', 'Closed']), prompt: "Status")
+-        = project_users_select_tag('update[assignee_id]', placeholder: 'Assignee')
+-        = select_tag('update[milestone_id]', bulk_update_milestone_options, prompt: "Milestone")
 +        = select_tag('update[status]', options_for_select([['オープン', 'opened'], ['解決', 'closed']]), prompt: "ステータス")
-         = project_users_select_tag('update[assignee_id]', placeholder: 'Assignee')
--        = select_tag('update[milestone_id]', bulk_update_milestone_options, prompt: "Milestone")
++        = project_users_select_tag('update[assignee_id]', placeholder: '担当者')
 +        = select_tag('update[milestone_id]', bulk_update_milestone_options, prompt: "マイルストーン")
          = hidden_field_tag 'update[issues_ids]', []
          = hidden_field_tag :status, params[:status]
-         = button_tag "Update issues", class: "btn update_selected_issues btn-save"
-@@ -66,11 +66,11 @@
+-        = button_tag "Update issues", class: "btn update_selected_issues btn-save"
++        = button_tag "課題を更新", class: "btn update_selected_issues btn-save"
+ 
+ .ui-box
+   %ul.well-list.issues-list
      = render @issues
      - if @issues.blank?
        %li

-    %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

-  = "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
