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-12-14 04:19+0100\n"
+"POT-Creation-Date: 2013-01-28 00:24+0100\n"
 "PO-Revision-Date: 2013-01-02 01:39+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ja <LL@li.org>\n"
@@ -39,15 +39,15 @@ msgstr "空白を無視"
 msgid "%s line context"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:314
-#: rhodecode/controllers/pullrequests.py:417
+#: rhodecode/controllers/changeset.py:329
+#: rhodecode/controllers/pullrequests.py:416
 #, python-format
 msgid "Status change -> %s"
 msgstr "ステータス変更 -> %s"
 
-#: rhodecode/controllers/changeset.py:345
+#: rhodecode/controllers/changeset.py:360
 msgid ""
-"Changing status on a changeset associated witha closed pull request is "
+"Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr ""
 
@@ -98,8 +98,8 @@ msgstr "%s %s フィード"
 #: rhodecode/templates/changeset/changeset.html:149
 #: rhodecode/templates/compare/compare_diff.html:62
 #: rhodecode/templates/compare/compare_diff.html:73
-#: rhodecode/templates/pullrequests/pullrequest_show.html:94
-#: rhodecode/templates/pullrequests/pullrequest_show.html:153
+#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:171
 msgid "Changeset was too big and was cut off..."
 msgstr "チェンジセットが大きすぎるため、省略しました"
 
@@ -116,110 +116,114 @@ msgstr "新しいファイルを追加"
 msgid "There are no files yet %s"
 msgstr "まだファイルがありません %s"
 
-#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325
+#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr "このリポジトリは %s によって %s にロックされました"
 
-#: rhodecode/controllers/files.py:292
-#, python-format
-msgid "Edited %s via RhodeCode"
+#: rhodecode/controllers/files.py:281
+msgid "You can only edit files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:295
+#, fuzzy, python-format
+msgid "Edited file %s via RhodeCode"
 msgstr "RhodeCode経由で %s を変更"
 
-#: rhodecode/controllers/files.py:297
+#: rhodecode/controllers/files.py:311
 msgid "No changes"
 msgstr "変更点なし"
 
-#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372
+#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "%s へのコミットが成功しました"
 
-#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378
+#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390
 msgid "Error occurred during commit"
 msgstr "コミット中にエラーが発生しました"
 
-#: rhodecode/controllers/files.py:344
-#, python-format
-msgid "Added %s via RhodeCode"
+#: rhodecode/controllers/files.py:350
+#, fuzzy
+msgid "Added file via RhodeCode"
 msgstr "RhodeCode経由で %s を追加"
 
-#: rhodecode/controllers/files.py:358
+#: rhodecode/controllers/files.py:370
 msgid "No content"
 msgstr "内容がありません"
 
-#: rhodecode/controllers/files.py:362
+#: rhodecode/controllers/files.py:374
 msgid "No filename"
 msgstr "ファイル名がありません"
 
-#: rhodecode/controllers/files.py:404
+#: rhodecode/controllers/files.py:416
 msgid "downloads disabled"
 msgstr "ダウンロードは無効化されています"
 
-#: rhodecode/controllers/files.py:415
+#: rhodecode/controllers/files.py:427
 #, python-format
 msgid "Unknown revision %s"
 msgstr "%s は未知のリビジョンです"
 
-#: rhodecode/controllers/files.py:417
+#: rhodecode/controllers/files.py:429
 msgid "Empty repository"
 msgstr "空のリポジトリ"
 
-#: rhodecode/controllers/files.py:419
+#: rhodecode/controllers/files.py:431
 msgid "Unknown archive type"
 msgstr "未知のアーカイブ種別です"
 
-#: rhodecode/controllers/files.py:564
+#: rhodecode/controllers/files.py:576
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "チェンジセット"
 
-#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550
+#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74
+#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564
 msgid "Branches"
 msgstr "ブランチ"
 
-#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78
-#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561
+#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78
+#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575
 msgid "Tags"
 msgstr "タグ"
 
-#: rhodecode/controllers/forks.py:158
+#: rhodecode/controllers/forks.py:165
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "リポジトリ %s を %s としてフォーク"
 
-#: rhodecode/controllers/forks.py:172
+#: rhodecode/controllers/forks.py:179
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "リポジトリ %s のフォーク中にエラーが発生しました"
 
-#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261
+#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318
 msgid "public journal"
 msgstr "公開ジャーナル"
 
-#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322
+#: rhodecode/templates/base/base.html:238
 #: rhodecode/templates/journal/journal.html:12
 msgid "journal"
 msgstr "ジャーナル"
 
-#: rhodecode/controllers/login.py:143
+#: rhodecode/controllers/login.py:142
 msgid "You have successfully registered into rhodecode"
 msgstr "rhodecodeへの登録を受け付けました"
 
-#: rhodecode/controllers/login.py:164
+#: rhodecode/controllers/login.py:163
 msgid "Your password reset link was sent"
 msgstr "パスワードリセットのリンクを送信しました"
 
-#: rhodecode/controllers/login.py:184
+#: rhodecode/controllers/login.py:183
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
 msgstr "パスワードをリセットしました。新しいパスワードをあなたのメールアドレスに送りました"
 
-#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556
+#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
@@ -243,7 +247,7 @@ msgstr "プルリクエストの作成中にエラーが発生しました"
 msgid "Successfully deleted pull request"
 msgstr "プルリクエストを削除しました"
 
-#: rhodecode/controllers/pullrequests.py:452
+#: rhodecode/controllers/pullrequests.py:451
 msgid "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr ""
 
@@ -259,46 +263,46 @@ msgstr "検索するためのインデックスがありません。whooshでインデックスを作成して下さい"
 msgid "An error occurred during this search operation"
 msgstr "検索を実行する際にエラーがおきました"
 
-#: rhodecode/controllers/settings.py:119
-#: rhodecode/controllers/admin/repos.py:272
+#: rhodecode/controllers/settings.py:120
+#: rhodecode/controllers/admin/repos.py:254
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "リポジトリ %s の更新に成功しました"
 
-#: rhodecode/controllers/settings.py:137
-#: rhodecode/controllers/admin/repos.py:290
+#: rhodecode/controllers/settings.py:138
+#: rhodecode/controllers/admin/repos.py:272
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr "リポジトリ %s の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/settings.py:162
-#: rhodecode/controllers/admin/repos.py:315
+#: rhodecode/controllers/settings.py:163
+#: rhodecode/controllers/admin/repos.py:297
 #, python-format
 msgid "deleted repository %s"
 msgstr "リポジトリ %s を削除しました"
 
-#: rhodecode/controllers/settings.py:166
-#: rhodecode/controllers/admin/repos.py:325
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/settings.py:167
+#: rhodecode/controllers/admin/repos.py:307
+#: rhodecode/controllers/admin/repos.py:313
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "リポジトリ %s の削除中にエラーが発生しました"
 
-#: rhodecode/controllers/settings.py:185
+#: rhodecode/controllers/settings.py:186
 msgid "unlocked"
 msgstr "アンロック"
 
-#: rhodecode/controllers/settings.py:188
+#: rhodecode/controllers/settings.py:189
 msgid "locked"
 msgstr "ロック"
 
-#: rhodecode/controllers/settings.py:190
+#: rhodecode/controllers/settings.py:191
 #, python-format
 msgid "Repository has been %s"
 msgstr "リポジトリは %s されています"
 
-#: rhodecode/controllers/settings.py:194
-#: rhodecode/controllers/admin/repos.py:423
+#: rhodecode/controllers/settings.py:195
+#: rhodecode/controllers/admin/repos.py:405
 msgid "An error occurred during unlocking"
 msgstr "アンロック時にエラーが発生しました"
 
@@ -375,23 +379,23 @@ msgstr "LDAPを有効にできませんでした。\"python-ldap\"ライブラリがありません。"
 msgid "error occurred during update of ldap settings"
 msgstr "LDAP設定の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/permissions.py:59
-#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:60
+#: rhodecode/controllers/admin/permissions.py:64
 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 "書込"
+msgid "Read"
+msgstr "読込"
 
 #: rhodecode/controllers/admin/permissions.py:62
 #: rhodecode/controllers/admin/permissions.py:66
+msgid "Write"
+msgstr "書込"
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
 #: rhodecode/templates/admin/defaults/defaults.html:9
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
@@ -405,225 +409,225 @@ msgstr "書込"
 #: rhodecode/templates/admin/settings/settings.html:9
 #: rhodecode/templates/admin/users/user_add.html:8
 #: rhodecode/templates/admin/users/user_edit.html:9
-#: rhodecode/templates/admin/users/user_edit.html:126
+#: rhodecode/templates/admin/users/user_edit.html:130
 #: rhodecode/templates/admin/users/users.html:9
 #: rhodecode/templates/admin/users_groups/users_group_add.html:8
 #: 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:350
-#: rhodecode/templates/base/base.html:352
-#: rhodecode/templates/base/base.html:354
+#: rhodecode/templates/base/base.html:203
+#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:328
 msgid "Admin"
 msgstr "管理"
 
-#: rhodecode/controllers/admin/permissions.py:69
+#: rhodecode/controllers/admin/permissions.py:70
 msgid "disabled"
 msgstr "無効にする"
 
-#: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/controllers/admin/permissions.py:72
 msgid "allowed with manual account activation"
 msgstr "手動でアカウントを有効にする"
 
-#: rhodecode/controllers/admin/permissions.py:73
+#: rhodecode/controllers/admin/permissions.py:74
 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:76
 #: rhodecode/controllers/admin/permissions.py:79
+msgid "Disabled"
+msgstr "無効"
+
+#: rhodecode/controllers/admin/permissions.py:77
+#: rhodecode/controllers/admin/permissions.py:80
 msgid "Enabled"
 msgstr "有効"
 
-#: rhodecode/controllers/admin/permissions.py:122
+#: rhodecode/controllers/admin/permissions.py:128
 msgid "Default permissions updated successfully"
 msgstr "デフォルトの権限を更新しました"
 
