diff --git a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RhodeCode 1.2.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-11-27 20:56+0100\n"
+"POT-Creation-Date: 2012-12-03 03:21+0100\n"
 "PO-Revision-Date: 2012-10-27 15:06+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ja <LL@li.org>\n"
@@ -43,7 +43,7 @@ msgstr ""
 #: rhodecode/controllers/pullrequests.py:411
 #, fuzzy, python-format
 msgid "Status change -> %s"
-msgstr "最後の変更時刻"
+msgstr ""
 
 #: rhodecode/controllers/changeset.py:346
 msgid ""
@@ -53,6 +53,7 @@ msgstr ""
 
 #: rhodecode/controllers/compare.py:75
 #: rhodecode/controllers/pullrequests.py:117
+#: rhodecode/controllers/shortlog.py:100
 msgid "There are no changesets yet"
 msgstr "まだ変更がありません"
 
@@ -184,7 +185,7 @@ msgstr "ブランチ"
 msgid "Tags"
 msgstr "タグ"
 
-#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91
+#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:92
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -274,19 +275,19 @@ msgid "An error occurred during this sea
 msgstr "検索を実行する際にエラーがおきました"
 
 #: rhodecode/controllers/settings.py:108
-#: rhodecode/controllers/admin/repos.py:267
+#: rhodecode/controllers/admin/repos.py:268
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "リポジトリ %s の更新に成功しました"
 
 #: rhodecode/controllers/settings.py:126
-#: rhodecode/controllers/admin/repos.py:285
+#: rhodecode/controllers/admin/repos.py:286
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr "リポジトリ %s の更新中にエラーが発生しました"
 
 #: rhodecode/controllers/settings.py:144
-#: rhodecode/controllers/admin/repos.py:303
+#: rhodecode/controllers/admin/repos.py:304
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from "
@@ -297,14 +298,14 @@ msgstr ""
 "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。"
 
 #: rhodecode/controllers/settings.py:156
-#: rhodecode/controllers/admin/repos.py:315
+#: rhodecode/controllers/admin/repos.py:316
 #, python-format
 msgid "deleted repository %s"
 msgstr "リポジトリ %s を削除しました"
 
 #: rhodecode/controllers/settings.py:160
-#: rhodecode/controllers/admin/repos.py:325
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/admin/repos.py:326
+#: rhodecode/controllers/admin/repos.py:332
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "リポジトリ %s の削除中にエラーが発生しました"
@@ -322,10 +323,10 @@ msgstr "変更可能にする"
 #: rhodecode/controllers/settings.py:184
 #, fuzzy, python-format
 msgid "Repository has been %s"
-msgstr "リポジトリ %s を %s としてフォーク"
+msgstr ""
 
 #: rhodecode/controllers/settings.py:188
-#: rhodecode/controllers/admin/repos.py:423
+#: rhodecode/controllers/admin/repos.py:424
 msgid "An error occurred during unlocking"
 msgstr "アンロック時にエラーが発生しました"
 
@@ -338,6 +339,16 @@ msgstr "まだデータが読み込まれていません"
 msgid "Statistics are disabled for this repository"
 msgstr "このリポジトリの統計は無効化されています"
 
+#: rhodecode/controllers/admin/defaults.py:96
+#, fuzzy
+msgid "Default settings updated successfully"
+msgstr "LDAP設定を更新しました"
+
+#: rhodecode/controllers/admin/defaults.py:110
+#, fuzzy
+msgid "error occurred during update of defaults"
+msgstr "ユーザー %s の更新中にエラーが発生しました"
+
 #: rhodecode/controllers/admin/ldap_settings.py:50
 msgid "BASE"
 msgstr "BASE"
@@ -395,18 +406,23 @@ msgid "error occurred during update of l
 msgstr "LDAP設定の更新中にエラーが発生しました"
 
 #: rhodecode/controllers/admin/permissions.py:59
+#: rhodecode/controllers/admin/permissions.py:63
 msgid "None"
 msgstr "なし"
 
 #: rhodecode/controllers/admin/permissions.py:60
