  
  .event-body
    .event-note
+バイナリー・ファイルgitlab-rails.bk/app/views/groups/._new_group_member.html.haml.swpとgitlab-rails/app/views/groups/._new_group_member.html.haml.swpは違います
+バイナリー・ファイルgitlab-rails.bk/app/views/groups/.members.html.haml.swpとgitlab-rails/app/views/groups/.members.html.haml.swpは違います
 diff -urN gitlab-rails.bk/app/views/groups/_new_group_member.html.haml gitlab-rails/app/views/groups/_new_group_member.html.haml
 --- gitlab-rails.bk/app/views/groups/_new_group_member.html.haml	2014-03-22 09:00:00.000000000 +0900
 +++ gitlab-rails/app/views/groups/_new_group_member.html.haml	2014-03-22 09:00:00.000000000 +0900

+  years: "約 %d 年",
+  wordSeparator: ""
+};
diff -urN gitlab-rails.bk/app/helpers/application_helper.rb gitlab-rails/app/helpers/application_helper.rb
--- gitlab-rails.bk/app/helpers/application_helper.rb	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/helpers/application_helper.rb	2014-03-22 09:00:00.000000000 +0900

     = render @events
   .col-md-4
     = render 'profile', user: @user
diff -urN gitlab-rails.bk/app/views/users_groups/_users_group.html.haml gitlab-rails/app/views/users_groups/_users_group.html.haml
--- gitlab-rails.bk/app/views/users_groups/_users_group.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/users_groups/_users_group.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -11,18 +11,18 @@
     %strong= member.human_access
     - if show_controls
       - if can?(current_user, :modify, member)
-        = link_to '#', class: "btn-tiny btn js-toggle-button", title: 'Edit access level' do
+        = link_to '#', class: "btn-tiny btn js-toggle-button", title: 'アクセスレベルを編集' do
           %i.icon-edit
       - if can?(current_user, :destroy, member)
         - if current_user == member.user
-          = link_to leave_profile_group_path(@group), data: { confirm: leave_group_message(@group.name)}, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
+          = link_to leave_profile_group_path(@group), data: { confirm: leave_group_message(@group.name)}, method: :delete, class: "btn-tiny btn btn-remove", title: 'ユーザをグループから削除' do
             %i.icon-minus.icon-white
         - else
-          = link_to group_users_group_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
+          = link_to group_users_group_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'ユーザをグループから削除' do
             %i.icon-minus.icon-white
 
   .edit-member.hide.js-toggle-content
     = form_for [@group, member], remote: true do |f|
       .alert.prepend-top-20
         = f.select :group_access, options_for_select(UsersGroup.group_access_roles, member.group_access)
-        = f.submit 'Save', class: 'btn btn-save btn-small'
+        = f.submit '保存', class: 'btn btn-save btn-small'