-#: rhodecode/controllers/admin/permissions.py:136
+#: rhodecode/controllers/admin/permissions.py:142
 msgid "error occurred during update of permissions"
 msgstr "権限の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:121
+#: rhodecode/controllers/admin/repos.py:123
 msgid "--REMOVE FORK--"
 msgstr "--フォーク元を削除--"
 
-#: rhodecode/controllers/admin/repos.py:190
+#: rhodecode/controllers/admin/repos.py:162
 #, python-format
 msgid "created repository %s from %s"
 msgstr "リポジトリ %s を %s から作成"
 
-#: rhodecode/controllers/admin/repos.py:194
+#: rhodecode/controllers/admin/repos.py:166
 #, python-format
 msgid "created repository %s"
 msgstr "リポジトリ %s を作成しました"
 
-#: rhodecode/controllers/admin/repos.py:225
+#: rhodecode/controllers/admin/repos.py:197
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr "リポジトリ %s を作成中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:320
+#: rhodecode/controllers/admin/repos.py:302
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr "フォークしたリポジトリが存在するため、 %s は削除できません"
 
-#: rhodecode/controllers/admin/repos.py:349
+#: rhodecode/controllers/admin/repos.py:331
 msgid "An error occurred during deletion of repository user"
 msgstr "リポジトリユーザーの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:368
+#: rhodecode/controllers/admin/repos.py:350
 msgid "An error occurred during deletion of repository users groups"
 msgstr "リポジトリユーザーグループの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:386
+#: rhodecode/controllers/admin/repos.py:368
 msgid "An error occurred during deletion of repository stats"
 msgstr "リポジトリステートの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:403
+#: rhodecode/controllers/admin/repos.py:385
 msgid "An error occurred during cache invalidation"
 msgstr "キャッシュの無効化時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:443
+#: rhodecode/controllers/admin/repos.py:425
 msgid "Updated repository visibility in public journal"
 msgstr "公開ジャーナルでのリポジトリの可視性を更新しました"
 
+#: rhodecode/controllers/admin/repos.py:429
+msgid "An error occurred during setting this repository in public journal"
+msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301
+msgid "Token mismatch"
+msgstr "トークンが合いません"
+
 #: rhodecode/controllers/admin/repos.py:447
-msgid "An error occurred during setting this repository in public journal"
-msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300
-msgid "Token mismatch"
-msgstr "トークンが合いません"
-
-#: rhodecode/controllers/admin/repos.py:465
 msgid "Pulled from remote location"
 msgstr "リモートから取得"
 
-#: rhodecode/controllers/admin/repos.py:467
+#: rhodecode/controllers/admin/repos.py:449
 msgid "An error occurred during pull from remote location"
 msgstr "リモートから取得中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:483
+#: rhodecode/controllers/admin/repos.py:465
 msgid "Nothing"
 msgstr "ありません"
 
-#: rhodecode/controllers/admin/repos.py:485
+#: rhodecode/controllers/admin/repos.py:467
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "%s リポジトリを %s のフォークとして印をつける"
 
-#: rhodecode/controllers/admin/repos.py:489
+#: rhodecode/controllers/admin/repos.py:471
 msgid "An error occurred during this operation"
 msgstr "操作中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:120
+#: rhodecode/controllers/admin/repos_groups.py:136
 #, python-format
 msgid "created repos group %s"
 msgstr "リポジトリグループ %s を作成しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:133
+#: rhodecode/controllers/admin/repos_groups.py:148
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr "リポジトリグループ %s を作成中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:167
+#: rhodecode/controllers/admin/repos_groups.py:205
 #, python-format
 msgid "updated repos group %s"
 msgstr "リポジトリグループ %s を更新しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:180
+#: rhodecode/controllers/admin/repos_groups.py:220
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr "リポジトリグループ %s を更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:198
+#: rhodecode/controllers/admin/repos_groups.py:238
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr "このグループは %s リポジトリを含んでいるため削除出来ません"
 
-#: rhodecode/controllers/admin/repos_groups.py:206
+#: rhodecode/controllers/admin/repos_groups.py:246
 #, python-format
 msgid "removed repos group %s"
 msgstr "リポジトリグループ %s を削除しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:212
+#: rhodecode/controllers/admin/repos_groups.py:252
 msgid "Cannot delete this group it still contains subgroups"
 msgstr "サブグループを含んでいるため、このグループを削除できません"
 
-#: rhodecode/controllers/admin/repos_groups.py:217
-#: rhodecode/controllers/admin/repos_groups.py:222
+#: rhodecode/controllers/admin/repos_groups.py:257
+#: rhodecode/controllers/admin/repos_groups.py:262
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr "リポジトリグループ %s の削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:243
+#: rhodecode/controllers/admin/repos_groups.py:283
 msgid "An error occurred during deletion of group user"
 msgstr "グループユーザーを削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:264
+#: rhodecode/controllers/admin/repos_groups.py:304
 msgid "An error occurred during deletion of group users groups"
 msgstr "グループユーザーのグループを削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:123
-#, python-format
-msgid "Repositories successfully rescanned added: %s,removed: %s"
+#: rhodecode/controllers/admin/settings.py:124
+#, fuzzy, python-format
+msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr "リポジトリを再度スキャンしました。 追加: %s 削除: %s"
 
-#: rhodecode/controllers/admin/settings.py:131
+#: rhodecode/controllers/admin/settings.py:133
 msgid "Whoosh reindex task scheduled"
 msgstr "Whooshの再インデックスタスクを予定に入れました"
 
-#: rhodecode/controllers/admin/settings.py:162
+#: rhodecode/controllers/admin/settings.py:164
 msgid "Updated application settings"
 msgstr "アプリケーション設定を更新しました"
 
-#: rhodecode/controllers/admin/settings.py:166
-#: rhodecode/controllers/admin/settings.py:299
+#: rhodecode/controllers/admin/settings.py:168
+#: rhodecode/controllers/admin/settings.py:301
 msgid "error occurred during updating application settings"
 msgstr "アプリケーション設定を更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:207
+#: rhodecode/controllers/admin/settings.py:209
 msgid "Updated visualisation settings"
 msgstr "表示の設定を更新しました"
 
-#: rhodecode/controllers/admin/settings.py:212
+#: rhodecode/controllers/admin/settings.py:214
 msgid "error occurred during updating visualisation settings"
 msgstr "表示の設定を更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:295
+#: rhodecode/controllers/admin/settings.py:297
 msgid "Updated VCS settings"
 msgstr "VCSの設定を更新しました"
 
-#: rhodecode/controllers/admin/settings.py:309
+#: rhodecode/controllers/admin/settings.py:311
 msgid "Added new hook"
 msgstr "新しいフックを追加しました"
 
-#: rhodecode/controllers/admin/settings.py:321
+#: rhodecode/controllers/admin/settings.py:323
 msgid "Updated hooks"
 msgstr "フックを更新しました"
 
-#: rhodecode/controllers/admin/settings.py:325
+#: rhodecode/controllers/admin/settings.py:327
 msgid "error occurred during hook creation"
 msgstr "フックの作成時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:344
+#: rhodecode/controllers/admin/settings.py:346
 msgid "Email task created"
 msgstr "メールのタスクを作成しました"
 
-#: rhodecode/controllers/admin/settings.py:399
+#: rhodecode/controllers/admin/settings.py:408
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr "このユーザーを編集出来ません。このユーザーはアプリケーションにとって必要不可欠です。"
 
-#: rhodecode/controllers/admin/settings.py:430
+#: rhodecode/controllers/admin/settings.py:448
 msgid "Your account was updated successfully"
 msgstr "アカウントを更新しました"
 
-#: rhodecode/controllers/admin/settings.py:445
-#: rhodecode/controllers/admin/users.py:196
+#: rhodecode/controllers/admin/settings.py:463
+#: rhodecode/controllers/admin/users.py:198
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr "ユーザー %s の更新中にエラーが発生しました"
@@ -642,52 +646,67 @@ msgstr "ユーザー %s の作成中にエラーが発生しました"
 msgid "User updated successfully"
 msgstr "ユーザーの更新に成功しました"
 
-#: rhodecode/controllers/admin/users.py:212
+#: rhodecode/controllers/admin/users.py:214
 msgid "successfully deleted user"
 msgstr "ユーザーの削除に成功しました"
 
-#: rhodecode/controllers/admin/users.py:217
+#: rhodecode/controllers/admin/users.py:219
 msgid "An error occurred during deletion of user"
 msgstr "ユーザーの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:231
+#: rhodecode/controllers/admin/users.py:233
 msgid "You can't edit this user"
 msgstr "このユーザーは編集できません"
 
-#: rhodecode/controllers/admin/users.py:272
+#: rhodecode/controllers/admin/users.py:276
 msgid "Granted 'repository create' permission to user"
 msgstr "ユーザーに 'リポジトリ作成' 権限を与えました"
 
-#: rhodecode/controllers/admin/users.py:277
+#: rhodecode/controllers/admin/users.py:281
 msgid "Revoked 'repository create' permission to user"
 msgstr "ユーザーの 'リポジトリ作成' 権限を取り消しました"
 
-#: rhodecode/controllers/admin/users.py:283
+#: rhodecode/controllers/admin/users.py:287
 msgid "Granted 'repository fork' permission to user"
 msgstr "ユーザーに 'リポジトリフォーク' 権限を与えました"
 
-#: rhodecode/controllers/admin/users.py:288
+#: rhodecode/controllers/admin/users.py:292
 msgid "Revoked 'repository fork' permission to user"
 msgstr "ユーザーの 'リポジトリフォーク' 権限を取り消しました"
 
-#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users.py:298
 #: rhodecode/controllers/admin/users_groups.py:279
 msgid "An error occurred during permissions saving"
 msgstr "権限の保存時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:309
+#: rhodecode/controllers/admin/users.py:312
 #, python-format
 msgid "Added email %s to user"
 msgstr "ユーザーにメール %s を追加しました"
 