+#: rhodecode/controllers/admin/permissions.py:64
 msgid "Read"
 msgstr "読込"
 
 #: rhodecode/controllers/admin/permissions.py:61
+#: rhodecode/controllers/admin/permissions.py:65
 msgid "Write"
 msgstr "書込"
 
 #: rhodecode/controllers/admin/permissions.py:62
+#: rhodecode/controllers/admin/permissions.py:66
+#: rhodecode/templates/admin/defaults/defaults.html:9
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
 #: rhodecode/templates/admin/repos/repo_add.html:9
@@ -425,112 +441,112 @@ msgstr "書込"
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
 #: rhodecode/templates/base/base.html:197
-#: rhodecode/templates/base/base.html:349
-#: rhodecode/templates/base/base.html:351
-#: rhodecode/templates/base/base.html:353
+#: rhodecode/templates/base/base.html:350
+#: rhodecode/templates/base/base.html:352
+#: rhodecode/templates/base/base.html:354
 msgid "Admin"
 msgstr "管理"
 
-#: rhodecode/controllers/admin/permissions.py:65
+#: rhodecode/controllers/admin/permissions.py:69
 msgid "disabled"
 msgstr "無効にする"
 
-#: rhodecode/controllers/admin/permissions.py:67
-msgid "allowed with manual account activation"
-msgstr "手動でアカウントを有効にする"
-
-#: rhodecode/controllers/admin/permissions.py:69
-msgid "allowed with automatic account activation"
-msgstr "自動でアカウントを有効にする"
-
 #: rhodecode/controllers/admin/permissions.py:71
-#: rhodecode/controllers/admin/permissions.py:74
+msgid "allowed with manual account activation"
+msgstr "手動でアカウントを有効にする"
+
+#: rhodecode/controllers/admin/permissions.py:73
+msgid "allowed with automatic account activation"
+msgstr "自動でアカウントを有効にする"
+
+#: rhodecode/controllers/admin/permissions.py:75
+#: rhodecode/controllers/admin/permissions.py:78
 msgid "Disabled"
 msgstr "無効"
 
-#: rhodecode/controllers/admin/permissions.py:72
-#: rhodecode/controllers/admin/permissions.py:75
+#: rhodecode/controllers/admin/permissions.py:76
+#: rhodecode/controllers/admin/permissions.py:79
 msgid "Enabled"
 msgstr "有効"
 
-#: rhodecode/controllers/admin/permissions.py:116
+#: rhodecode/controllers/admin/permissions.py:122
 msgid "Default permissions updated successfully"
 msgstr "デフォルトの権限を更新しました"
 
-#: rhodecode/controllers/admin/permissions.py:130
+#: rhodecode/controllers/admin/permissions.py:136
 msgid "error occurred during update of permissions"
 msgstr "権限の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:124
+#: rhodecode/controllers/admin/repos.py:125
 msgid "--REMOVE FORK--"
 msgstr "--フォーク元を削除--"
 
-#: rhodecode/controllers/admin/repos.py:193
+#: rhodecode/controllers/admin/repos.py:194
 #, python-format
 msgid "created repository %s from %s"
 msgstr "リポジトリ %s を %s から作成"
 
-#: rhodecode/controllers/admin/repos.py:197
+#: rhodecode/controllers/admin/repos.py:198
 #, python-format
 msgid "created repository %s"
 msgstr "リポジトリ %s を作成しました"
 
-#: rhodecode/controllers/admin/repos.py:228
+#: rhodecode/controllers/admin/repos.py:229
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr "リポジトリ %s を作成中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:320
+#: rhodecode/controllers/admin/repos.py:321
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:349
+#: rhodecode/controllers/admin/repos.py:350
 msgid "An error occurred during deletion of repository user"
 msgstr "リポジトリユーザーの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:368
+#: rhodecode/controllers/admin/repos.py:369
 msgid "An error occurred during deletion of repository users groups"
 msgstr "リポジトリユーザーグループの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:386
+#: rhodecode/controllers/admin/repos.py:387
 msgid "An error occurred during deletion of repository stats"
 msgstr "リポジトリステートの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:403
