                %p
 -                You must transfer ownership or delete these groups before you can delete this user.
 +                このユーザを削除する前に、所有権を移譲するか、これらのグループを削除する必要があります。
+diff -urN gitlab-rails.bk/app/views/dashboard/_activity_head.html.haml gitlab-rails/app/views/dashboard/_activity_head.html.haml
+--- gitlab-rails.bk/app/views/dashboard/_activity_head.html.haml	2014-03-22 09:00:00.000000000 +0900
++++ gitlab-rails/app/views/dashboard/_activity_head.html.haml	2014-03-22 09:00:00.000000000 +0900
+@@ -1,7 +1,7 @@
+ %ul.center-top-menu
+   %li{ class: ("active" unless params[:filter]) }
+     = link_to activity_dashboard_path, class: 'shortcuts-activity', data: {placement: 'right'} do
+-      Your Projects
++      あなたのプロジェクト
+   %li{ class: ("active" if params[:filter] == 'starred') }
+     = link_to activity_dashboard_path(filter: 'starred'), data: {placement: 'right'} do
+-      Starred Projects
++      スターをつけたプロジェクト
+diff -urN gitlab-rails.bk/app/views/dashboard/activity.html.haml gitlab-rails/app/views/dashboard/activity.html.haml
+--- gitlab-rails.bk/app/views/dashboard/activity.html.haml	2014-03-22 09:00:00.000000000 +0900
++++ gitlab-rails/app/views/dashboard/activity.html.haml	2014-03-22 09:00:00.000000000 +0900
+@@ -1,9 +1,9 @@
+ = content_for :meta_tags do
+   - if current_user
+-    = auto_discovery_link_tag(:atom, dashboard_projects_url(format: :atom, private_token: current_user.private_token), title: "All activity")
++    = auto_discovery_link_tag(:atom, dashboard_projects_url(format: :atom, private_token: current_user.private_token), title: "すべてのアクティビティ")
+ 
+-- page_title    "Activity"
+-- header_title  "Activity", activity_dashboard_path
++- page_title    "アクティビティ"
++- header_title  "アクティビティ", activity_dashboard_path
+ 
+ = render 'dashboard/activity_head'
+ 
 diff -urN gitlab-rails.bk/app/views/dashboard/groups/index.html.haml gitlab-rails/app/views/dashboard/groups/index.html.haml
 --- gitlab-rails.bk/app/views/dashboard/groups/index.html.haml	2014-03-22 09:00:00.000000000 +0900
 +++ gitlab-rails/app/views/dashboard/groups/index.html.haml	2014-03-22 09:00:00.000000000 +0900

+      - if @merge_request.assignee
+        %strong= link_to_member(@project, @merge_request.assignee, size: 24)
+      - else
+        none
+    .issuable-context-selectbox
+      - if can?(current_user, :modify_merge_request, @merge_request)
+        = users_select_tag('merge_request[assignee_id]', placeholder: '担当者を選択', class: 'custom-form-control js-select2 js-assignee', selected: @merge_request.assignee_id, project: @target_project, null_user: true)

 
 %hr
 
@@ -19,28 +19,28 @@
     .col-sm-10
       = f.text_field :url, class: "form-control"
   .form-group
-    = f.label :enable_ssl_verification, "SSL verification", class: 'control-label checkbox'
+    = f.label :enable_ssl_verification, "SSLの検証", class: 'control-label checkbox'
     .col-sm-10
       .checkbox
         = f.label :enable_ssl_verification do
           = f.check_box :enable_ssl_verification
-          %strong Enable SSL verification
+          %strong SSLの検証を有効にする
   .form-actions
-    = f.submit "Add System Hook", class: "btn btn-create"
+    = f.submit "システムフックを追加", class: "btn btn-create"