-#: rhodecode/controllers/admin/users.py:315
+#: rhodecode/controllers/admin/users.py:318
 msgid "An error occurred during email saving"
 msgstr "メールの保存時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:325
+#: rhodecode/controllers/admin/users.py:328
 msgid "Removed email from user"
 msgstr "ユーザーからメールを削除しました"
 
+#: rhodecode/controllers/admin/users.py:341
+#, fuzzy, python-format
+msgid "Added ip %s to user"
+msgstr "ユーザーにメール %s を追加しました"
+
+#: rhodecode/controllers/admin/users.py:347
+#, fuzzy
+msgid "An error occurred during ip saving"
+msgstr "メールの保存時にエラーが発生しました"
+
+#: rhodecode/controllers/admin/users.py:359
+#, fuzzy
+msgid "Removed ip from user"
+msgstr "ユーザーからメールを削除しました"
+
 #: rhodecode/controllers/admin/users_groups.py:86
 #, python-format
 msgid "created users group %s"
@@ -732,11 +751,16 @@ msgstr "ユーザーグループに 'リポジトリフォーク' 権限を与えました"
 msgid "Revoked 'repository fork' permission to users group"
 msgstr "ユーザーグループの 'リポジトリフォーク' 権限を取り消しました"
 
-#: rhodecode/lib/auth.py:499
+#: rhodecode/lib/auth.py:509
+#, fuzzy, python-format
+msgid "IP %s not allowed"
+msgstr "%s フォロワー"
+
+#: rhodecode/lib/auth.py:558
 msgid "You need to be a registered user to perform this action"
 msgstr "このアクションを実行するためには登録ユーザーである必要があります"
 
-#: rhodecode/lib/auth.py:540
+#: rhodecode/lib/auth.py:599
 msgid "You need to be a signed in to view this page"
 msgstr "このページを閲覧するためにはサインインが必要です"
 
@@ -889,16 +913,16 @@ msgstr "リポジトリの[フォローを開始]"
 msgid "[stopped following] repository"
 msgstr "リポジトリの[フォローを停止]"
 
-#: rhodecode/lib/helpers.py:883
+#: rhodecode/lib/helpers.py:884
 #, python-format
 msgid " and %s more"
 msgstr " と %s 以上"
 
-#: rhodecode/lib/helpers.py:887
+#: rhodecode/lib/helpers.py:888
 msgid "No Files"
 msgstr "ファイルなし"
 
-#: rhodecode/lib/helpers.py:1163
+#: rhodecode/lib/helpers.py:1164
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -972,92 +996,112 @@ msgstr "ちょうどいま"
 msgid "password reset link"
 msgstr "パスワードリセットのリンク"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313
 msgid "Repository no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314
 msgid "Repository read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315
 msgid "Repository write access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316
 msgid "Repository admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318
 msgid "Repositories Group no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319
 msgid "Repositories Group read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320
 msgid "Repositories Group write access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321
 msgid "Repositories Group admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323
 msgid "RhodeCode Administrator"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324
 msgid "Repository creation disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325
 msgid "Repository creation enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326
 msgid "Repository forking disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327
 msgid "Repository forking enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328
 msgid "Register disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776
 msgid "Not Reviewed"
 msgstr "未レビュー"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777
 msgid "Approved"
 msgstr "承認"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778
 msgid "Rejected"
 msgstr "却下"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779
 msgid "Under Review"
 msgstr "レビュー中"
 
-#: rhodecode/model/comment.py:110
+#: rhodecode/model/comment.py:109
 #, python-format
 msgid "on line %s"
 msgstr ""
 
-#: rhodecode/model/comment.py:173
+#: rhodecode/model/comment.py:176
 msgid "[Mention]"
 msgstr "[Mention]"
 
@@ -1109,70 +1153,69 @@ msgstr "新しいプルリクエストを作成 %(when)s"
 msgid "commented on pull request at %(when)s"
 msgstr "プルリクエストにコメント %(when)s"
 
-#: rhodecode/model/pull_request.py:90
+#: rhodecode/model/pull_request.py:100
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr "%(user)s がプリリクエスト #%(pr_id)s のレビューを求めています"
 
-#: rhodecode/model/scm.py:542
+#: rhodecode/model/scm.py:556
 msgid "latest tip"
 msgstr "最新のtip"
 
-#: rhodecode/model/user.py:232
+#: rhodecode/model/user.py:231
 msgid "new user registration"
 msgstr "新規ユーザー登録"
 
-#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
-#: rhodecode/model/user.py:303
+#: rhodecode/model/user.py:256 rhodecode/model/user.py:280
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr "アプリケーション全体にとって重要なユーザなため、編集出来ません"
 
-#: rhodecode/model/user.py:327
+#: rhodecode/model/user.py:302
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr "アプリケーション全体にとって重要なユーザなため、削除できません"
 
-#: rhodecode/model/user.py:333
+#: rhodecode/model/user.py:308
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories. %s"
 msgstr ""
 
-#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37
+#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38
 msgid "Value cannot be an empty list"
 msgstr "空のリストには出来ません"
 
-#: rhodecode/model/validators.py:83
+#: rhodecode/model/validators.py:84
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "ユーザー名 \"%(username)s\" はすでに使われています"
 
-#: rhodecode/model/validators.py:85
+#: rhodecode/model/validators.py:86
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr "ユーザー名 \"%(username)s\" は許可されていません"
 
-#: rhodecode/model/validators.py:87
+#: rhodecode/model/validators.py:88
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
 msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります"
 
-#: rhodecode/model/validators.py:115
+#: rhodecode/model/validators.py:116
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr "ユーザー名 %(username)s は不正です"
 
-#: rhodecode/model/validators.py:134
+#: rhodecode/model/validators.py:135
 msgid "Invalid users group name"
 msgstr "不正なユーザーグループ名です"
 
-#: rhodecode/model/validators.py:135
+#: rhodecode/model/validators.py:136
 #, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr "ユーザーグループ \"%(usersgroup)s\" はすでに存在します"
 
-#: rhodecode/model/validators.py:137
+#: rhodecode/model/validators.py:138
 msgid ""
 "users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
@@ -1180,104 +1223,118 @@ msgstr ""
 "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります"
 " "
 
-#: rhodecode/model/validators.py:175
+#: rhodecode/model/validators.py:176
 msgid "Cannot assign this group as parent"
 msgstr "このグループは親にできません"
 
-#: rhodecode/model/validators.py:176
+#: rhodecode/model/validators.py:177
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "グループ \"%(group_name)s\" はすでに存在します"
 
-#: rhodecode/model/validators.py:178
+#: rhodecode/model/validators.py:179
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "グループ名 \"%(group_name)s\" を持つリポジトリはすでに存在します"
 
-#: rhodecode/model/validators.py:236
+#: rhodecode/model/validators.py:237
 msgid "Invalid characters (non-ascii) in password"
 msgstr "パスワードに利用出来ない文字列(non-ascii)です"
 
-#: rhodecode/model/validators.py:251
+#: rhodecode/model/validators.py:252
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: rhodecode/model/validators.py:268
+#: rhodecode/model/validators.py:269
 msgid "invalid password"
 msgstr "不正なパスワードです"
 
-#: rhodecode/model/validators.py:269
+#: rhodecode/model/validators.py:270
 msgid "invalid user name"
 msgstr "不正なユーザー名です"
 
-#: rhodecode/model/validators.py:270
+#: rhodecode/model/validators.py:271
 msgid "Your account is disabled"
 msgstr "アカウントは無効です"
 
-#: rhodecode/model/validators.py:314
+#: rhodecode/model/validators.py:315
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "リポジトリ名 %(repo)s は許可されていません"
 
-#: rhodecode/model/validators.py:316
+#: rhodecode/model/validators.py:317
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "リポジトリ %(repo)s はすでに存在します"
 
-#: rhodecode/model/validators.py:317
+#: rhodecode/model/validators.py:318
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "リポジトリ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します"
 
-#: rhodecode/model/validators.py:319
+#: rhodecode/model/validators.py:320
 #, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します"
 
-#: rhodecode/model/validators.py:432
+#: rhodecode/model/validators.py:433
 msgid "invalid clone url"
 msgstr "無効なクローンURIです"
 
-#: rhodecode/model/validators.py:433
+#: rhodecode/model/validators.py:434
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr "無効なクローンURIです。有効な http(s)/svn+http(s) のURIを指定してください"
 
-#: rhodecode/model/validators.py:458
+#: rhodecode/model/validators.py:459
 msgid "Fork have to be the same type as parent"
 msgstr "フォークは親と同じタイプの必要があります"
 
-#: rhodecode/model/validators.py:473
+#: rhodecode/model/validators.py:474
 msgid "You don't have permissions to create repository in this group"
 msgstr "このグループでリポジトリを作成する権限がありません"
 
-#: rhodecode/model/validators.py:498
+#: rhodecode/model/validators.py:501
+#, fuzzy
+msgid "You don't have permissions to create a group in this location"
+msgstr "このグループでリポジトリを作成する権限がありません"
+
+#: rhodecode/model/validators.py:540
 msgid "This username or users group name is not valid"
 msgstr "ユーザー名かユーザーグループが不正です"
 
-#: rhodecode/model/validators.py:591
+#: rhodecode/model/validators.py:636
 msgid "This is not a valid path"
 msgstr "不正なパスです"
 
-#: rhodecode/model/validators.py:606
+#: rhodecode/model/validators.py:651
 msgid "This e-mail address is already taken"
 msgstr "このメールアドレスはすでに取得されています"
 
-#: rhodecode/model/validators.py:626
+#: rhodecode/model/validators.py:671
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "メールアドレス \"%(email)s\" は存在しません"
 
-#: rhodecode/model/validators.py:663
+#: rhodecode/model/validators.py:708
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr "LDAPのこのCNに対するログイン属性は必須です。 - これは \"ユーザー名\" と同じです"
 