+#: rhodecode/controllers/admin/repos.py:404
 msgid "An error occurred during cache invalidation"
 msgstr "キャッシュの無効化時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:443
+#: rhodecode/controllers/admin/repos.py:444
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:447
+#: rhodecode/controllers/admin/repos.py:448
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300
+#: rhodecode/controllers/admin/repos.py:453 rhodecode/model/validators.py:300
 msgid "Token mismatch"
 msgstr "トークンが合いません"
 
-#: rhodecode/controllers/admin/repos.py:465
+#: rhodecode/controllers/admin/repos.py:466
 msgid "Pulled from remote location"
 msgstr "リモートから取得"
 
-#: rhodecode/controllers/admin/repos.py:467
+#: rhodecode/controllers/admin/repos.py:468
 msgid "An error occurred during pull from remote location"
 msgstr "リモートから取得中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:483
+#: rhodecode/controllers/admin/repos.py:484
 msgid "Nothing"
 msgstr "ありません"
 
-#: rhodecode/controllers/admin/repos.py:485
+#: rhodecode/controllers/admin/repos.py:486
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "%s リポジトリを %s のフォークとして印をつける"
 
-#: rhodecode/controllers/admin/repos.py:489
+#: rhodecode/controllers/admin/repos.py:490
 msgid "An error occurred during this operation"
 msgstr "操作中にエラーが発生しました"
 
@@ -818,7 +834,7 @@ msgstr "リビジョン"
 #: rhodecode/lib/helpers.py:640
 #, fuzzy, python-format
 msgid "fork name %s"
-msgstr "フォーク名 "
+msgstr ""
 
 #: rhodecode/lib/helpers.py:653
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
@@ -976,6 +992,86 @@ msgstr "ちょうどいま"
 msgid "password reset link"
 msgstr "パスワードリセットのリンク"
 
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180
+msgid "Repository no access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181
+msgid "Repository read access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182
+msgid "Repository write access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183
+msgid "Repository admin access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185
+msgid "Repositories Group no access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186
+msgid "Repositories Group read access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187
+msgid "Repositories Group write access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188
+msgid "Repositories Group admin access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190
+msgid "RhodeCode Administrator"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191
+msgid "Repository creation disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192
+msgid "Repository creation enabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193
+msgid "Repository forking disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194
+msgid "Repository forking enabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195
+msgid "Register disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1196
+msgid "Register new user with RhodeCode with manual activation"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1199
+msgid "Register new user with RhodeCode with auto activation"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1640
+msgid "Not Reviewed"
+msgstr "未レビュー"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641
+msgid "Approved"
+msgstr "承認"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642
+msgid "Rejected"
+msgstr "却下"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643
+msgid "Under Review"
+msgstr "レビュー中"
+
 #: rhodecode/model/comment.py:110
 #, python-format
 msgid "on line %s"
@@ -985,86 +1081,6 @@ msgstr ""
 msgid "[Mention]"
 msgstr "[Mention]"
 
