            .visibility-levels
              - Project.visibility_levels.each do |label, level|
                .checkbox
-@@ -32,15 +32,15 @@
+@@ -30,17 +30,22 @@
+                   = check_box_tag 'visibility_levels[]', level, params[:visibility_levels].present? && params[:visibility_levels].include?(level.to_s)
+                   %span.descr
                      = visibility_level_icon(level)
-                     = label
+-                    = label
++                    - if level == Gitlab::VisibilityLevel::PRIVATE
++                      プライベート
++                    - elsif level == Gitlab::VisibilityLevel::INTERNAL
++                      内部
++                    - elsif level == Gitlab::VisibilityLevel::PUBLIC
++                      公開
          .form-actions
 -          = submit_tag "Search", class: "btn submit btn-primary"
 -          = link_to "Reset", admin_projects_path, class: "btn"

       }
     end
 
diff -urN gitlab-rails.bk/app/views/admin/dashboard/index.html.haml gitlab-rails/app/views/admin/dashboard/index.html.haml
--- gitlab-rails.bk/app/views/admin/dashboard/index.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/admin/dashboard/index.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -12,7 +12,7 @@
           = link_to admin_projects_path do
             %h1= Project.count
           %hr

   .col-md-8
     .ui-box
       .title
-        Projects (#{@projects.total_count})
+        プロジェクト (#{@projects.total_count})
         .pull-right
-          = link_to 'New Project', new_project_path, class: "btn btn-new"
+          = link_to '新しいプロジェクト', new_project_path, class: "btn btn-new"
       %ul.well-list
         - @projects.each do |project|
           %li
@@ -50,8 +55,8 @@
             .pull-right
               %span.label.label-gray
                 = repository_size(project)
-              = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
-              = link_to 'Destroy', [project], data: { confirm: remove_project_message(project) }, method: :delete, class: "btn btn-small btn-remove"
+              = link_to '編集', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
+              = link_to '削除', [project], data: { confirm: remove_project_message(project) }, method: :delete, class: "btn btn-small btn-remove"
         - if @projects.blank?
-          %p.nothing_here_message 0 projects matches
+          %p.nothing_here_message マッチするプロジェクトがありません
     = paginate @projects, theme: "gitlab"
diff -urN gitlab-rails.bk/app/views/admin/users/_form.html.haml gitlab-rails/app/views/admin/users/_form.html.haml
--- gitlab-rails.bk/app/views/admin/users/_form.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/admin/users/_form.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -7,70 +7,70 @@
             %li= msg
 
     %fieldset
-      %legend Account
+      %legend アカウント
       .form-group
-        = f.label :name, class: 'control-label'
+        = f.label :name, '名前', class: 'control-label'
         .col-sm-10
           = f.text_field :name, required: true, autocomplete: "off", class: 'form-control'
-          %span.help-inline * required
+          %span.help-inline * 必須
       .form-group
-        = f.label :username, class: 'control-label'
+        = f.label :username, 'ユーザ名', class: 'control-label'
         .col-sm-10
           = f.text_field :username, required: true, autocomplete: "off", class: 'form-control'
-          %span.help-inline * required
+          %span.help-inline * 必須
       .form-group
-        = f.label :email, class: 'control-label'
+        = f.label :email, 'メールアドレス', class: 'control-label'
         .col-sm-10
           = f.text_field :email, required: true, autocomplete: "off", class: 'form-control'
-          %span.help-inline * required
+          %span.help-inline * 必須
 
     - if @user.new_record?
       %fieldset
-        %legend Password
+        %legend パスワード
         .form-group
           = f.label :password, class: 'control-label'
           .col-sm-10
             %strong
-              A temporary password will be generated and sent to user.
+              一時的なパスワードが生成され、ユーザに送信されます。
               %br
-              User will be forced to change it after first sign in
+              ユーザは初回のサインイン時にパスワードを強制的に変更させられます。
     - else
       %fieldset
-        %legend Password
+        %legend パスワード
         .form-group
-          = f.label :password, class: 'control-label'
+          = f.label :password, 'パスワード', class: 'control-label'
           .col-sm-10= f.password_field :password, disabled: f.object.force_random_password, class: 'form-control'
         .form-group
-          = f.label :password_confirmation, class: 'control-label'
+          = f.label :password_confirmation, 'パスワード(確認)', class: 'control-label'
           .col-sm-10= f.password_field :password_confirmation, disabled: f.object.force_random_password, class: 'form-control'
 
     %fieldset
-      %legend Access
+      %legend アクセス
       .form-group
-        = f.label :projects_limit, class: 'control-label'
+        = f.label :projects_limit, 'プロジェクト数上限', class: 'control-label'
         .col-sm-10= f.number_field :projects_limit, class: 'form-control'
 
       .form-group
-        = f.label :can_create_group, class: 'control-label'
+        = f.label :can_create_group, 'グループ作成可能', class: 'control-label'
         .col-sm-10= f.check_box :can_create_group
 
       .form-group
-        = f.label :admin, class: 'control-label'
+        = f.label :admin, '管理者', class: 'control-label'
         - if current_user == @user
           .col-sm-10= f.check_box :admin, disabled: true
-          .col-sm-10 You cannot remove your own admin rights
+          .col-sm-10 あなた自身の管理者権限を削除することはできません。
         - else
           .col-sm-10= f.check_box :admin
       - unless @user.new_record? || current_user == @user
         .alert.alert-danger
           - if @user.blocked?
-            %p This user is blocked and is not able to login to GitLab
-            = link_to 'Unblock User', unblock_admin_user_path(@user), method: :put, class: "btn btn-small"
+            %p このユーザはブロックされており、GitLabにログインすることもできません。
+            = link_to 'ブロック解除', unblock_admin_user_path(@user), method: :put, class: "btn btn-small"
           - else
-            %p Blocked users will be removed from all projects &amp; will not be able to login to GitLab.
-            = link_to 'Block User', block_admin_user_path(@user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-small btn-remove"
+            %p ブロックされたユーザはすべてのプロジェクトから削除され、GitLabへのログインもできなくなります。
+            = link_to 'ユーザをブロック', block_admin_user_path(@user), data: {confirm: 'ユーザはブロックされます！本当にブロックしますか？'}, method: :put, class: "btn btn-small btn-remove"
     %fieldset
-      %legend Profile
+      %legend プロフィール
       .form-group
         = f.label :skype, class: 'control-label'
         .col-sm-10= f.text_field :skype, class: 'form-control'
@@ -81,13 +81,13 @@
         = f.label :twitter, class: 'control-label'
         .col-sm-10= f.text_field :twitter, class: 'form-control'
       .form-group
-        = f.label :website_url, 'Website', class: 'control-label'
+        = f.label :website_url, 'Webサイト', class: 'control-label'
         .col-sm-10= f.text_field :website_url, class: 'form-control'
 
     .form-actions
       - if @user.new_record?
-        = f.submit 'Create user', class: "btn btn-create"
-        = link_to 'Cancel', admin_users_path, class: "btn btn-cancel"
+        = f.submit 'ユーザを作成', class: "btn btn-create"
+        = link_to 'キャンセル', admin_users_path, class: "btn btn-cancel"
       - else
-        = f.submit 'Save changes', class: "btn btn-save"
-        = link_to 'Cancel', admin_user_path(@user), class: "btn btn-cancel"
+        = f.submit '変更を保存', class: "btn btn-save"
+        = link_to 'キャンセル', admin_user_path(@user), class: "btn btn-cancel"
diff -urN gitlab-rails.bk/app/views/admin/users/edit.html.haml gitlab-rails/app/views/admin/users/edit.html.haml
--- gitlab-rails.bk/app/views/admin/users/edit.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/admin/users/edit.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -1,6 +1,6 @@
 %h3.page-title
   #{@user.name} &rarr;
   %i.icon-edit
-  Edit user
+  ユーザを編集
 %hr
 = render 'form'
diff -urN gitlab-rails.bk/app/views/admin/users/index.html.haml gitlab-rails/app/views/admin/users/index.html.haml
--- gitlab-rails.bk/app/views/admin/users/index.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/admin/users/index.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -4,35 +4,35 @@
       %ul.nav.nav-pills.nav-stacked
         %li{class: "#{'active' unless params[:filter]}"}
           = link_to admin_users_path do
-            Active
+            アクティブ
             %small.pull-right= User.active.count
         %li{class: "#{'active' if params[:filter] == "admins"}"}
           = link_to admin_users_path(filter: "admins") do
-            Admins
+            管理者
             %small.pull-right= User.admins.count
         %li{class: "#{'active' if params[:filter] == "blocked"}"}
           = link_to admin_users_path(filter: "blocked") do
-            Blocked
+            ブロック中
             %small.pull-right= User.blocked.count
         %li{class: "#{'active' if params[:filter] == "wop"}"}
           = link_to admin_users_path(filter: "wop") do
-            Without projects
+            プロジェクトに所属しない
             %small.pull-right= User.without_projects.count
       %hr
       = form_tag admin_users_path, method: :get, class: 'form-inline' do
         .form-group
-          = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control'
+          = search_field_tag :name, params[:name], placeholder: '名前, メールアドレス, ユーザ名', class: 'form-control'
         = button_tag type: 'submit', class: 'btn btn-primary' do
           %i.icon-search
       %hr
-      = link_to 'Reset', admin_users_path, class: "btn btn-cancel"
+      = link_to 'リセット', admin_users_path, class: "btn btn-cancel"
 
   .col-md-9
     .ui-box
       .title
-        Users (#{@users.total_count})
+        ユーザ (#{@users.total_count})
         .pull-right
-          = link_to 'New User', new_admin_user_path, class: "btn btn-new"
+          = link_to '新しいユーザ', new_admin_user_path, class: "btn btn-new"
       %ul.well-list
         - @users.each do |user|
           %li
@@ -42,19 +42,19 @@
               %i.icon-user.cgreen
             = link_to user.name, [:admin, user]
             - if user.admin?
-              %strong.cred (Admin)
+              %strong.cred (管理者)
             - if user == current_user
-              %span.cred It's you!
+              %span.cred あなた
             .pull-right
               %span.light
                 %i.icon-envelope
                 = mail_to user.email, user.email, class: 'light'
               &nbsp;
-              = link_to 'Edit', edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: "btn btn-small"
+              = link_to '編集', edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: "btn btn-small"
               - unless user == current_user
                 - if user.blocked?
-                  = link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn btn-small success"
+                  = link_to 'ブロック解除', unblock_admin_user_path(user), method: :put, class: "btn btn-small success"
                 - else
-                  = link_to 'Block', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-small btn-remove"
-                = link_to 'Destroy', [:admin, user], data: { confirm: "USER #{user.name} WILL BE REMOVED! All tickets linked to this user will also be removed! Maybe block the user instead? Are you sure?" }, method: :delete, class: "btn btn-small btn-remove"
+                  = link_to 'ブロック', block_admin_user_path(user), data: {confirm: 'ユーザはブロックされます！よろしいですか？'}, method: :put, class: "btn btn-small btn-remove"
+                = link_to '削除', [:admin, user], data: { confirm: "ユーザ #{user.name} は削除されます！このユーザに関連するすべての課題も削除されます！削除する代わりにブロックした方が良いかもしれません。本当に削除しますか？" }, method: :delete, class: "btn btn-small btn-remove"
     = paginate @users, theme: "gitlab"
diff -urN gitlab-rails.bk/app/views/admin/users/new.html.haml gitlab-rails/app/views/admin/users/new.html.haml
--- gitlab-rails.bk/app/views/admin/users/new.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/admin/users/new.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -1,5 +1,5 @@
 %h3.page-title
   %i.icon-plus
-  New user
+  新しいユーザ
 %hr
 = render 'form'
diff -urN gitlab-rails.bk/app/views/admin/users/show.html.haml gitlab-rails/app/views/admin/users/show.html.haml
--- gitlab-rails.bk/app/views/admin/users/show.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/admin/users/show.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -1,66 +1,66 @@
 %h3.page-title
-  %span.cgray User:
+  %span.cgray ユーザ:
   = @user.name
   - if @user.blocked?
-    %span.cred (Blocked)
+    %span.cred (ブロック中)
   - if @user.admin
-    %span.cred (Admin)
+    %span.cred (管理者)
 
   .pull-right
     = link_to edit_admin_user_path(@user), class: "btn grouped" do
       %i.icon-edit
-      Edit
+      編集
 %hr
 
 .row
   .col-md-6
     .ui-box
       .title
-        Account:
+        アカウント:
         .pull-right
           = image_tag avatar_icon(@user.email, 32), class: "avatar s32"
       %ul.well-list
         %li
-          %span.light Name:
+          %span.light 名前:
           %strong= @user.name
         %li
-          %span.light Username:
+          %span.light ユーザ名:
           %strong
             = @user.username
         %li
-          %span.light Email:
+          %span.light メールアドレス:
           %strong
             = mail_to @user.email
         %li
-          %span.light Can create groups:
+          %span.light グループの作成:
           %strong
-            = @user.can_create_group ? "Yes" : "No"
+            = @user.can_create_group ? "可" : "不可"
         %li
-          %span.light Personal projects limit:
+          %span.light 個人のプロジェクト数の上限:
           %strong
             = @user.projects_limit
         %li
-          %span.light Member since:
+          %span.light 登録日:
           %strong
-            = @user.created_at.stamp("Nov 12, 2031")
+            = @user.created_at.stamp("2031/11/12")
         - if @user.confirmed_at
           %li
-            %span.light Confirmed at:
+            %span.light 登録確認日:
             %strong
-              = @user.confirmed_at.stamp("Nov 12, 2031")
+              = @user.confirmed_at.stamp("2031/11/12")
         - else
           %li
-            %span.light Confirmed:
+            %span.light 登録確認日:
             %strong.cred
-              No
+              未確認
 
         %li
-          %span.light Last sign-in at:
+          %span.light 最終サインイン:
           %strong
             - if @user.last_sign_in_at
-              = @user.last_sign_in_at.stamp("Nov 12, 2031")
+              = @user.last_sign_in_at.stamp("2031/11/12")
             - else
-              never
+              サインインなし
 
         - if @user.ldap_user?
           %li
@@ -70,56 +70,56 @@
 
         - if @user.created_by
           %li
-            %span.light Created by:
+            %span.light 登録者:
             %strong
               = link_to @user.created_by.name, [:admin, @user.created_by]
 
     - unless @user == current_user
       - if @user.blocked?
         .alert.alert-info
-          %h4 This user is blocked
-          %p Blocking user has the following effects:
+          %h4 このユーザをブロック
+          %p ユーザをブロックすると以下の影響があります。
           %ul
-            %li User will not be able to login
-            %li User will not be able to access git repositories
-            %li User will be removed from joined projects and groups
-            %li Personal projects will be left
-            %li Owned groups will be left
+            %li ユーザはログインできません。
+            %li ユーザはGitリポジトリにアクセスできません。
+            %li ユーザは参加中のプロジェクトとグループから削除されます。
+            %li ユーザ個人のプロジェクトから離脱します。
+            %li ユーザが所有するグループから離脱します。
           %br
-          = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-new", data: { confirm: 'Are you sure?' }
+          = link_to 'ブロック解除', unblock_admin_user_path(@user), method: :put, class: "btn btn-new", data: { confirm: 'Are you sure?' }
       - else
         .alert.alert-warning
-          %h4 Block this user
-          %p Blocking user has the following effects:
+          %h4 このユーザをブロック
+          %p ユーザをブロックすると以下の効果/影響があります。
           %ul
-            %li User will not be able to login
-            %li User will not be able to access git repositories
-            %li User will be removed from joined projects and groups
-            %li Personal projects will be left
-            %li Owned groups will be left
+            %li ユーザはログインできません。
+            %li ユーザはGitリポジトリにアクセスできません。
+            %li ユーザは参加中のプロジェクトとグループから削除されます。
+            %li ユーザ個人のプロジェクトから離脱します。
+            %li ユーザが所有するグループから離脱します。
           %br
-          = link_to 'Block user', block_admin_user_path(@user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put, class: "btn btn-remove"
+          = link_to 'このユーザをブロック', block_admin_user_path(@user), data: { confirm: 'このユーザはブロックされます！本当にブロックしますか？' }, method: :put, class: "btn btn-remove"
 
       .alert.alert-danger
         %h4
-          Remove user
-        %p Deleting a user has the following effects:
+          ユーザの削除
+        %p ユーザを削除すると以下の影響があります。
         %ul
-          %li All user content like authored issues, snippets, comments will be removed
+          %li このユーザが作成した課題, スニペット, コメントといったすべてのコンテンツが削除されます。
           - rp = @user.personal_projects.count
           - unless rp.zero?
-            %li #{pluralize rp, 'personal project'} will be removed and cannot be restored
+            %li #{rp}個の個人プロジェクトが削除され、復元できなくなります。
           - if @user.solo_owned_groups.present?
             %li
-              Next groups with all content will be removed:
+              以下のグループと、グループ内のすべてのコンテンツが削除されます。
               %strong #{@user.solo_owned_groups.map(&:name).join(', ')}
         %br
-        = link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove"
+        = link_to 'ユーザを削除', [:admin, @user], data: { confirm: "ユーザ #{@user.name} は削除されます！本当に削除しますか？" }, method: :delete, class: "btn btn-remove"
 
   .col-md-6
     - if @user.users_groups.present?
       .ui-box
-        .title Groups:
+        .title グループ:
         %ul.well-list
           - @user.users_groups.each do |user_group|
             - group = user_group.group
@@ -128,11 +128,11 @@
               .pull-right
                 %span.light= user_group.human_access
                 - unless user_group.owner?
-                  = link_to group_users_group_path(group, user_group), 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, user_group), data: { confirm: remove_user_from_group_message(group, @user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'グループからユーザを削除' do
                     %i.icon-remove.icon-white
 
     .ui-box
-      .title Projects (#{@projects.count})
+      .title プロジェクト (#{@projects.count})
       %ul.well-list
         - @projects.sort_by(&:name_with_namespace).each do |project|
           - tm = project.team.find_tm(@user.id)
@@ -148,5 +148,5 @@
                   %span.light= tm.human_access
 
                   - if tm.respond_to? :project
-                    = link_to project_team_member_path(project, @user), data: { confirm: remove_from_project_team_message(project, @user) }, remote: true, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from project' do
+                    = link_to project_team_member_path(project, @user), data: { confirm: remove_from_project_team_message(project, @user) }, remote: true, method: :delete, class: "btn-tiny btn btn-remove", title: 'プロジェクトからユーザを削除' do
                       %i.icon-remove
diff -urN gitlab-rails.bk/app/views/dashboard/_activities.html.haml gitlab-rails/app/views/dashboard/_activities.html.haml
--- gitlab-rails.bk/app/views/dashboard/_activities.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/dashboard/_activities.html.haml	2014-03-22 09:00:00.000000000 +0900