-#: rhodecode/model/validators.py:682
+#: rhodecode/model/validators.py:727
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
+#: rhodecode/model/validators.py:759
+msgid "Please enter a valid IPv4 or IpV6 address"
+msgstr ""
+
+#: rhodecode/model/validators.py:760
+#, python-format
+msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
+msgstr ""
+
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr "ダッシュボード"
@@ -1290,43 +1347,55 @@ msgstr "ダッシュボード"
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 #: rhodecode/templates/branches/branches.html:9
 #: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:48
+#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:50
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
 msgstr "クイックフィルタ..."
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:233
+#: rhodecode/templates/base/base.html:239
 msgid "repositories"
 msgstr "リポジトリ"
 
-#: rhodecode/templates/index_base.html:13
-#: rhodecode/templates/index_base.html:15
+#: rhodecode/templates/index_base.html:14
+#: rhodecode/templates/index_base.html:17
+#: rhodecode/templates/admin/repos/repo_add.html:5
+#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
 #: rhodecode/templates/admin/repos/repos.html:21
-msgid "ADD REPOSITORY"
+msgid "Add repository"
 msgstr "リポジトリの追加"
 
-#: rhodecode/templates/index_base.html:29
-#: rhodecode/templates/index_base.html:136
+#: rhodecode/templates/index_base.html:23
+#, fuzzy
+msgid "Edit group"
+msgstr "リポジトリグループを編集"
+
+#: rhodecode/templates/index_base.html:23
+msgid "You have admin right to this group, and can edit it"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:36
+#: rhodecode/templates/index_base.html:140
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
 #: rhodecode/templates/admin/users_groups/users_group_add.html:32
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33
 msgid "Group name"
 msgstr "グループ名"
 
-#: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:72
-#: rhodecode/templates/index_base.html:138
-#: rhodecode/templates/index_base.html:176
-#: rhodecode/templates/index_base.html:266
+#: rhodecode/templates/index_base.html:37
+#: rhodecode/templates/index_base.html:79
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/index_base.html:180
+#: rhodecode/templates/index_base.html:273
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
-#: rhodecode/templates/admin/repos/repos.html:72
+#: rhodecode/templates/admin/repos/repos.html:73
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
 #: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:66
@@ -1334,31 +1403,29 @@ msgstr "グループ名"
 msgid "Description"
 msgstr "説明"
 
-#: rhodecode/templates/index_base.html:40
+#: rhodecode/templates/index_base.html:47
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47
 msgid "Repositories group"
 msgstr "リポジトリグループ"
 
-#: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/index_base.html:174
-#: rhodecode/templates/index_base.html:264
+#: rhodecode/templates/index_base.html:78
+#: rhodecode/templates/index_base.html:178
+#: rhodecode/templates/index_base.html:271
+#: rhodecode/templates/admin/permissions/permissions.html:117
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
-#: rhodecode/templates/admin/repos/repos.html:70
-#: rhodecode/templates/admin/users/user_edit.html:196
-#: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:180
-#: rhodecode/templates/admin/users/user_edit_my_account.html:216
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
+#: rhodecode/templates/admin/repos/repos.html:71
+#: rhodecode/templates/admin/users/user_edit.html:200
+#: rhodecode/templates/admin/users/user_edit_my_account.html:60
+#: rhodecode/templates/admin/users/user_edit_my_account.html:211
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:184
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
 #: rhodecode/templates/branches/branches.html:50
 #: rhodecode/templates/branches/branches_data.html:6
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:70
-#: rhodecode/templates/journal/journal.html:196
-#: rhodecode/templates/journal/journal_page_repos.html:7
+#: rhodecode/templates/journal/journal.html:201
+#: rhodecode/templates/journal/journal.html:305
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
 #: rhodecode/templates/summary/summary.html:132
@@ -1367,99 +1434,107 @@ msgstr "リポジトリグループ"
 msgid "Name"
 msgstr "名前"
 
-#: rhodecode/templates/index_base.html:73
+#: rhodecode/templates/index_base.html:80
 msgid "Last change"
 msgstr "最後の変更時刻"
 
-#: rhodecode/templates/index_base.html:74
-#: rhodecode/templates/index_base.html:179
-#: rhodecode/templates/admin/users/user_edit_my_account.html:182
-#: rhodecode/templates/journal/journal.html:198
+#: rhodecode/templates/index_base.html:81
+#: rhodecode/templates/index_base.html:183
+#: rhodecode/templates/index_base.html:276
+#: rhodecode/templates/admin/repos/repos.html:74
+#: rhodecode/templates/admin/users/user_edit_my_account.html:213
+#: rhodecode/templates/journal/journal.html:203
+#: rhodecode/templates/journal/journal.html:307
 msgid "Tip"
 msgstr "Tip"
 
-#: rhodecode/templates/index_base.html:75
-#: rhodecode/templates/index_base.html:181
-#: rhodecode/templates/index_base.html:269
+#: rhodecode/templates/index_base.html:82
+#: rhodecode/templates/index_base.html:185
+#: rhodecode/templates/index_base.html:278
 #: rhodecode/templates/admin/repos/repo_edit.html:121
-#: rhodecode/templates/admin/repos/repos.html:73
+#: rhodecode/templates/admin/repos/repos.html:76
 msgid "Owner"
 msgstr "所有者"
 
-#: rhodecode/templates/index_base.html:76
+#: rhodecode/templates/index_base.html:83
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr "RSS"
 
-#: rhodecode/templates/index_base.html:77
+#: rhodecode/templates/index_base.html:84
 msgid "Atom"
 msgstr "Atom"
 
-#: rhodecode/templates/index_base.html:167
-#: rhodecode/templates/index_base.html:207
-#: rhodecode/templates/index_base.html:291
-#: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:202
+#: rhodecode/templates/index_base.html:171
+#: rhodecode/templates/index_base.html:211
+#: rhodecode/templates/index_base.html:300
+#: rhodecode/templates/admin/repos/repos.html:97
+#: rhodecode/templates/admin/users/user_edit_my_account.html:235
 #: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
 #: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:221
+#: rhodecode/templates/journal/journal.html:225
+#: rhodecode/templates/journal/journal.html:329
 #: rhodecode/templates/tags/tags.html:77
 msgid "Click to sort ascending"
 msgstr "昇順で並び換え"
 
-#: rhodecode/templates/index_base.html:168
-#: rhodecode/templates/index_base.html:208
-#: rhodecode/templates/index_base.html:292
-#: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:203
+#: rhodecode/templates/index_base.html:172
+#: rhodecode/templates/index_base.html:212
+#: rhodecode/templates/index_base.html:301
+#: rhodecode/templates/admin/repos/repos.html:98
+#: rhodecode/templates/admin/users/user_edit_my_account.html:236
 #: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:222
+#: rhodecode/templates/journal/journal.html:226
+#: rhodecode/templates/journal/journal.html:330
 #: rhodecode/templates/tags/tags.html:78
 msgid "Click to sort descending"
 msgstr "降順で並び替え"
 
-#: rhodecode/templates/index_base.html:177
-#: rhodecode/templates/index_base.html:267
+#: rhodecode/templates/index_base.html:181
+#: rhodecode/templates/index_base.html:274
 msgid "Last Change"
 msgstr "最後の変更点"
 
-#: rhodecode/templates/index_base.html:209
-#: rhodecode/templates/index_base.html:293
-#: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:204
+#: rhodecode/templates/index_base.html:213
+#: rhodecode/templates/index_base.html:302
+#: rhodecode/templates/admin/repos/repos.html:99
+#: rhodecode/templates/admin/users/user_edit_my_account.html:237
 #: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
 #: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:223
+#: rhodecode/templates/journal/journal.html:227
+#: rhodecode/templates/journal/journal.html:331
 #: rhodecode/templates/tags/tags.html:79
 msgid "No records found."
 msgstr "レコードが見つかりません"
 
-#: rhodecode/templates/index_base.html:210
-#: rhodecode/templates/index_base.html:294
-#: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:205
+#: rhodecode/templates/index_base.html:214
+#: rhodecode/templates/index_base.html:303
+#: rhodecode/templates/admin/repos/repos.html:100
+#: rhodecode/templates/admin/users/user_edit_my_account.html:238
 #: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:224
+#: rhodecode/templates/journal/journal.html:228
+#: rhodecode/templates/journal/journal.html:332
 #: rhodecode/templates/tags/tags.html:80
 msgid "Data error."
 msgstr "データエラー"
 
-#: rhodecode/templates/index_base.html:211
-#: rhodecode/templates/index_base.html:295
-#: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:206
+#: rhodecode/templates/index_base.html:215
+#: rhodecode/templates/index_base.html:304
+#: rhodecode/templates/admin/repos/repos.html:101
+#: rhodecode/templates/admin/users/user_edit_my_account.html:105
+#: rhodecode/templates/admin/users/user_edit_my_account.html:239
 #: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:62
-#: rhodecode/templates/journal/journal.html:225
+#: rhodecode/templates/journal/journal.html:229
+#: rhodecode/templates/journal/journal.html:333
 #: rhodecode/templates/tags/tags.html:81
 msgid "Loading..."
 msgstr "読み込み中..."
@@ -1475,9 +1550,9 @@ msgstr ""
 #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
 #: rhodecode/templates/admin/admin_log.html:5
 #: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:50
+#: rhodecode/templates/admin/users/user_edit.html:54
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
-#: rhodecode/templates/base/base.html:83
+#: rhodecode/templates/base/base.html:89
 #: rhodecode/templates/summary/summary.html:131
 msgid "Username"
 msgstr "ユーザー名"
@@ -1485,7 +1560,7 @@ msgstr "ユーザー名"
 #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
 #: rhodecode/templates/admin/ldap/ldap.html:46
 #: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:92
+#: rhodecode/templates/base/base.html:98
 msgid "Password"
 msgstr "パスワード"
 
