          data: { toggle: 'tooltip', placement: placement }
  
        haml_tag :script, "$('." + html_class + "').timeago().tooltip()"
+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
+@@ -1,3 +1,5 @@
++# encoding: utf-8
++
+ class Notification
+   #
+   # Notification levels
+@@ -16,10 +18,10 @@
+ 
+     def options_with_labels
+       {
+-        disabled: N_DISABLED,
+-        participating: N_PARTICIPATING,
+-        watch: N_WATCH,
+-        global: N_GLOBAL
++        "無効" => N_DISABLED,
++        "参加中" => N_PARTICIPATING,
++        "ウォッチ" => N_WATCH,
++        "グローバル" => N_GLOBAL
+       }
+     end
+ 
 diff -urN gitlab-rails.bk/app/views/admin/projects/index.html.haml gitlab-rails/app/views/admin/projects/index.html.haml
 --- gitlab-rails.bk/app/views/admin/projects/index.html.haml	2014-03-22 09:00:00.000000000 +0900
 +++ gitlab-rails/app/views/admin/projects/index.html.haml	2014-03-22 09:00:00.000000000 +0900

     .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")
+        = select_tag('update[status]', options_for_select(['オープン', '解決']), prompt: "ステータス")
         = project_users_select_tag('update[assignee_id]', placeholder: 'Assignee')
-        = select_tag('update[milestone_id]', bulk_update_milestone_options, prompt: "Milestone")
+        = select_tag('update[milestone_id]', bulk_update_milestone_options, prompt: "マイルストーン")

 
         = link_to group, class: 'group-name' do
           %strong= group.name
@@ -34,6 +34,6 @@
         %strong #{user_group.human_access}
 
         %div.light
-          #{pluralize(group.projects.count, "project")}, #{pluralize(group.users.count, "user")}
+          #{group.projects.count}プロジェクト, #{group.users.count}ユーザ
 
 = paginate @user_groups
diff -urN gitlab-rails.bk/app/views/profiles/history.html.haml gitlab-rails/app/views/profiles/history.html.haml
--- gitlab-rails.bk/app/views/profiles/history.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/profiles/history.html.haml	2014-03-22 09:00:00.000000000 +0900