-#: rhodecode/model/db.py:1163
-msgid "Repository no access"
-msgstr ""
-
-#: rhodecode/model/db.py:1164
-msgid "Repository read access"
-msgstr ""
-
-#: rhodecode/model/db.py:1165
-msgid "Repository write access"
-msgstr ""
-
-#: rhodecode/model/db.py:1166
-msgid "Repository admin access"
-msgstr ""
-
-#: rhodecode/model/db.py:1168
-msgid "Repositories Group no access"
-msgstr ""
-
-#: rhodecode/model/db.py:1169
-msgid "Repositories Group read access"
-msgstr ""
-
-#: rhodecode/model/db.py:1170
-msgid "Repositories Group write access"
-msgstr ""
-
-#: rhodecode/model/db.py:1171
-msgid "Repositories Group admin access"
-msgstr ""
-
-#: rhodecode/model/db.py:1173
-msgid "RhodeCode Administrator"
-msgstr ""
-
-#: rhodecode/model/db.py:1174
-msgid "Repository creation disabled"
-msgstr ""
-
-#: rhodecode/model/db.py:1175
-msgid "Repository creation enabled"
-msgstr ""
-
-#: rhodecode/model/db.py:1176
-msgid "Repository forking disabled"
-msgstr ""
-
-#: rhodecode/model/db.py:1177
-msgid "Repository forking enabled"
-msgstr ""
-
-#: rhodecode/model/db.py:1178
-msgid "Register disabled"
-msgstr ""
-
-#: rhodecode/model/db.py:1179
-msgid "Register new user with RhodeCode with manual activation"
-msgstr ""
-
-#: rhodecode/model/db.py:1182
-msgid "Register new user with RhodeCode with auto activation"
-msgstr ""
-
-#: rhodecode/model/db.py:1623
-msgid "Not Reviewed"
-msgstr "未レビュー"
-
-#: rhodecode/model/db.py:1624
-msgid "Approved"
-msgstr "承認"
-
-#: rhodecode/model/db.py:1625
-msgid "Rejected"
-msgstr "却下"
-
-#: rhodecode/model/db.py:1626
-msgid "Under Review"
-msgstr "レビュー中"
-
 #: rhodecode/model/forms.py:43
 msgid "Please enter a login"
 msgstr "ログイン名を入力してください"
@@ -1086,7 +1102,7 @@ msgstr "%(min)i 文字以上必要です"
 #: rhodecode/model/notification.py:220
 #, fuzzy, python-format
 msgid "commented on commit at %(when)s"
-msgstr "コミットに対するコメント"
+msgstr ""
 
 #: rhodecode/model/notification.py:221
 #, python-format
@@ -1106,12 +1122,12 @@ msgstr ""
 #: rhodecode/model/notification.py:224
 #, fuzzy, python-format
 msgid "opened new pull request at %(when)s"
-msgstr "新しいプルリクエストを作成"
+msgstr ""
 
 #: rhodecode/model/notification.py:225
 #, fuzzy, python-format
 msgid "commented on pull request at %(when)s"
-msgstr "プルリクエストに[コメント]"
+msgstr ""
 
 #: rhodecode/model/pull_request.py:90
 #, python-format
@@ -1568,6 +1584,7 @@ msgid "Your account must wait for activa
 msgstr "アカウントは管理者のアクティベーションを待つ必要があります"
 
 #: rhodecode/templates/repo_switcher_list.html:11
+#: rhodecode/templates/admin/defaults/defaults.html:44
 #: rhodecode/templates/admin/repos/repo_add_base.html:65
 #: rhodecode/templates/admin/repos/repo_edit.html:85
 #: rhodecode/templates/settings/repo_settings.html:76
@@ -1624,6 +1641,7 @@ msgid "Action"
 msgstr "アクション"
 
 #: rhodecode/templates/admin/admin_log.html:7
+#: rhodecode/templates/admin/permissions/permissions.html:41
 msgid "Repository"
 msgstr "リポジトリ"
 
@@ -1645,6 +1663,77 @@ msgstr "アクセス元IPアドレス"
 msgid "No actions yet"
 msgstr "まだアクションがありません"
 