@@ -1497,7 +1572,7 @@ msgstr "次回から自動的にサインイン"
 msgid "Forgot your password ?"
 msgstr "パスワードを忘れた場合はこちら"
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109
 msgid "Don't have an account ?"
 msgstr "アカウントを持っていない場合はこちら"
 
@@ -1535,22 +1610,22 @@ msgstr "パスワード再入力"
 
 #: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:90
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
+#: rhodecode/templates/admin/users/user_edit.html:94
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57
 msgid "First Name"
 msgstr "名前"
 
 #: rhodecode/templates/register.html:56
 #: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:99
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
+#: rhodecode/templates/admin/users/user_edit.html:103
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66
 msgid "Last Name"
 msgstr "名字"
 
 #: rhodecode/templates/register.html:65
 #: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:108
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
+#: rhodecode/templates/admin/users/user_edit.html:112
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75
 #: rhodecode/templates/summary/summary.html:133
 msgid "Email"
 msgstr "メールアドレス"
@@ -1628,11 +1703,10 @@ msgid_plural "%s entries"
 msgstr[0] "%s エントリ"
 
 #: rhodecode/templates/admin/admin_log.html:6
-#: rhodecode/templates/admin/repos/repos.html:74
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:10
+#: rhodecode/templates/admin/repos/repos.html:77
+#: rhodecode/templates/admin/users/user_edit_my_account.html:215
+#: rhodecode/templates/journal/journal.html:205
+#: rhodecode/templates/journal/journal.html:309
 msgid "Action"
 msgstr "アクション"
 
@@ -1706,7 +1780,7 @@ 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
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71
 msgid "Enable locking"
 msgstr "ロックを有効にする"
 
@@ -1717,12 +1791,13 @@ msgstr "リポジトリのpullのロックを有効にします"
 
 #: rhodecode/templates/admin/defaults/defaults.html:84
 #: rhodecode/templates/admin/ldap/ldap.html:89
+#: rhodecode/templates/admin/permissions/permissions.html:92
 #: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79
 #: 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/user_edit.html:137
+#: rhodecode/templates/admin/users/user_edit.html:182
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:94
 msgid "Save"
@@ -1814,8 +1889,8 @@ msgid "Comments"
 msgstr "コメント"
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:267
-#: rhodecode/templates/base/base.html:269
+#: rhodecode/templates/base/base.html:272
+#: rhodecode/templates/base/base.html:274
 msgid "Pull requests"
 msgstr "プルリクエスト"
 
@@ -1842,8 +1917,8 @@ msgstr "権限管理"
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:134
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
-#: rhodecode/templates/admin/users/user_edit.html:143
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63
+#: rhodecode/templates/admin/users/user_edit.html:147
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
 #: rhodecode/templates/settings/repo_settings.html:86
 msgid "Permissions"
@@ -1897,19 +1972,110 @@ msgstr "リポジトリ作成"
 msgid "Repository forking"
 msgstr "リポジトリフォーク"
 
-#: rhodecode/templates/admin/permissions/permissions.html:92
-#: rhodecode/templates/admin/repos/repo_edit.html:264
-msgid "set"
-msgstr "保存"
-
-#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
-msgid "Add repository"
-msgstr "リポジトリの追加"
+#: rhodecode/templates/admin/permissions/permissions.html:93
+#: rhodecode/templates/admin/permissions/permissions.html:209
+#: rhodecode/templates/admin/repos/repo_edit.html:142
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80
+#: rhodecode/templates/admin/settings/settings.html:113
+#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:269
+#: rhodecode/templates/admin/users/user_edit.html:138
+#: rhodecode/templates/admin/users/user_edit.html:183
+#: rhodecode/templates/admin/users/user_edit.html:286
+#: rhodecode/templates/admin/users/user_edit.html:334
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
+#: rhodecode/templates/files/files_add.html:82
+#: rhodecode/templates/files/files_edit.html:68
+#: rhodecode/templates/pullrequests/pullrequest.html:124
+#: rhodecode/templates/settings/repo_settings.html:95
+msgid "Reset"
+msgstr "リセット"
+
+#: rhodecode/templates/admin/permissions/permissions.html:103
+#, fuzzy
+msgid "Default User Permissions"
+msgstr "デフォルトの権限"
+
+#: rhodecode/templates/admin/permissions/permissions.html:111
+#: rhodecode/templates/admin/users/user_edit.html:194
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
+msgid "Nothing here yet"
+msgstr "まだありません"
+
+#: rhodecode/templates/admin/permissions/permissions.html:118
+#: rhodecode/templates/admin/users/user_edit.html:201
+#: rhodecode/templates/admin/users/user_edit_my_account.html:61
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
+msgid "Permission"
+msgstr "権限"
+
+#: rhodecode/templates/admin/permissions/permissions.html:119
+#: rhodecode/templates/admin/users/user_edit.html:202
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
+msgid "Edit Permission"
+msgstr "権限の編集"
+
+#: rhodecode/templates/admin/permissions/permissions.html:149
+#: rhodecode/templates/admin/permissions/permissions.html:151
+#: rhodecode/templates/admin/repos/repo_edit.html:13
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/users/user_edit.html:13
+#: rhodecode/templates/admin/users/user_edit.html:232
+#: rhodecode/templates/admin/users/user_edit.html:234
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
+#: rhodecode/templates/data_table/_dt_elements.html:116
+#: rhodecode/templates/data_table/_dt_elements.html:117
+msgid "edit"
+msgstr "編集"
+
+#: rhodecode/templates/admin/permissions/permissions.html:168
+#: rhodecode/templates/admin/users/user_edit.html:295
+#, fuzzy
+msgid "Allowed IP addresses"
+msgstr "メールアドレス"
+
+#: rhodecode/templates/admin/permissions/permissions.html:182
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
+#: rhodecode/templates/admin/users/user_edit.html:263
+#: rhodecode/templates/admin/users/user_edit.html:308
+#: rhodecode/templates/admin/users_groups/users_groups.html:44
+#: rhodecode/templates/data_table/_dt_elements.html:122
+#: rhodecode/templates/data_table/_dt_elements.html:130
+msgid "delete"
+msgstr "削除"
+
+#: rhodecode/templates/admin/permissions/permissions.html:183
+#: rhodecode/templates/admin/users/user_edit.html:309
+#, fuzzy, python-format
+msgid "Confirm to delete this ip: %s"
+msgstr "このメールを削除してよろしいですか: %s"
+
+#: rhodecode/templates/admin/permissions/permissions.html:189
+#: rhodecode/templates/admin/users/user_edit.html:315
+msgid "All IP addresses are allowed"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:200
+#: rhodecode/templates/admin/users/user_edit.html:326
+#, fuzzy
+msgid "New ip address"
+msgstr "新しいメールアドレス"
+
+#: rhodecode/templates/admin/permissions/permissions.html:208
+#: rhodecode/templates/admin/users/user_edit.html:285
+#: rhodecode/templates/admin/users/user_edit.html:333
+msgid "Add"
+msgstr "追加"
 
 #: rhodecode/templates/admin/repos/repo_add.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:11
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
+#: rhodecode/templates/base/base.html:154
 msgid "Repositories"
 msgstr "リポジトリ"
 
@@ -1971,19 +2137,6 @@ msgstr "新しいリポジトリの追加"
 msgid "Edit repository"
 msgstr "リポジトリを編集"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:228
-#: rhodecode/templates/admin/users/user_edit.html:230
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
-#: rhodecode/templates/files/files_source.html:29
-#: rhodecode/templates/journal/journal_page_repos.html:29
-msgid "edit"
-msgstr "編集"
-
 #: rhodecode/templates/admin/repos/repo_edit.html:40
 #: rhodecode/templates/settings/repo_settings.html:39
 msgid "Clone uri"
@@ -1998,23 +2151,6 @@ msgstr "オプション: このリポジトリを配置するグループを選択します"
 msgid "Change owner of this repository."
 msgstr "リポジトリの所有者を変更"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
-#: rhodecode/templates/admin/settings/settings.html:113
-#: rhodecode/templates/admin/settings/settings.html:179
-#: rhodecode/templates/admin/settings/settings.html:269
-#: rhodecode/templates/admin/users/user_edit.html:134
-#: rhodecode/templates/admin/users/user_edit.html:179
-#: rhodecode/templates/admin/users/user_edit.html:282
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/files/files_add.html:82
-#: rhodecode/templates/files/files_edit.html:68
-#: rhodecode/templates/pullrequests/pullrequest.html:124
-#: rhodecode/templates/settings/repo_settings.html:95
-msgid "Reset"
-msgstr "リセット"
-
 #: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr "管理"
@@ -2083,16 +2219,16 @@ msgstr "キー"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:203
 #: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:117
+#: rhodecode/templates/admin/users/user_edit.html:121
 #: rhodecode/templates/admin/users_groups/users_group_add.html:41
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42
 msgid "Active"
 msgstr "アクティブ"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:218
-#: rhodecode/templates/base/base.html:331
-#: rhodecode/templates/base/base.html:333
-#: rhodecode/templates/base/base.html:335
+#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:308
+#: rhodecode/templates/base/base.html:310
 msgid "Public journal"
 msgstr "公開ジャーナル"
 
@@ -2142,12 +2278,16 @@ msgstr "リポジトリを強制ロックします。匿名アクセスが無効になっている場合のみ動作します。"
 msgid "Set as fork of"
 msgstr "フォーク元の設定"
 
+#: rhodecode/templates/admin/repos/repo_edit.html:264
+msgid "set"
+msgstr "保存"
+
 #: rhodecode/templates/admin/repos/repo_edit.html:268
 msgid "Manually set this repository as a fork of another from the list"
 msgstr "このリポジトリをリスト中の他のリポジトリのフォークとして、手動で設定します"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:274
-#: rhodecode/templates/changeset/changeset_file_comment.html:26
+#: rhodecode/templates/changeset/changeset_file_comment.html:41
 msgid "Delete"
 msgstr "削除"
 
