    -if @user.errors.any?
      .alert.alert-danger
        %ul
-@@ -18,8 +18,8 @@
-     = f.label :password, class: 'control-label'
+@@ -12,14 +12,14 @@
+           %li= msg
+ 
+   .form-group
+-    = f.label :current_password, class: 'control-label'
++    = f.label :current_password, '現在のパスワード', class: 'control-label'
+     .col-sm-10= f.password_field :current_password, required: true, class: 'form-control'
+   .form-group
+-    = f.label :password, class: 'control-label'
++    = f.label :password, '新しいパスワード', class: 'control-label'
      .col-sm-10= f.password_field :password, required: true, class: 'form-control'
    .form-group
 -    = f.label :password_confirmation, class: 'control-label'

-      = link_to 'Remove', project_label_path(@project, label), class: 'btn btn-remove remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?"}
+      = link_to '編集', edit_project_label_path(@project, label), class: 'btn'
+      = link_to '削除', project_label_path(@project, label), class: 'btn btn-remove remove-row', method: :delete, remote: true, data: {confirm: "本当にこのラベルを削除しますか？"}
diff -urN gitlab-rails.bk/app/views/projects/merge_requests/edit.html.haml gitlab-rails/app/views/projects/merge_requests/edit.html.haml
--- gitlab-rails.bk/app/views/projects/merge_requests/edit.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/projects/merge_requests/edit.html.haml	2014-03-22 09:00:00.000000000 +0900

+      = 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/explore/groups/index.html.haml gitlab-rails/app/views/explore/groups/index.html.haml
--- gitlab-rails.bk/app/views/explore/groups/index.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/explore/groups/index.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -2,31 +2,31 @@
   .pull-left
     = form_tag explore_groups_path, method: :get, class: 'form-inline form-tiny' do |f|
       .form-group
-        = search_field_tag :search, params[:search], placeholder: "Filter by name", class: "form-control search-text-input input-mn-300", id: "groups_search"
+        = search_field_tag :search, params[:search], placeholder: "名前で絞り込み", class: "form-control search-text-input input-mn-300", id: "groups_search"
       .form-group
-        = submit_tag 'Search', class: "btn btn-primary wide"
+        = submit_tag '検索', class: "btn btn-primary wide"
 
   .pull-right
     .dropdown.inline
       %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
-        %span.light sort:
+        %span.light 並び替え:
         - if @sort.present?
           = @sort.humanize
         - else
-          Name
+          名前
         %b.caret
       %ul.dropdown-menu
         %li
           = link_to explore_groups_path(sort: nil) do
-            Name
+            名前
           = link_to explore_groups_path(sort: 'newest') do
-            Newest
+            新しい順
           = link_to explore_groups_path(sort: 'oldest') do
-            Oldest
+            古い順
           = link_to explore_groups_path(sort: 'recently_updated') do
-            Recently updated
+            最近更新された
           = link_to explore_groups_path(sort: 'last_updated') do
-            Last updated
+            最終更新日
 
 %hr
 
@@ -45,7 +45,7 @@
         %p.light
           #{pluralize(group.members.size, 'member')}, #{pluralize(group.projects.count, 'project')}
   - unless @groups.present?
-    .nothing-here-block No public groups
+    .nothing-here-block 公開グループはありません
 
 
 = paginate @groups, theme: "gitlab"
diff -urN gitlab-rails.bk/app/views/explore/projects/index.html.haml gitlab-rails/app/views/explore/projects/index.html.haml
--- gitlab-rails.bk/app/views/explore/projects/index.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/explore/projects/index.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -2,37 +2,37 @@
   .pull-left
     = form_tag explore_projects_path, method: :get, class: 'form-inline form-tiny' do |f|
       .form-group
-        = search_field_tag :search, params[:search], placeholder: "Filter by name", class: "form-control search-text-input input-mn-300", id: "projects_search"
+        = search_field_tag :search, params[:search], placeholder: "名前で絞り込み", class: "form-control search-text-input input-mn-300", id: "projects_search"
       .form-group