+#: rhodecode/templates/admin/defaults/defaults.html:5
+#: rhodecode/templates/admin/defaults/defaults.html:25
+#, fuzzy
+msgid "Repositories defaults"
+msgstr "リポジトリグループ"
+
+#: rhodecode/templates/admin/defaults/defaults.html:11
+#, fuzzy
+msgid "Defaults"
+msgstr "default"
+
+#: rhodecode/templates/admin/defaults/defaults.html:35
+#: rhodecode/templates/admin/repos/repo_add_base.html:38
+#: rhodecode/templates/admin/repos/repo_edit.html:58
+msgid "Type"
+msgstr "リポジトリのタイプ"
+
+#: rhodecode/templates/admin/defaults/defaults.html:48
+#: rhodecode/templates/admin/repos/repo_add_base.html:69
+#: rhodecode/templates/admin/repos/repo_edit.html:89
+#: rhodecode/templates/forks/fork.html:72
+#: rhodecode/templates/settings/repo_settings.html:80
+msgid ""
+"Private repositories are only visible to people explicitly added as "
+"collaborators."
+msgstr "非公開リポジトリはコラボレーターとして明示的に追加された人でないと見つけられません"
+
+#: rhodecode/templates/admin/defaults/defaults.html:55
+#: rhodecode/templates/admin/repos/repo_edit.html:94
+msgid "Enable statistics"
+msgstr "統計を有効にする"
+
+#: rhodecode/templates/admin/defaults/defaults.html:59
+#: rhodecode/templates/admin/repos/repo_edit.html:98
+msgid "Enable statistics window on summary page."
+msgstr "概要ページの統計ウィンドウを有効にします"
+
+#: rhodecode/templates/admin/defaults/defaults.html:65
+#: rhodecode/templates/admin/repos/repo_edit.html:103
+msgid "Enable downloads"
+msgstr "ダウンロードを有効にする"
+
+#: rhodecode/templates/admin/defaults/defaults.html:69
+#: rhodecode/templates/admin/repos/repo_edit.html:107
+msgid "Enable download menu on summary page."
+msgstr "概要ページのダウンロードメニューを有効にします"
+
+#: rhodecode/templates/admin/defaults/defaults.html:75
+#: rhodecode/templates/admin/repos/repo_edit.html:112
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+msgid "Enable locking"
+msgstr "ロックを有効にする"
+
+#: rhodecode/templates/admin/defaults/defaults.html:79
+#: rhodecode/templates/admin/repos/repo_edit.html:116
+msgid "Enable lock-by-pulling on repository."
+msgstr ""
+
+#: rhodecode/templates/admin/defaults/defaults.html:84
+#: rhodecode/templates/admin/ldap/ldap.html:89
+#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
+#: rhodecode/templates/admin/settings/hooks.html:73
+#: rhodecode/templates/admin/users/user_edit.html:133
+#: rhodecode/templates/admin/users/user_edit.html:178
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:135
+#: rhodecode/templates/settings/repo_settings.html:93
+msgid "Save"
+msgstr "保存"
+
 #: rhodecode/templates/admin/ldap/ldap.html:5
 msgid "LDAP administration"
 msgstr "LDAP管理"
@@ -1717,18 +1806,6 @@ msgstr "名字(Last Name)属性"
 msgid "E-mail Attribute"
 msgstr "メールアドレス属性"
 
-#: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
-#: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_edit.html:133
-#: rhodecode/templates/admin/users/user_edit.html:178
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:135
-#: rhodecode/templates/settings/repo_settings.html:93
-msgid "Save"
-msgstr "保存"
-
 #: rhodecode/templates/admin/notifications/notifications.html:5
 #: rhodecode/templates/admin/notifications/notifications.html:9
 msgid "My Notifications"
@@ -1743,8 +1820,8 @@ msgid "Comments"
 msgstr "コメント"
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:266
-#: rhodecode/templates/base/base.html:268
+#: rhodecode/templates/base/base.html:267
+#: rhodecode/templates/base/base.html:269
 msgid "Pull requests"
 msgstr "プルリクエスト"
 
@@ -1786,10 +1863,6 @@ msgstr "デフォルトの権限"
 msgid "Anonymous access"
 msgstr "匿名アクセス"
 
-#: rhodecode/templates/admin/permissions/permissions.html:41
-msgid "Repository permission"
-msgstr "リポジトリの権限"
-
 #: rhodecode/templates/admin/permissions/permissions.html:49
 msgid ""
 "All default permissions on each repository will be reset to choosen "
@@ -1798,22 +1871,39 @@ msgid ""
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:50
+#: rhodecode/templates/admin/permissions/permissions.html:63
 msgid "overwrite existing settings"
 msgstr "現在の設定を上書きする"
 
 #: rhodecode/templates/admin/permissions/permissions.html:55