@@ -2189,7 +2329,7 @@ msgstr "書込"
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
 #: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/base/base.html:229
+#: rhodecode/templates/base/base.html:235
 msgid "admin"
 msgstr "管理"
 
@@ -2199,8 +2339,7 @@ msgid "member"
 msgstr "メンバー"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-#: rhodecode/templates/data_table/_dt_elements.html:67
-#: rhodecode/templates/journal/journal.html:95
+#: rhodecode/templates/data_table/_dt_elements.html:61
 #: rhodecode/templates/summary/summary.html:85
 msgid "private repository"
 msgstr "非公開リポジトリ"
@@ -2243,15 +2382,12 @@ msgstr "子リポジトリにも適用"
 
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74
 msgid ""
-"Set or revoke permission to all children of that group, including "
-"repositories and other groups"
+"Set or revoke permission to all children of that group, including non-"
+"private repositories and other groups"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:9
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:313
-#: rhodecode/templates/base/base.html:315
-#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:128
 #: rhodecode/templates/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
@@ -2292,7 +2428,7 @@ msgid "add new repos group"
 msgstr "新しいリポジトリグループを追加"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55
 msgid "Group parent"
 msgstr "親グループ"
 
@@ -2300,7 +2436,7 @@ msgstr "親グループ"
 #: rhodecode/templates/admin/users/user_add.html:94
 #: rhodecode/templates/admin/users_groups/users_group_add.html:49
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "save"
 msgstr "保存"
 
@@ -2312,7 +2448,12 @@ msgstr "リポジトリグループを編集"
 msgid "edit repos group"
 msgstr "リポジトリグループを編集"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26
+#, fuzzy
+msgid "Add new child group"
+msgstr "新しいユーザーグループを追加"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
 msgid ""
 "Enable lock-by-pulling on group. This option will be applied to all other"
 " groups and repositories inside"
@@ -2323,8 +2464,9 @@ msgid "Repositories groups administratio
 msgstr "リポジトリグループ管理"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
-msgid "ADD NEW GROUP"
-msgstr "新しいグループを追加"
+#, fuzzy
+msgid "Add new group"
+msgstr "新しいユーザーグループを追加"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
 msgid "Number of toplevel repositories"
@@ -2336,21 +2478,13 @@ msgstr "トップレベルリポジトリの数"
 msgid "action"
 msgstr "アクション"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
-#: rhodecode/templates/admin/users/user_edit.html:259
-#: rhodecode/templates/admin/users_groups/users_groups.html:44
-#: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/data_table/_dt_elements.html:121
-msgid "delete"
-msgstr "削除"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
 #, 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] "このグループを削除してもよろしいですか？: %s %s リポジトリ"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68
 msgid "There are no repositories groups yet"
 msgstr "まだリポジトリグループがありません"
 
@@ -2496,7 +2630,9 @@ msgstr "VCSの操作にSSLを必須とする"
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
 "will return HTTP Error 406: Not Acceptable"
-msgstr "RhodeCodeはPushとPullにSSLを要求します。もしSSLでない場合、HTTP Error 406: Not Acceptalbeを返します"
+msgstr ""
+"RhodeCodeはPushとPullにSSLを要求します。もしSSLでない場合、HTTP Error 406: Not "
+"Acceptalbeを返します"
 
 #: rhodecode/templates/admin/settings/settings.html:209
 msgid "Hooks"
@@ -2549,13 +2685,10 @@ msgid ""
 "This a crucial application setting. If you are really sure you need to "
 "change this, you must restart application in order to make this setting "
 "take effect. Click this label to unlock."
-msgstr ""
-"これはアプリケーションの重要な設定です。本当に変更が必要でしょうか。"
-"もし、変更した場合、変更を反映さ競るためにアプリケーションを再起動する必要があります。"
-"アンロックにするにはこのラベルをクリックして下さい"
+msgstr "これはアプリケーションの重要な設定です。本当に変更が必要でしょうか。もし、変更した場合、変更を反映さ競るためにアプリケーションを再起動する必要があります。アンロックにするにはこのラベルをクリックして下さい"
 
 #: rhodecode/templates/admin/settings/settings.html:262
-#: rhodecode/templates/base/base.html:221
+#: rhodecode/templates/base/base.html:227
 msgid "unlock"
 msgstr "アンロック"
 
@@ -2621,26 +2754,30 @@ msgstr "メールアドレス:"
 msgid "API key"
 msgstr "APIキー"
 
-#: rhodecode/templates/admin/users/user_edit.html:63
+#: rhodecode/templates/admin/users/user_edit.html:48
+msgid "Your IP"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:67
 msgid "LDAP DN"
 msgstr "LDAP DN"
 
-#: rhodecode/templates/admin/users/user_edit.html:72
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:35
+#: rhodecode/templates/admin/users/user_edit.html:76
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: rhodecode/templates/admin/users/user_edit.html:81
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
+#: rhodecode/templates/admin/users/user_edit.html:85
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48
 msgid "New password confirmation"
 msgstr "新しいパスワード 再入力"
 
-#: rhodecode/templates/admin/users/user_edit.html:151
+#: rhodecode/templates/admin/users/user_edit.html:155
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
 msgid "Inherit default permissions"
 msgstr "デフォルトの権限を継承する"
 
-#: rhodecode/templates/admin/users/user_edit.html:156
+#: rhodecode/templates/admin/users/user_edit.html:160
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113
 #, python-format
 msgid ""
@@ -2648,53 +2785,31 @@ msgid ""
 "options does not have any action"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:162
+#: rhodecode/templates/admin/users/user_edit.html:166
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr "リポジトリを作成する"
 
-#: rhodecode/templates/admin/users/user_edit.html:170
+#: rhodecode/templates/admin/users/user_edit.html:174
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127
 msgid "Fork repositories"
 msgstr "リポジトリをフォークする"
 
-#: rhodecode/templates/admin/users/user_edit.html:190
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
-msgid "Nothing here yet"
-msgstr "まだありません"
-
-#: rhodecode/templates/admin/users/user_edit.html:197
-#: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:217
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
-msgid "Permission"
-msgstr "権限"
-
-#: rhodecode/templates/admin/users/user_edit.html:198
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
-msgid "Edit Permission"
-msgstr "権限の編集"
-
-#: rhodecode/templates/admin/users/user_edit.html:247
+#: rhodecode/templates/admin/users/user_edit.html:251
 msgid "Email addresses"
 msgstr "メールアドレス"
 
-#: rhodecode/templates/admin/users/user_edit.html:260
+#: rhodecode/templates/admin/users/user_edit.html:264
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr "このメールを削除してよろしいですか: %s"
 
-#: rhodecode/templates/admin/users/user_edit.html:274
+#: rhodecode/templates/admin/users/user_edit.html:278
 msgid "New email address"
 msgstr "新しいメールアドレス"
 
-#: rhodecode/templates/admin/users/user_edit.html:281
-msgid "Add"
-msgstr "追加"
-
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:124
+#: rhodecode/templates/base/base.html:130
 msgid "My account"
 msgstr "アカウント"
 
@@ -2707,7 +2822,7 @@ msgid "My permissions"
 msgstr "権限"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:57
 msgid "My repos"
 msgstr "リポジトリ"
 
@@ -2716,6 +2831,7 @@ msgid "My pull requests"
 msgstr "プルリクエスト"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:45
+#: rhodecode/templates/journal/journal.html:61
 msgid "Add repo"
 msgstr "リポジトリの追加"
 
@@ -2742,50 +2858,18 @@ msgstr "レビュアーとして参加"
 msgid "Pull request #%s opened by %s on %s"
 msgstr "プルリクエスト #%s %s によって %s に作成"
 
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7
-#: rhodecode/templates/bookmarks/bookmarks.html:40
-#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:54
-#: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:8
-#: rhodecode/templates/tags/tags.html:55
-#: rhodecode/templates/tags/tags_data.html:9
-msgid "Revision"
-msgstr "リビジョン"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/journal/journal_page_repos.html:29
-msgid "private"
-msgstr "非公開"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31
-#: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/journal/journal_page_repos.html:32
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr "このリポジトリを削除しますか？ : %s"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38
-#: rhodecode/templates/journal/journal_page_repos.html:42
-msgid "No repositories yet"
-msgstr "まだリポジトリがありません"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40
-#: rhodecode/templates/journal/journal_page_repos.html:44
-msgid "create one now"
-msgstr "今すぐ作成する"
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "ユーザー管理"
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:235
+#: rhodecode/templates/base/base.html:241
 msgid "users"
 msgstr "ユーザー"
 
 #: rhodecode/templates/admin/users/users.html:23
-msgid "ADD NEW USER"
+#, fuzzy
+msgid "Add new user"
 msgstr "新しいユーザーを追加"
 
 #: rhodecode/templates/admin/users/users.html:77
@@ -2810,7 +2894,7 @@ msgid "active"
 msgstr "アクティブ"
 
 #: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:244
 msgid "ldap"
 msgstr "LDAP"
 
@@ -2876,7 +2960,8 @@ msgid "Users groups administration"
 msgstr "ユーザーグループ管理"
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:23
-msgid "ADD NEW USER GROUP"
+#, fuzzy
+msgid "Add new user group"
 msgstr "新しいユーザーグループを追加"
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:32
@@ -2897,149 +2982,155 @@ msgstr "ユーザグループを削除しますか？: %s"
 msgid "Submit a bug"
 msgstr "バグレポート"
 
-#: rhodecode/templates/base/base.html:77
+#: rhodecode/templates/base/base.html:76
+#, fuzzy
+msgid "Not logged in"
+msgstr "最終ログイン日"
+
+#: rhodecode/templates/base/base.html:83
 msgid "Login to your account"
 msgstr "ログイン"
 
-#: rhodecode/templates/base/base.html:100
+#: rhodecode/templates/base/base.html:106
 msgid "Forgot password ?"
 msgstr "パスワードを忘れた場合はこちら"
 