-        = submit_tag 'Search', class: "btn btn-primary wide"
+        = submit_tag '検索', class: "btn btn-primary wide"
 
   .pull-right
     .dropdown.inline
       %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
-        %span.light sort:
+        %span.light 並び替え:
         - if @sort.present?
           = @sort.humanize
         - else
-          Name
+          名前
         %b.caret
       %ul.dropdown-menu
         %li
           = link_to explore_projects_path(sort: nil) do
-            Name
+            名前
           = link_to explore_projects_path(sort: 'newest') do
-            Newest
+            新しい順
           = link_to explore_projects_path(sort: 'oldest') do
-            Oldest
+            古い順
           = link_to explore_projects_path(sort: 'recently_updated') do
-            Recently updated
+            最近更新された
           = link_to explore_projects_path(sort: 'last_updated') do
-            Last updated
+            最終更新日
 
 %hr
 .public-projects
   %ul.bordered-list.top-list
     = render @projects
     - unless @projects.present?
-      .nothing-here-block No public projects
+      .nothing-here-block 公開中のプロジェクトはありません
 
   = paginate @projects, theme: "gitlab"
diff -urN gitlab-rails.bk/app/views/explore/projects/_project.html.haml gitlab-rails/app/views/explore/projects/_project.html.haml
--- gitlab-rails.bk/app/views/explore/projects/_project.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/explore/projects/_project.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -8,7 +8,7 @@
 
       - if current_page?(starred_explore_projects_path)
         %strong.pull-right
-          = pluralize project.star_count, 'star'
+          = "#{project.star_count}スター"
 
     - if project.description.present?
       %p.project-description.str-truncated
@@ -16,11 +16,11 @@
 
     .repo-info
       - unless project.empty_repo?
-        = link_to pluralize(project.repository.round_commit_count, 'commit'), project_commits_path(project, project.default_branch)
+        = link_to "#{project.repository.round_commit_count}コミット", project_commits_path(project, project.default_branch)
         &middot;
-        = link_to pluralize(project.repository.branch_names.count, 'branch'), project_branches_path(project)
+        = link_to "#{project.repository.branch_names.count}ブランチ", project_branches_path(project)
         &middot;
-        = link_to pluralize(project.repository.tag_names.count, 'tag'), project_tags_path(project)
+        = link_to "#{project.repository.tag_names.count}タグ", project_tags_path(project)
       - else
         %i.icon-warning-sign
-        Empty repository
+        空のリポジトリ
diff -urN gitlab-rails.bk/app/views/explore/projects/starred.html.haml gitlab-rails/app/views/explore/projects/starred.html.haml
--- gitlab-rails.bk/app/views/explore/projects/starred.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/explore/projects/starred.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -1,7 +1,7 @@
 .explore-trending-block
   %p.lead
     %i.icon-comments-alt
-    See most starred projects
+    最もスターがつけられたプロジェクトを見てみましょう
   %hr
   .public-projects
     %ul.bordered-list
diff -urN gitlab-rails.bk/app/views/explore/projects/trending.html.haml gitlab-rails/app/views/explore/projects/trending.html.haml
--- gitlab-rails.bk/app/views/explore/projects/trending.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/explore/projects/trending.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -1,11 +1,11 @@
 .explore-trending-block
   %p.lead
     %i.icon-comments-alt
-    See most discussed projects for last month
+    この1ヶ月で最も議論されたプロジェクトを見てみましょう
   %hr
   .public-projects
     %ul.bordered-list
       = render @trending_projects
 
   .center
-    = link_to 'Show all projects', explore_projects_path, class: 'btn btn-primary'
+    = link_to 'すべてのプロジェクトを表示', explore_projects_path, class: 'btn btn-primary'
diff -urN gitlab-rails.bk/app/views/groups/edit.html.haml gitlab-rails/app/views/groups/edit.html.haml
--- gitlab-rails.bk/app/views/groups/edit.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/groups/edit.html.haml	2014-03-22 09:00:00.000000000 +0900