+#: rhodecode/templates/admin/repos/repo_add_base.html:29
+#: rhodecode/templates/admin/repos/repo_edit.html:49
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
+#: rhodecode/templates/forks/fork.html:50
+#: rhodecode/templates/settings/repo_settings.html:48
+msgid "Repository group"
+msgstr "リポジトリグループ"
+
+#: rhodecode/templates/admin/permissions/permissions.html:62
+msgid ""
+"All default permissions on each repository group will be reset to choosen"
+" permission, note that all custom default permission on repositories "
+"group will be lost"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:69
 msgid "Registration"
 msgstr "登録"
 
-#: rhodecode/templates/admin/permissions/permissions.html:63
+#: rhodecode/templates/admin/permissions/permissions.html:77
 msgid "Repository creation"
 msgstr "リポジトリ作成"
 
-#: rhodecode/templates/admin/permissions/permissions.html:71
+#: rhodecode/templates/admin/permissions/permissions.html:85
 msgid "Repository forking"
 msgstr "リポジトリフォーク"
 
-#: rhodecode/templates/admin/permissions/permissions.html:78
+#: rhodecode/templates/admin/permissions/permissions.html:92
 #: rhodecode/templates/admin/repos/repo_edit.html:264
 msgid "set"
 msgstr "保存"
@@ -1845,24 +1935,11 @@ msgstr "クローン元"
 msgid "Optional http[s] url from which repository should be cloned."
 msgstr "オプション：クローンするリポジトリのHTTP[S]のURLを指定します"
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:29
-#: rhodecode/templates/admin/repos/repo_edit.html:49
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
-#: rhodecode/templates/forks/fork.html:50
-#: rhodecode/templates/settings/repo_settings.html:48
-msgid "Repository group"
-msgstr "リポジトリグループ"
-
 #: rhodecode/templates/admin/repos/repo_add_base.html:33
 #: rhodecode/templates/forks/fork.html:54
 msgid "Optionaly select a group to put this repository into."
 msgstr "オプション：このリポジトリが属するグループを選択します"
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:38
-#: rhodecode/templates/admin/repos/repo_edit.html:58
-msgid "Type"
-msgstr "リポジトリのタイプ"
-
 #: rhodecode/templates/admin/repos/repo_add_base.html:42
 msgid "Type of repository to create."
 msgstr "作成するリポジトリのタイプを指定します"
@@ -1888,15 +1965,6 @@ msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します"
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。"
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:89
-#: rhodecode/templates/forks/fork.html:72
-#: rhodecode/templates/settings/repo_settings.html:80
-msgid ""
-"Private repositories are only visible to people explicitly added as "
-"collaborators."
-msgstr "非公開リポジトリはコラボレーターとして明示的に追加された人でないと見つけられません"
-
 #: rhodecode/templates/admin/repos/repo_add_base.html:73
 msgid "add"
 msgstr "追加"
@@ -1932,31 +2000,6 @@ msgstr "クローンURI"
 msgid "Optional select a group to put this repository into."
 msgstr "オプション: このリポジトリを配置するグループを選択します"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:94
-msgid "Enable statistics"
-msgstr "統計を有効にする"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:98
-msgid "Enable statistics window on summary page."
-msgstr "概要ページの統計ウィンドウを有効にします"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:103
-msgid "Enable downloads"
-msgstr "ダウンロードを有効にする"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:107
-msgid "Enable download menu on summary page."
-msgstr "概要ページのダウンロードメニューを有効にします"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:112
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
-msgid "Enable locking"
-msgstr "ロックを有効にする"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:116
-msgid "Enable lock-by-pulling on repository."
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:126
 msgid "Change owner of this repository."
 msgstr "リポジトリの所有者を変更"
@@ -2054,9 +2097,9 @@ msgid "Active"
 msgstr "アクティブ"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:218
-#: rhodecode/templates/base/base.html:330
-#: rhodecode/templates/base/base.html:332
-#: rhodecode/templates/base/base.html:334
+#: rhodecode/templates/base/base.html:331
+#: rhodecode/templates/base/base.html:333
+#: rhodecode/templates/base/base.html:335
 msgid "Public journal"
 msgstr "公開ジャーナル"
 
@@ -2211,9 +2254,9 @@ msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:9
 #: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:312