-#: rhodecode/templates/base/base.html:107
+#: rhodecode/templates/base/base.html:113
 msgid "Log In"
 msgstr "ログイン"
 
-#: rhodecode/templates/base/base.html:118
+#: rhodecode/templates/base/base.html:124
 msgid "Inbox"
 msgstr "受信箱"
 
-#: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:322
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:129
+#: rhodecode/templates/base/base.html:297
+#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:301
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr "ジャーナル"
 
-#: rhodecode/templates/base/base.html:125
+#: rhodecode/templates/base/base.html:131
 msgid "Log Out"
 msgstr "ログアウト"
 
-#: rhodecode/templates/base/base.html:144
+#: rhodecode/templates/base/base.html:150
 msgid "Switch repository"
 msgstr "リポジトリの切り替え"
 
-#: rhodecode/templates/base/base.html:146
-msgid "Products"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:152
-#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47
-msgid "loading..."
-msgstr "読み込み中..."
+msgid "Products"
+msgstr ""
 
 #: rhodecode/templates/base/base.html:158
-#: rhodecode/templates/base/base.html:160
-#: rhodecode/templates/base/base.html:162
-#: rhodecode/templates/data_table/_dt_elements.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:17
-#: rhodecode/templates/data_table/_dt_elements.html:19
-msgid "Summary"
-msgstr "要約"
+#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47
+msgid "loading..."
+msgstr "読み込み中..."
 
 #: rhodecode/templates/base/base.html:166
 #: rhodecode/templates/base/base.html:168
 #: rhodecode/templates/base/base.html:170
+#: rhodecode/templates/data_table/_dt_elements.html:9
+#: rhodecode/templates/data_table/_dt_elements.html:11
+#: rhodecode/templates/data_table/_dt_elements.html:13
+msgid "Summary"
+msgstr "要約"
+
+#: rhodecode/templates/base/base.html:174
+#: rhodecode/templates/base/base.html:176
+#: rhodecode/templates/base/base.html:178
 #: rhodecode/templates/changelog/changelog.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:23
-#: rhodecode/templates/data_table/_dt_elements.html:25
-#: rhodecode/templates/data_table/_dt_elements.html:27
+#: rhodecode/templates/data_table/_dt_elements.html:17
+#: rhodecode/templates/data_table/_dt_elements.html:19
+#: rhodecode/templates/data_table/_dt_elements.html:21
 msgid "Changelog"
 msgstr "履歴"
 
-#: rhodecode/templates/base/base.html:175
-#: rhodecode/templates/base/base.html:177
-#: rhodecode/templates/base/base.html:179
+#: rhodecode/templates/base/base.html:182
+#: rhodecode/templates/base/base.html:184
+#: rhodecode/templates/base/base.html:186
 msgid "Switch to"
 msgstr "ブランチの切り替え"
 
-#: rhodecode/templates/base/base.html:186
-#: rhodecode/templates/base/base.html:188
-#: rhodecode/templates/base/base.html:190
-#: rhodecode/templates/data_table/_dt_elements.html:31
-#: rhodecode/templates/data_table/_dt_elements.html:33
-#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/base/base.html:193
+#: rhodecode/templates/base/base.html:195
+#: rhodecode/templates/base/base.html:197
+#: rhodecode/templates/data_table/_dt_elements.html:25
+#: rhodecode/templates/data_table/_dt_elements.html:27
+#: rhodecode/templates/data_table/_dt_elements.html:29
 msgid "Files"
 msgstr "ファイル"
 
-#: rhodecode/templates/base/base.html:195
-#: rhodecode/templates/base/base.html:199
+#: rhodecode/templates/base/base.html:201
+#: rhodecode/templates/base/base.html:205
 msgid "Options"
 msgstr "オプション"
 
-#: rhodecode/templates/base/base.html:204
-#: rhodecode/templates/base/base.html:206
+#: rhodecode/templates/base/base.html:210
+#: rhodecode/templates/base/base.html:212
 msgid "repository settings"
 msgstr "リポジトリ設定"
 
-#: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/data_table/_dt_elements.html:80
+#: rhodecode/templates/base/base.html:216
+#: rhodecode/templates/data_table/_dt_elements.html:74
 #: rhodecode/templates/forks/fork.html:13
 msgid "fork"
 msgstr "フォーク"
 
-#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50
+#: rhodecode/templates/base/base.html:218
 #: rhodecode/templates/changelog/changelog.html:43
-msgid "Open new pull request"
+#, fuzzy
+msgid "open new pull request"
 msgstr "新しいプルリクエストを作成"
 
-#: rhodecode/templates/base/base.html:215
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
+#: rhodecode/templates/base/base.html:221
+#, fuzzy
+msgid "compare fork"
 msgstr "フォークを比較"
 
-#: rhodecode/templates/base/base.html:217
+#: rhodecode/templates/base/base.html:223
 msgid "search"
 msgstr "検索"
 
-#: rhodecode/templates/base/base.html:223
+#: rhodecode/templates/base/base.html:229
 msgid "lock"
 msgstr "ロック"
 
-#: rhodecode/templates/base/base.html:234
+#: rhodecode/templates/base/base.html:240
 msgid "repositories groups"
 msgstr "リポジトリグループ"
 
-#: rhodecode/templates/base/base.html:236
+#: rhodecode/templates/base/base.html:242
 msgid "users groups"
 msgstr "ユーザーグループ"
 
-#: rhodecode/templates/base/base.html:237
+#: rhodecode/templates/base/base.html:243
 msgid "permissions"
 msgstr "権限"
 
-#: rhodecode/templates/base/base.html:239
+#: rhodecode/templates/base/base.html:245
 msgid "defaults"
 msgstr "デフォルト設定"
 
-#: rhodecode/templates/base/base.html:240
+#: rhodecode/templates/base/base.html:246
 msgid "settings"
 msgstr "設定"
 
-#: rhodecode/templates/base/base.html:251
-#: rhodecode/templates/base/base.html:253
+#: rhodecode/templates/base/base.html:256
+#: rhodecode/templates/base/base.html:258
 msgid "Followers"
 msgstr "フォロワー"
 
-#: rhodecode/templates/base/base.html:259
-#: rhodecode/templates/base/base.html:261
+#: rhodecode/templates/base/base.html:264
+#: rhodecode/templates/base/base.html:266
 msgid "Forks"
 msgstr "フォーク"
 
-#: rhodecode/templates/base/base.html:340
-#: rhodecode/templates/base/base.html:342
-#: rhodecode/templates/base/base.html:344
+#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:319
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "検索"
@@ -3049,7 +3140,7 @@ msgid "add another comment"
 msgstr "別のコメントを追加"
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:83
+#: rhodecode/templates/data_table/_dt_elements.html:140
 #: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr "このリポジトリのフォローをやめる"
@@ -3071,6 +3162,10 @@ msgstr "検索結果は省略されています"
 msgid "no matching files"
 msgstr "マッチするファイルはありません"
 
+#: rhodecode/templates/base/root.html:50
+msgid "Open new pull request"
+msgstr "新しいプルリクエストを作成"
+
 #: rhodecode/templates/base/root.html:51
 msgid "Open new pull request for selected changesets"
 msgstr "選択したチェンジセットから新しいプルリクエストを作成"
@@ -3097,6 +3192,15 @@ msgstr "%s ブックマーク"
 msgid "Author"
 msgstr "作成者"
 
+#: rhodecode/templates/bookmarks/bookmarks.html:40
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/tags/tags_data.html:9
+msgid "Revision"
+msgstr "リビジョン"
+
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
@@ -3162,7 +3266,8 @@ msgstr "リビジョンステータス"
 
 #: rhodecode/templates/changelog/changelog.html:94
 #: rhodecode/templates/shortlog/shortlog_data.html:20
-msgid "Click to open associated pull request"
+#, fuzzy, python-format
+msgid "Click to open associated pull request #%s"
 msgstr "関連するプルリクエストを開く"
 
 #: rhodecode/templates/changelog/changelog.html:104
@@ -3201,7 +3306,7 @@ msgstr "ブックマーク"
 msgid "tag"
 msgstr "タグ"
 
-#: rhodecode/templates/changelog/changelog.html:301
+#: rhodecode/templates/changelog/changelog.html:302
 msgid "There are no changes yet"
 msgstr "まだ変更がありません"
 
@@ -3258,14 +3363,14 @@ msgid "download diff"
 msgstr "差分をダウンロード"
 
 #: rhodecode/templates/changeset/changeset.html:76
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d コメント"
 
 #: rhodecode/templates/changeset/changeset.html:76
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
@@ -3273,7 +3378,7 @@ msgstr[0] "(%d インライン)"
 
 #: rhodecode/templates/changeset/changeset.html:122
 #: rhodecode/templates/compare/compare_diff.html:44
-#: rhodecode/templates/pullrequests/pullrequest_show.html:76
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
@@ -3281,62 +3386,72 @@ msgstr[0] "%s ファイルに影響"
 
 #: rhodecode/templates/changeset/changeset.html:124
 #: rhodecode/templates/compare/compare_diff.html:46
-#: rhodecode/templates/pullrequests/pullrequest_show.html:78
+#: rhodecode/templates/pullrequests/pullrequest_show.html:96
 #, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
 msgstr[0] "%s ファイルに影響。 %s 個の追加と %s 個の削除"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:42
+#: rhodecode/templates/changeset/changeset_file_comment.html:30
+#, fuzzy, python-format
+msgid "Status from pull request %s"
+msgstr "すべてのプルリクエスト"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:32
+#, fuzzy, python-format
+msgid "Comment from pull request %s"
+msgstr "プルリクエストに[コメント]"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:57
 msgid "Submitting..."
 msgstr "サブミット中..."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:45
+#: rhodecode/templates/changeset/changeset_file_comment.html:60
 msgid "Commenting on line {1}."
 msgstr "{1} 行目にコメント"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:46
-#: rhodecode/templates/changeset/changeset_file_comment.html:121
+#: rhodecode/templates/changeset/changeset_file_comment.html:61
+#: rhodecode/templates/changeset/changeset_file_comment.html:140
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr "コメントには %s 構文 ( %s サポートつき ) が利用出来ます"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:48
-#: rhodecode/templates/changeset/changeset_file_comment.html:123
+#: rhodecode/templates/changeset/changeset_file_comment.html:63
+#: rhodecode/templates/changeset/changeset_file_comment.html:142
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr "テキスト内で @username を使うと、この RhodeCode のユーザーに通知を送信します"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:59
-#: rhodecode/templates/changeset/changeset_file_comment.html:143
+#: rhodecode/templates/changeset/changeset_file_comment.html:74
+#: rhodecode/templates/changeset/changeset_file_comment.html:162
 msgid "Comment"
 msgstr "コメント"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:60
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+#: rhodecode/templates/changeset/changeset_file_comment.html:75
+#: rhodecode/templates/changeset/changeset_file_comment.html:86
 msgid "Hide"
 msgstr "隠す"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 msgid "You need to be logged in to comment."
 msgstr "コメントするにはログインが必要です"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 msgid "Login now"
 msgstr "今すぐログインする"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:118
+#: rhodecode/templates/changeset/changeset_file_comment.html:137
 msgid "Leave a comment"
 msgstr "コメントを残す"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:125
+#: rhodecode/templates/changeset/changeset_file_comment.html:144
 msgid "Check this to change current status of code-review for this changeset"
 msgstr "チェックするとチェンジセットの現在のコードレビューステータスを変更出来ます"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:125
+#: rhodecode/templates/changeset/changeset_file_comment.html:144
 msgid "change status"
 msgstr "ステータスを変更する"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:145
+#: rhodecode/templates/changeset/changeset_file_comment.html:164
 msgid "Comment and close"
 msgstr "コメントしてクローズ"
 
@@ -3371,65 +3486,67 @@ msgid "No changesets"
 msgstr "チェンジセットはありません"
 
 #: rhodecode/templates/compare/compare_diff.html:37
-#: rhodecode/templates/pullrequests/pullrequest_show.html:69
+#: rhodecode/templates/pullrequests/pullrequest_show.html:87
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
 msgstr[0] "%s コミットを表示"
 
 #: rhodecode/templates/compare/compare_diff.html:52
-#: rhodecode/templates/pullrequests/pullrequest_show.html:84
+#: rhodecode/templates/pullrequests/pullrequest_show.html:102
 msgid "No files"
 msgstr "ファイルはありません"
 
-#: rhodecode/templates/data_table/_dt_elements.html:39
-#: rhodecode/templates/data_table/_dt_elements.html:41
-#: rhodecode/templates/data_table/_dt_elements.html:43
+#: rhodecode/templates/data_table/_dt_elements.html:33
+#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/data_table/_dt_elements.html:37
 msgid "Fork"
 msgstr "フォーク"
 
-#: rhodecode/templates/data_table/_dt_elements.html:60
-#: rhodecode/templates/journal/journal.html:89
+#: rhodecode/templates/data_table/_dt_elements.html:54
 #: rhodecode/templates/summary/summary.html:77
 msgid "Mercurial repository"
 msgstr "Mercurialリポジトリ"
 
-#: rhodecode/templates/data_table/_dt_elements.html:62
-#: rhodecode/templates/journal/journal.html:91
+#: rhodecode/templates/data_table/_dt_elements.html:56
 #: rhodecode/templates/summary/summary.html:80
 msgid "Git repository"
 msgstr "Gitリポジトリ"
 
-#: rhodecode/templates/data_table/_dt_elements.html:69
-#: rhodecode/templates/journal/journal.html:97
+#: rhodecode/templates/data_table/_dt_elements.html:63
 #: rhodecode/templates/summary/summary.html:87
 msgid "public repository"
 msgstr "公開リポジトリ"
 
-#: rhodecode/templates/data_table/_dt_elements.html:80
+#: rhodecode/templates/data_table/_dt_elements.html:74
 #: rhodecode/templates/summary/summary.html:96
 #: rhodecode/templates/summary/summary.html:97
 msgid "Fork of"
 msgstr "フォーク元: "
 
-#: rhodecode/templates/data_table/_dt_elements.html:94
+#: rhodecode/templates/data_table/_dt_elements.html:88
 msgid "No changesets yet"
 msgstr "まだチェンジセットがありません"
 
-#: rhodecode/templates/data_table/_dt_elements.html:101
-#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:95
+#: rhodecode/templates/data_table/_dt_elements.html:97
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "%s の RSS フィードを購読"
 
-#: rhodecode/templates/data_table/_dt_elements.html:109
-#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "%s の ATOM フィードを購読"
 
 #: rhodecode/templates/data_table/_dt_elements.html:122
 #, python-format
+msgid "Confirm to delete this repository: %s"
+msgstr "このリポジトリを削除しますか？ : %s"
+
+#: rhodecode/templates/data_table/_dt_elements.html:131
+#, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "このユーザーを本当に削除してよろしいですか？: %s"
 
@@ -3473,14 +3590,14 @@ msgstr "タイトル"
 msgid "description"
 msgstr "説明"
 
-#: rhodecode/templates/email_templates/pull_request.html:11
+#: rhodecode/templates/email_templates/pull_request.html:7
+msgid "View this pull request here"
+msgstr "このプルリクエストを閲覧する"
+
+#: rhodecode/templates/email_templates/pull_request.html:12
 msgid "revisions for reviewing"
 msgstr "レビュー対象のリビジョン"
 
-#: rhodecode/templates/email_templates/pull_request.html:18
-msgid "View this pull request here"
-msgstr "このプルリクエストを閲覧する"
-
 #: rhodecode/templates/email_templates/pull_request_comment.html:4
 #, python-format
 msgid "User %s commented on pull request #%s for repository %s"
@@ -3640,7 +3757,7 @@ msgstr "アノテーションを表示"
 
 #: rhodecode/templates/files/files_edit.html:50
 #: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:53
+#: rhodecode/templates/files/files_source.html:55
 msgid "show as raw"
 msgstr "元のファイルを表示"
 
@@ -3687,12 +3804,25 @@ msgstr "ファイルの履歴を読み込む"
 msgid "show source"
 msgstr "ソースを表示"
 
-#: rhodecode/templates/files/files_source.html:44
+#: rhodecode/templates/files/files_source.html:29
+#, fuzzy, python-format
+msgid "edit on branch:%s"
+msgstr "削除されたブランチ: %s"
+
+#: rhodecode/templates/files/files_source.html:31
+msgid "edit on branch:?"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:31
+msgid "Editing files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:46
 #, python-format
 msgid "Binary file (%s)"
 msgstr "バイナリファイル (%s)"
 
-#: rhodecode/templates/files/files_source.html:53
+#: rhodecode/templates/files/files_source.html:55
 msgid "File is too big to display"
 msgstr "表示するには大きすぎるファイルです"
 
@@ -3767,6 +3897,10 @@ msgstr "フォーク"
 msgid "forked"
 msgstr "フォークしました"
 
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr "フォークを比較"
+
 #: rhodecode/templates/forks/forks_data.html:42
 msgid "There are no forks yet"
 msgstr "まだフォークがありません"
@@ -3794,26 +3928,10 @@ msgstr "RSSフィード"
 msgid "ATOM feed"
 msgstr "ATOMフィード"
 
-#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:54
 msgid "Watched"
 msgstr "ウォッチ"
 
-#: rhodecode/templates/journal/journal.html:54
-msgid "ADD"
-msgstr "追加"
-
-#: rhodecode/templates/journal/journal.html:77
-msgid "following user"
-msgstr "フォローしているユーザー"
-
-#: rhodecode/templates/journal/journal.html:77
-msgid "user"
-msgstr "ユーザー"
-
-#: rhodecode/templates/journal/journal.html:110
-msgid "You are not following any users or repositories"
-msgstr "まだどのユーザーもリポジトリもフォローしていません"
-
 #: rhodecode/templates/journal/journal_data.html:55
 msgid "No entries yet"
 msgstr "まだエントリがありません"
@@ -3844,17 +3962,17 @@ msgid "Detailed compare view"
 msgstr "比較ビュー詳細"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:100
+#: rhodecode/templates/pullrequests/pullrequest_show.html:118
 msgid "Pull request reviewers"
 msgstr "プルリクエストレビュアー"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:130
 msgid "owner"
 msgstr "所有者"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:127
+#: rhodecode/templates/pullrequests/pullrequest_show.html:145
 msgid "Add reviewer to this pull request."
 msgstr "このプルリクエストにレビュアーを追加"
 
@@ -3904,15 +4022,20 @@ msgstr[0] "%d レビュアー"
 msgid "pull request was reviewed by all reviewers"
 msgstr "プルリクエストはすべてのレビュアーにレビューされました"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:58
+#: rhodecode/templates/pullrequests/pullrequest_show.html:56
+#, fuzzy
+msgid "Origin repository"
+msgstr "Gitリポジトリ"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:76
 msgid "Created on"
 msgstr "作成日"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:83
 msgid "Compare view"
 msgstr "比較ビュー"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:130
 msgid "reviewer"
 msgstr "レビュアー"
 
@@ -4189,23 +4312,3 @@ msgstr "%s タグ"
 msgid "Compare tags"
 msgstr "タグの比較"
 
-#~ msgid ""
-#~ "%s repository is not mapped to db"
-#~ " perhaps it was created or renamed"
-#~ " from the file system please run "
-#~ "the application again in order to "
-#~ "rescan repositories"
-#~ msgstr ""
-#~ "%s "
-#~ "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。"
-
-#~ msgid ""
-#~ "%s repository is not mapped to db"
-#~ " perhaps it was moved or renamed  "
-#~ "from the filesystem please run the "
-#~ "application again in order to rescan "
-#~ "repositories"
-#~ msgstr ""
-#~ "%s "
-#~ "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。"
-