-#: rhodecode/templates/base/base.html:314
-#: rhodecode/templates/base/base.html:316
+#: rhodecode/templates/base/base.html:313
+#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:317
 #: rhodecode/templates/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
@@ -2310,7 +2353,7 @@ msgstr "削除"
 #, fuzzy, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
-msgstr[0] "このリポジトリを削除しますか？"
+msgstr[0] ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63
 msgid "There are no repositories groups yet"
@@ -2877,9 +2920,9 @@ msgid "Inbox"
 msgstr "受信箱"
 
 #: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:321
-#: rhodecode/templates/base/base.html:323
-#: rhodecode/templates/base/base.html:325
+#: rhodecode/templates/base/base.html:322
+#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:326
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
@@ -2986,22 +3029,27 @@ msgid "permissions"
 msgstr "権限"
 
 #: rhodecode/templates/base/base.html:239
+#, fuzzy
+msgid "defaults"
+msgstr "default"
+
+#: rhodecode/templates/base/base.html:240
 msgid "settings"
 msgstr "設定"
 
-#: rhodecode/templates/base/base.html:250
-#: rhodecode/templates/base/base.html:252
+#: rhodecode/templates/base/base.html:251
+#: rhodecode/templates/base/base.html:253
 msgid "Followers"
 msgstr "フォロワー"
 
-#: rhodecode/templates/base/base.html:258
-#: rhodecode/templates/base/base.html:260
+#: rhodecode/templates/base/base.html:259
+#: rhodecode/templates/base/base.html:261
 msgid "Forks"
 msgstr "フォーク"
 
-#: rhodecode/templates/base/base.html:339
-#: rhodecode/templates/base/base.html:341
-#: rhodecode/templates/base/base.html:343
+#: rhodecode/templates/base/base.html:340
+#: rhodecode/templates/base/base.html:342
+#: rhodecode/templates/base/base.html:344
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "検索"
@@ -3240,7 +3288,7 @@ msgstr[0] "(%d インライン)"
 #, fuzzy, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
-msgstr[0] "変更されたファイル"
+msgstr[0] ""
 
 #: rhodecode/templates/changeset/changeset.html:113
 #: rhodecode/templates/compare/compare_diff.html:46
@@ -3339,7 +3387,7 @@ msgstr "チェンジセットはありません"
 #, fuzzy, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
-msgstr[0] "インラインコメントを表示"
+msgstr[0] ""
 
 #: rhodecode/templates/compare/compare_diff.html:52
 #: rhodecode/templates/pullrequests/pullrequest_show.html:84
@@ -3398,11 +3446,81 @@ msgstr "%s の ATOM フィードを購読"
 msgid "Confirm to delete this user: %s"
 msgstr "このユーザーを本当に削除してよろしいですか？: %s"
 
+#: rhodecode/templates/email_templates/changeset_comment.html:10
+#, fuzzy
+msgid "New status$"
+msgstr "ステータスを変更する"
+
 #: rhodecode/templates/email_templates/main.html:8
 #, fuzzy
 msgid "This is a notification from RhodeCode."
 msgstr "RhodeCodeからの通知があります"
 
+#: rhodecode/templates/email_templates/password_reset.html:4
+msgid "Hello"
+msgstr ""
+
+#: rhodecode/templates/email_templates/password_reset.html:6
+msgid "We received a request to create a new password for your account."
+msgstr ""
+
+#: rhodecode/templates/email_templates/password_reset.html:8
+msgid "You can generate it by clicking following URL"
+msgstr ""
+
+#: rhodecode/templates/email_templates/password_reset.html:12
+msgid "If you didn't request new password please ignore this email."
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request.html:4
+#, python-format
+msgid ""
+"User %s opened pull request for repository %s and wants you to review "
+"changes."
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request.html:5
+#, fuzzy
+msgid "title"
+msgstr "タイトル"
+
+#: rhodecode/templates/email_templates/pull_request.html:6
+#: rhodecode/templates/pullrequests/pullrequest.html:115
+msgid "description"
+msgstr "説明"
+
+#: rhodecode/templates/email_templates/pull_request.html:11
+msgid "revisions for reviewing"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request.html:18
+#, fuzzy
+msgid "View this pull request here"
+msgstr "このプルリクエストにレビュアーを追加"
+
+#: rhodecode/templates/email_templates/pull_request_comment.html:4
+#, fuzzy, python-format
+msgid "User %s commented on pull request #%s for repository %s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.html:10
+#, fuzzy
+msgid "New status"
+msgstr "ステータスを変更する"
+
+#: rhodecode/templates/email_templates/pull_request_comment.html:14
+msgid "View this comment here"
+msgstr ""
+
+#: rhodecode/templates/email_templates/registration.html:4
+#, fuzzy
+msgid "A new user have registered in RhodeCode"
+msgstr "rhodecodeへの登録を受け付けました"
+
+#: rhodecode/templates/email_templates/registration.html:9
+msgid "View this user here"
+msgstr ""
+
 #: rhodecode/templates/errors/error_document.html:46
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
@@ -3502,7 +3620,7 @@ msgid "search file list"
 msgstr "ファイル一覧を検索"
 
 #: rhodecode/templates/files/files_browser.html:31
-#: rhodecode/templates/shortlog/shortlog_data.html:80
+#: rhodecode/templates/shortlog/shortlog_data.html:78
 msgid "add new file"
 msgstr "新しいファイルを追加"
 
@@ -3570,7 +3688,12 @@ msgstr "このリビジョンの差分を見る"
 msgid "show at revision"
 msgstr "このリビジョンを見る"
 
-#: rhodecode/templates/files/files_history_box.html:15
+#: rhodecode/templates/files/files_history_box.html:11
+#, fuzzy
+msgid "show full history"
+msgstr "ファイル一覧を読み込み中..."
+
+#: rhodecode/templates/files/files_history_box.html:16
 #, python-format
 msgid "%s author"
 msgid_plural "%s authors"
@@ -3766,10 +3889,6 @@ msgstr "新しいプルリクエストを作成"
 msgid "Title"
 msgstr "タイトル"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:115
-msgid "description"
-msgstr "説明"
-
 #: rhodecode/templates/pullrequests/pullrequest.html:123
 msgid "Send pull request"
 msgstr "プルリクエストを送る"
@@ -3884,7 +4003,8 @@ msgstr "%s 設定"
 msgid "%s Shortlog"
 msgstr "%s 短いログ"
 
-#: rhodecode/templates/shortlog/shortlog.html:14
+#: rhodecode/templates/shortlog/shortlog.html:15
+#: rhodecode/templates/shortlog/shortlog.html:19
 msgid "shortlog"
 msgstr "ログ"
 
@@ -3900,19 +4020,15 @@ msgstr "経過時間"
 msgid "author"
 msgstr "作成者"
 
-#: rhodecode/templates/shortlog/shortlog_data.html:33
-msgid "No commit message"
-msgstr "コミットメッセージが有りません"
-
-#: rhodecode/templates/shortlog/shortlog_data.html:77
+#: rhodecode/templates/shortlog/shortlog_data.html:75
 msgid "Add or upload files directly via RhodeCode"
 msgstr "RhodeCode経由で直接ファイルを追加またはアップロード"
 
-#: rhodecode/templates/shortlog/shortlog_data.html:86
+#: rhodecode/templates/shortlog/shortlog_data.html:84
 msgid "Push new repo"
 msgstr "新しいリポジトリをプッシュ"
 
-#: rhodecode/templates/shortlog/shortlog_data.html:94
+#: rhodecode/templates/shortlog/shortlog_data.html:92
 msgid "Existing repository?"
 msgstr "存在するリポジトリをプッシュ"
 
@@ -3943,7 +4059,7 @@ msgstr "ATOM"
 #: rhodecode/templates/summary/summary.html:70
 #, fuzzy, python-format
 msgid "Repository locked by %s"
-msgstr "リポジトリはロックされていません"
+msgstr ""
 
 #: rhodecode/templates/summary/summary.html:72
 #, fuzzy