translations updates

rhodecode/i18n/en/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: rhodecode 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-07-26 23:35+0200\n"
+"POT-Creation-Date: 2012-09-02 20:30+0200\n"
 "PO-Revision-Date: 2011-02-25 19:13+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <[e-mail]>\n"
@@ -21,24 +21,30 b' msgstr ""'
 msgid "All Branches"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:81
+#: rhodecode/controllers/changeset.py:83
 msgid "show white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95
+#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
 msgid "ignore white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:155
+#: rhodecode/controllers/changeset.py:157
 #, python-format
 msgid "%s line context"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:331
-#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69
+#: rhodecode/controllers/changeset.py:333
+#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70
 msgid "binary file"
 msgstr ""
 
+#: rhodecode/controllers/changeset.py:408
+msgid ""
+"Changing status on a changeset associated witha closed pull request is "
+"not allowed"
+msgstr ""
+
 #: rhodecode/controllers/compare.py:69
 msgid "There are no changesets yet"
 msgstr ""
@@ -84,8 +90,7 b' msgid "commited on"'
 msgstr ""
 
 #: rhodecode/controllers/files.py:84
-#: rhodecode/templates/admin/repos/repo_add.html:13
-msgid "add new"
+msgid "click here to add new file"
 msgstr ""
 
 #: rhodecode/controllers/files.py:85
@@ -93,71 +98,76 b' msgstr ""'
 msgid "There are no files yet %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:254
+#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299
+#, python-format
+msgid "This repository is has been locked by %s on %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:266
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:259
+#: rhodecode/controllers/files.py:271
 msgid "No changes"
 msgstr ""
 
-#: rhodecode/controllers/files.py:270 rhodecode/controllers/files.py:324
+#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346
 #, python-format
 msgid "Successfully committed to %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:275 rhodecode/controllers/files.py:330
+#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/controllers/files.py:296
+#: rhodecode/controllers/files.py:318
 #, python-format
 msgid "Added %s via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:310
+#: rhodecode/controllers/files.py:332
 msgid "No content"
 msgstr ""
 
-#: rhodecode/controllers/files.py:314
+#: rhodecode/controllers/files.py:336
 msgid "No filename"
 msgstr ""
 
-#: rhodecode/controllers/files.py:356
+#: rhodecode/controllers/files.py:378
 msgid "downloads disabled"
 msgstr ""
 
-#: rhodecode/controllers/files.py:367
+#: rhodecode/controllers/files.py:389
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:369
+#: rhodecode/controllers/files.py:391
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/controllers/files.py:371
+#: rhodecode/controllers/files.py:393
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/controllers/files.py:472
+#: rhodecode/controllers/files.py:494
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70
-#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534
+#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72
+#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545
+#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76
+#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90
+#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -165,7 +175,7 b' msgid ""'
 "repositories"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72
+#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -173,12 +183,12 b' msgid ""'
 "repositories"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:164
+#: rhodecode/controllers/forks.py:167
 #, python-format
 msgid "forked %s repository as %s"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:178
+#: rhodecode/controllers/forks.py:181
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
@@ -188,36 +198,48 b' msgid "public journal"'
 msgstr ""
 
 #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243
-#: rhodecode/templates/base/base.html:218
+#: rhodecode/templates/base/base.html:220
 msgid "journal"
 msgstr ""
 
-#: rhodecode/controllers/login.py:130
+#: rhodecode/controllers/login.py:143
 msgid "You have successfully registered into rhodecode"
 msgstr ""
 
-#: rhodecode/controllers/login.py:151
+#: rhodecode/controllers/login.py:164
 msgid "Your password reset link was sent"
 msgstr ""
 
-#: rhodecode/controllers/login.py:171
+#: rhodecode/controllers/login.py:184
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540
+#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549
 msgid "Bookmarks"
 msgstr ""
 
+#: rhodecode/controllers/pullrequests.py:158
+msgid "Pull request requires a title with min. 3 chars"
+msgstr ""
+
 #: rhodecode/controllers/pullrequests.py:160
+msgid "error during creation of pull request"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:181
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:163
+#: rhodecode/controllers/pullrequests.py:184
 msgid "Error occurred during sending pull request"
 msgstr ""
 
+#: rhodecode/controllers/pullrequests.py:217
+msgid "Successfully deleted pull request"
+msgstr ""
+
 #: rhodecode/controllers/search.py:131
 msgid "Invalid search query. Try quoting it."
 msgstr ""
@@ -231,19 +253,19 b' msgid "An error occurred during this sea'
 msgstr ""
 
 #: rhodecode/controllers/settings.py:107
-#: rhodecode/controllers/admin/repos.py:264
+#: rhodecode/controllers/admin/repos.py:266
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
 #: rhodecode/controllers/settings.py:125
-#: rhodecode/controllers/admin/repos.py:282
+#: rhodecode/controllers/admin/repos.py:284
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr ""
 
 #: rhodecode/controllers/settings.py:143
-#: rhodecode/controllers/admin/repos.py:300
+#: rhodecode/controllers/admin/repos.py:302
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from "
@@ -252,14 +274,14 b' msgid ""'
 msgstr ""
 
 #: rhodecode/controllers/settings.py:155
-#: rhodecode/controllers/admin/repos.py:312
+#: rhodecode/controllers/admin/repos.py:314
 #, python-format
 msgid "deleted repository %s"
 msgstr ""
 
 #: rhodecode/controllers/settings.py:159
-#: rhodecode/controllers/admin/repos.py:322
-#: rhodecode/controllers/admin/repos.py:328
+#: rhodecode/controllers/admin/repos.py:324
+#: rhodecode/controllers/admin/repos.py:330
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
@@ -269,7 +291,7 b' msgid "No data loaded yet"'
 msgstr ""
 
 #: rhodecode/controllers/summary.py:142
-#: rhodecode/templates/summary/summary.html:144
+#: rhodecode/templates/summary/summary.html:148
 msgid "Statistics are disabled for this repository"
 msgstr ""
 
@@ -360,9 +382,9 b' msgstr ""'
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
 #: rhodecode/templates/base/base.html:197
-#: rhodecode/templates/base/base.html:335
 #: rhodecode/templates/base/base.html:337
 #: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:341
 msgid "Admin"
 msgstr ""
 
@@ -379,18 +401,20 b' msgid "allowed with automatic account ac'
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/controllers/admin/permissions.py:74
 msgid "Disabled"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:72
+#: rhodecode/controllers/admin/permissions.py:75
 msgid "Enabled"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:106
+#: rhodecode/controllers/admin/permissions.py:116
 msgid "Default permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:123
+#: rhodecode/controllers/admin/permissions.py:130
 msgid "error occurred during update of permissions"
 msgstr ""
 
@@ -398,120 +422,124 b' msgstr ""'
 msgid "--REMOVE FORK--"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:191
+#: rhodecode/controllers/admin/repos.py:192
 #, python-format
 msgid "created repository %s from %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:195
+#: rhodecode/controllers/admin/repos.py:196
 #, python-format
 msgid "created repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:226
+#: rhodecode/controllers/admin/repos.py:227
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:317
+#: rhodecode/controllers/admin/repos.py:319
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:346
+#: rhodecode/controllers/admin/repos.py:348
 msgid "An error occurred during deletion of repository user"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:365
+#: rhodecode/controllers/admin/repos.py:367
 msgid "An error occurred during deletion of repository users groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:382
+#: rhodecode/controllers/admin/repos.py:385
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:398
+#: rhodecode/controllers/admin/repos.py:402
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:418
-msgid "Updated repository visibility in public journal"
-msgstr ""
-
 #: rhodecode/controllers/admin/repos.py:422
-msgid "An error occurred during setting this repository in public journal"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269
-msgid "Token mismatch"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:440
-msgid "Pulled from remote location"
+msgid "An error occurred during unlocking"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:442
-msgid "An error occurred during pull from remote location"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:458
-msgid "Nothing"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:460
-#, python-format
-msgid "Marked repo %s as fork of %s"
+msgid "Updated repository visibility in public journal"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:446
+msgid "An error occurred during setting this repository in public journal"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299
+msgid "Token mismatch"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:464
+msgid "Pulled from remote location"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:466
+msgid "An error occurred during pull from remote location"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:482
+msgid "Nothing"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:484
+#, python-format
+msgid "Marked repo %s as fork of %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:488
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:119
+#: rhodecode/controllers/admin/repos_groups.py:116
 #, python-format
 msgid "created repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:132
+#: rhodecode/controllers/admin/repos_groups.py:129
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:166
+#: rhodecode/controllers/admin/repos_groups.py:163
 #, python-format
 msgid "updated repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:179
+#: rhodecode/controllers/admin/repos_groups.py:176
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:197
+#: rhodecode/controllers/admin/repos_groups.py:194
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:205
+#: rhodecode/controllers/admin/repos_groups.py:202
 #, python-format
 msgid "removed repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:210
+#: rhodecode/controllers/admin/repos_groups.py:208
 msgid "Cannot delete this group it still contains subgroups"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:215
-#: rhodecode/controllers/admin/repos_groups.py:220
+#: rhodecode/controllers/admin/repos_groups.py:213
+#: rhodecode/controllers/admin/repos_groups.py:218
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:240
+#: rhodecode/controllers/admin/repos_groups.py:238
 msgid "An error occurred during deletion of group user"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:260
+#: rhodecode/controllers/admin/repos_groups.py:258
 msgid "An error occurred during deletion of group users groups"
 msgstr ""
 
@@ -529,90 +557,109 b' msgid "Updated application settings"'
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:164
-#: rhodecode/controllers/admin/settings.py:230
+#: rhodecode/controllers/admin/settings.py:275
 msgid "error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:226
-msgid "Updated mercurial settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:240
+#: rhodecode/controllers/admin/settings.py:200
+msgid "Updated visualisation settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:205
+msgid "error occurred during updating visualisation settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:271
+msgid "Updated VCS settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:285
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:252
+#: rhodecode/controllers/admin/settings.py:297
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:256
+#: rhodecode/controllers/admin/settings.py:301
 msgid "error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:275
+#: rhodecode/controllers/admin/settings.py:320
 msgid "Email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:330
+#: rhodecode/controllers/admin/settings.py:375
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:361
+#: rhodecode/controllers/admin/settings.py:406
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:376
-#: rhodecode/controllers/admin/users.py:186
+#: rhodecode/controllers/admin/settings.py:421
+#: rhodecode/controllers/admin/users.py:191
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:127
+#: rhodecode/controllers/admin/users.py:130
 #, python-format
 msgid "created user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:139
+#: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:168
+#: rhodecode/controllers/admin/users.py:171
 msgid "User updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:202
-msgid "successfully deleted user"
-msgstr ""
-
 #: rhodecode/controllers/admin/users.py:207
+msgid "successfully deleted user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:212
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:221
+#: rhodecode/controllers/admin/users.py:226
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:253
-#: rhodecode/controllers/admin/users_groups.py:219
+#: rhodecode/controllers/admin/users.py:266
 msgid "Granted 'repository create' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:262
-#: rhodecode/controllers/admin/users_groups.py:229
+#: rhodecode/controllers/admin/users.py:271
 msgid "Revoked 'repository create' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:278
+#: rhodecode/controllers/admin/users.py:277
+msgid "Granted 'repository fork' permission to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:282
+msgid "Revoked 'repository fork' permission to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:288
+#: rhodecode/controllers/admin/users_groups.py:255
+msgid "An error occurred during permissions saving"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:303
 #, python-format
 msgid "Added email %s to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:284
+#: rhodecode/controllers/admin/users.py:309
 msgid "An error occurred during email saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users.py:319
 msgid "Removed email from user"
 msgstr ""
 
@@ -631,167 +678,183 b' msgstr ""'
 msgid "updated users group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:152
+#: rhodecode/controllers/admin/users_groups.py:157
 #, python-format
 msgid "error occurred during update of users group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:169
-msgid "successfully deleted users group"
-msgstr ""
-
 #: rhodecode/controllers/admin/users_groups.py:174
+msgid "successfully deleted users group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:179
 msgid "An error occurred during deletion of users group"
 msgstr ""
 
-#: rhodecode/lib/auth.py:497
+#: rhodecode/controllers/admin/users_groups.py:233
+msgid "Granted 'repository create' permission to users group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:238
+msgid "Revoked 'repository create' permission to users group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:244
+msgid "Granted 'repository fork' permission to users group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:249
+msgid "Revoked 'repository fork' permission to users group"
+msgstr ""
+
+#: rhodecode/lib/auth.py:499
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: rhodecode/lib/auth.py:538
+#: rhodecode/lib/auth.py:540
 msgid "You need to be a signed in to view this page"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:85
+#: rhodecode/lib/diffs.py:86
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:95
+#: rhodecode/lib/diffs.py:96
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:369
+#: rhodecode/lib/helpers.py:372
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:442
+#: rhodecode/lib/helpers.py:484
 msgid "True"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:446
+#: rhodecode/lib/helpers.py:488
 msgid "False"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:490
+#: rhodecode/lib/helpers.py:532
 msgid "Changeset not found"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:513
+#: rhodecode/lib/helpers.py:555
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:519
+#: rhodecode/lib/helpers.py:561
 msgid "compare view"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:539
+#: rhodecode/lib/helpers.py:581
 msgid "and"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:540
+#: rhodecode/lib/helpers.py:582
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46
+#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48
 msgid "revisions"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:564
+#: rhodecode/lib/helpers.py:606
 msgid "fork name "
 msgstr ""
 
-#: rhodecode/lib/helpers.py:578
+#: rhodecode/lib/helpers.py:620
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #: rhodecode/templates/pullrequests/pullrequest_show.html:12
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:584
+#: rhodecode/lib/helpers.py:626
 msgid "[deleted] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596
+#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638
 msgid "[created] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:588
+#: rhodecode/lib/helpers.py:630
 msgid "[created] repository as fork"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598
+#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640
 msgid "[forked] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600
+#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642
 msgid "[updated] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:594
+#: rhodecode/lib/helpers.py:636
 msgid "[delete] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:602
+#: rhodecode/lib/helpers.py:644
 msgid "[created] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:604
+#: rhodecode/lib/helpers.py:646
 msgid "[updated] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:606
+#: rhodecode/lib/helpers.py:648
 msgid "[created] users group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:608
+#: rhodecode/lib/helpers.py:650
 msgid "[updated] users group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:610
+#: rhodecode/lib/helpers.py:652
 msgid "[commented] on revision in repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:612
+#: rhodecode/lib/helpers.py:654
 msgid "[commented] on pull request for"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:614
+#: rhodecode/lib/helpers.py:656
 msgid "[closed] pull request for"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:616
+#: rhodecode/lib/helpers.py:658
 msgid "[pushed] into"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:618
+#: rhodecode/lib/helpers.py:660
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:620
+#: rhodecode/lib/helpers.py:662
 msgid "[pulled from remote] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:622
+#: rhodecode/lib/helpers.py:664
 msgid "[pulled] from"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:624
+#: rhodecode/lib/helpers.py:666
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:626
+#: rhodecode/lib/helpers.py:668
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:790
+#: rhodecode/lib/helpers.py:840
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:794
+#: rhodecode/lib/helpers.py:844
 msgid "No Files"
 msgstr ""
 
@@ -864,75 +927,83 b' msgstr ""'
 msgid "[Mention]"
 msgstr ""
 
-#: rhodecode/model/db.py:1063
+#: rhodecode/model/db.py:1140
 msgid "Repository no access"
 msgstr ""
 
-#: rhodecode/model/db.py:1064
+#: rhodecode/model/db.py:1141
 msgid "Repository read access"
 msgstr ""
 
-#: rhodecode/model/db.py:1065
+#: rhodecode/model/db.py:1142
 msgid "Repository write access"
 msgstr ""
 
-#: rhodecode/model/db.py:1066
+#: rhodecode/model/db.py:1143
 msgid "Repository admin access"
 msgstr ""
 
-#: rhodecode/model/db.py:1068
+#: rhodecode/model/db.py:1145
 msgid "Repositories Group no access"
 msgstr ""
 
-#: rhodecode/model/db.py:1069
+#: rhodecode/model/db.py:1146
 msgid "Repositories Group read access"
 msgstr ""
 
-#: rhodecode/model/db.py:1070
+#: rhodecode/model/db.py:1147
 msgid "Repositories Group write access"
 msgstr ""
 
-#: rhodecode/model/db.py:1071
+#: rhodecode/model/db.py:1148
 msgid "Repositories Group admin access"
 msgstr ""
 
-#: rhodecode/model/db.py:1073
+#: rhodecode/model/db.py:1150
 msgid "RhodeCode Administrator"
 msgstr ""
 
-#: rhodecode/model/db.py:1074
+#: rhodecode/model/db.py:1151
 msgid "Repository creation disabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1075
+#: rhodecode/model/db.py:1152
 msgid "Repository creation enabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1076
+#: rhodecode/model/db.py:1153
+msgid "Repository forking disabled"
+msgstr ""
+
+#: rhodecode/model/db.py:1154
+msgid "Repository forking enabled"
+msgstr ""
+
+#: rhodecode/model/db.py:1155
 msgid "Register disabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1077
+#: rhodecode/model/db.py:1156
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1080
+#: rhodecode/model/db.py:1159
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1481
+#: rhodecode/model/db.py:1579
 msgid "Not Reviewed"
 msgstr ""
 
-#: rhodecode/model/db.py:1482
+#: rhodecode/model/db.py:1580
 msgid "Approved"
 msgstr ""
 
-#: rhodecode/model/db.py:1483
+#: rhodecode/model/db.py:1581
 msgid "Rejected"
 msgstr ""
 
-#: rhodecode/model/db.py:1484
+#: rhodecode/model/db.py:1582
 msgid "Under Review"
 msgstr ""
 
@@ -983,155 +1054,164 b' msgstr ""'
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:526
+#: rhodecode/model/scm.py:535
 msgid "latest tip"
 msgstr ""
 
-#: rhodecode/model/user.py:240
+#: rhodecode/model/user.py:230
 msgid "new user registration"
 msgstr ""
 
-#: rhodecode/model/user.py:265 rhodecode/model/user.py:287
-#: rhodecode/model/user.py:309
+#: rhodecode/model/user.py:255 rhodecode/model/user.py:277
+#: rhodecode/model/user.py:299
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:333
+#: rhodecode/model/user.py:323
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:339
+#: rhodecode/model/user.py:329
 #, 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:52
+#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36
+msgid "Value cannot be an empty list"
+msgstr ""
+
+#: rhodecode/model/validators.py:82
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:54
-#, python-format
-msgid "Username \"%(username)s\" is forbidden"
-msgstr ""
-
-#: rhodecode/model/validators.py:56
-msgid ""
-"Username may only contain alphanumeric characters underscores, periods or"
-" dashes and must begin with alphanumeric character"
-msgstr ""
-
 #: rhodecode/model/validators.py:84
 #, python-format
+msgid "Username \"%(username)s\" is forbidden"
+msgstr ""
+
+#: rhodecode/model/validators.py:86
+msgid ""
+"Username may only contain alphanumeric characters underscores, periods or"
+" dashes and must begin with alphanumeric character"
+msgstr ""
+
+#: rhodecode/model/validators.py:114
+#, python-format
 msgid "Username %(username)s is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:103
+#: rhodecode/model/validators.py:133
 msgid "Invalid users group name"
 msgstr ""
 
-#: rhodecode/model/validators.py:104
+#: rhodecode/model/validators.py:134
 #, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:106
+#: rhodecode/model/validators.py:136
 msgid ""
 "users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 
-#: rhodecode/model/validators.py:144
+#: rhodecode/model/validators.py:174
 msgid "Cannot assign this group as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:145
+#: rhodecode/model/validators.py:175
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:147
+#: rhodecode/model/validators.py:177
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:205
+#: rhodecode/model/validators.py:235
 msgid "Invalid characters (non-ascii) in password"
 msgstr ""
 
-#: rhodecode/model/validators.py:220
+#: rhodecode/model/validators.py:250
 msgid "Passwords do not match"
 msgstr ""
 
-#: rhodecode/model/validators.py:237
+#: rhodecode/model/validators.py:267
 msgid "invalid password"
 msgstr ""
 
-#: rhodecode/model/validators.py:238
+#: rhodecode/model/validators.py:268
 msgid "invalid user name"
 msgstr ""
 
-#: rhodecode/model/validators.py:239
+#: rhodecode/model/validators.py:269
 msgid "Your account is disabled"
 msgstr ""
 
-#: rhodecode/model/validators.py:283
+#: rhodecode/model/validators.py:313
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr ""
 
-#: rhodecode/model/validators.py:285
+#: rhodecode/model/validators.py:315
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:286
+#: rhodecode/model/validators.py:316
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:288
+#: rhodecode/model/validators.py:318
 #, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:386
+#: rhodecode/model/validators.py:431
 msgid "invalid clone url"
 msgstr ""
 
-#: rhodecode/model/validators.py:387
-msgid "Invalid clone url, provide a valid clone http\\s url"
-msgstr ""
-
-#: rhodecode/model/validators.py:418
+#: rhodecode/model/validators.py:432
+msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
+msgstr ""
+
+#: rhodecode/model/validators.py:457
 msgid "Fork have to be the same type as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:439
+#: rhodecode/model/validators.py:478
 msgid "This username or users group name is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:509
+#: rhodecode/model/validators.py:562
 msgid "This is not a valid path"
 msgstr ""
 
-#: rhodecode/model/validators.py:524
+#: rhodecode/model/validators.py:577
 msgid "This e-mail address is already taken"
 msgstr ""
 
-#: rhodecode/model/validators.py:544
+#: rhodecode/model/validators.py:597
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
-#: rhodecode/model/validators.py:581
+#: rhodecode/model/validators.py:634
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 
+#: rhodecode/model/validators.py:653
+#, python-format
+msgid "Revisions %(revs)s are already part of pull request or have set status"
+msgstr ""
+
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr ""
@@ -1150,7 +1230,7 b' msgstr ""'
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:219
+#: rhodecode/templates/base/base.html:221
 msgid "repositories"
 msgstr ""
 
@@ -1170,9 +1250,9 b' msgid "Group name"'
 msgstr ""
 
 #: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:67
-#: rhodecode/templates/index_base.html:132
-#: rhodecode/templates/index_base.html:158
+#: rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/index_base.html:168
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:72
@@ -1190,15 +1270,15 b' msgstr ""'
 msgid "Repositories group"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:66
-#: rhodecode/templates/index_base.html:156
+#: rhodecode/templates/index_base.html:70
+#: rhodecode/templates/index_base.html:166
 #: 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:172
+#: rhodecode/templates/admin/users/user_edit.html:192
 #: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:154
-#: rhodecode/templates/admin/users/user_edit_my_account.html:190
+#: rhodecode/templates/admin/users/user_edit_my_account.html:157
+#: rhodecode/templates/admin/users/user_edit_my_account.html:193
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
@@ -1209,61 +1289,61 b' msgstr ""'
 #: rhodecode/templates/journal/journal.html:186
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:119
+#: rhodecode/templates/summary/summary.html:123
 #: rhodecode/templates/tags/tags.html:36
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:68
+#: rhodecode/templates/index_base.html:72
 msgid "Last change"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:69
-#: rhodecode/templates/index_base.html:161
-#: rhodecode/templates/admin/users/user_edit_my_account.html:156
+#: rhodecode/templates/index_base.html:73
+#: rhodecode/templates/index_base.html:171
+#: rhodecode/templates/admin/users/user_edit_my_account.html:159
 #: rhodecode/templates/journal/journal.html:188
 msgid "Tip"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:70
-#: rhodecode/templates/index_base.html:163
-#: rhodecode/templates/admin/repos/repo_edit.html:112
+#: rhodecode/templates/index_base.html:74
+#: rhodecode/templates/index_base.html:173
+#: rhodecode/templates/admin/repos/repo_edit.html:121
 #: rhodecode/templates/admin/repos/repos.html:73
 msgid "Owner"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:75
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/index_base.html:76
 msgid "Atom"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:102
-#: rhodecode/templates/index_base.html:104
+#: rhodecode/templates/index_base.html:110
+#: rhodecode/templates/index_base.html:112
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:109
-#: rhodecode/templates/index_base.html:111
+#: rhodecode/templates/index_base.html:117
+#: rhodecode/templates/index_base.html:119
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:130
+#: rhodecode/templates/index_base.html:140
 msgid "Group Name"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:148
-#: rhodecode/templates/index_base.html:188
+#: rhodecode/templates/index_base.html:158
+#: rhodecode/templates/index_base.html:198
 #: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:176
-#: rhodecode/templates/admin/users/users.html:105
+#: rhodecode/templates/admin/users/user_edit_my_account.html:179
+#: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
 #: rhodecode/templates/branches/branches.html:77
 #: rhodecode/templates/journal/journal.html:211
@@ -1271,11 +1351,11 b' msgstr ""'
 msgid "Click to sort ascending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:149
-#: rhodecode/templates/index_base.html:189
+#: rhodecode/templates/index_base.html:159
+#: rhodecode/templates/index_base.html:199
 #: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:177
-#: rhodecode/templates/admin/users/users.html:106
+#: rhodecode/templates/admin/users/user_edit_my_account.html:180
+#: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:78
 #: rhodecode/templates/journal/journal.html:212
@@ -1283,14 +1363,14 b' msgstr ""'
 msgid "Click to sort descending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:159
+#: rhodecode/templates/index_base.html:169
 msgid "Last Change"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:190
+#: rhodecode/templates/index_base.html:200
 #: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:178
-#: rhodecode/templates/admin/users/users.html:107
+#: rhodecode/templates/admin/users/user_edit_my_account.html:181
+#: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
 #: rhodecode/templates/branches/branches.html:79
 #: rhodecode/templates/journal/journal.html:213
@@ -1298,10 +1378,10 b' msgstr ""'
 msgid "No records found."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:191
+#: rhodecode/templates/index_base.html:201
 #: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:179
-#: rhodecode/templates/admin/users/users.html:108
+#: rhodecode/templates/admin/users/user_edit_my_account.html:182
+#: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:80
 #: rhodecode/templates/journal/journal.html:214
@@ -1309,10 +1389,10 b' msgstr ""'
 msgid "Data error."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:192
+#: rhodecode/templates/index_base.html:202
 #: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:180
-#: rhodecode/templates/admin/users/users.html:109
+#: rhodecode/templates/admin/users/user_edit_my_account.html:183
+#: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:81
 #: rhodecode/templates/journal/journal.html:215
@@ -1334,7 +1414,7 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_edit.html:50
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
 #: rhodecode/templates/base/base.html:83
-#: rhodecode/templates/summary/summary.html:118
+#: rhodecode/templates/summary/summary.html:122
 msgid "Username"
 msgstr ""
 
@@ -1407,7 +1487,7 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_add.html:77
 #: rhodecode/templates/admin/users/user_edit.html:104
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:120
+#: rhodecode/templates/summary/summary.html:124
 msgid "Email"
 msgstr ""
 
@@ -1569,13 +1649,13 b' msgid "E-mail Attribute"'
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/repos/repo_edit.html:132
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
 #: rhodecode/templates/admin/settings/hooks.html:73
 #: rhodecode/templates/admin/users/user_edit.html:129
-#: rhodecode/templates/admin/users/user_edit.html:154
+#: rhodecode/templates/admin/users/user_edit.html:174
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:115
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:93
 msgid "Save"
 msgstr ""
@@ -1595,8 +1675,8 b' msgid "Comments"'
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:252
 #: rhodecode/templates/base/base.html:254
+#: rhodecode/templates/base/base.html:256
 msgid "Pull requests"
 msgstr ""
 
@@ -1622,7 +1702,7 b' msgid "Permissions administration"'
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:125
+#: 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:139
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
@@ -1662,7 +1742,11 b' msgid "Repository creation"'
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:71
-#: rhodecode/templates/admin/repos/repo_edit.html:227
+msgid "Repository forking"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:78
+#: rhodecode/templates/admin/repos/repo_edit.html:241
 msgid "set"
 msgstr ""
 
@@ -1677,6 +1761,10 b' msgstr ""'
 msgid "Repositories"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_add.html:13
+msgid "add new"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
 #: rhodecode/templates/summary/summary.html:95
 #: rhodecode/templates/summary/summary.html:96
@@ -1755,8 +1843,8 b' msgstr ""'
 
 #: rhodecode/templates/admin/repos/repo_edit.html:13
 #: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:204
-#: rhodecode/templates/admin/users/user_edit.html:206
+#: rhodecode/templates/admin/users/user_edit.html:224
+#: rhodecode/templates/admin/users/user_edit.html:226
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
 #: rhodecode/templates/files/files_source.html:44
@@ -1790,19 +1878,29 b' msgstr ""'
 msgid "Enable download menu on summary page."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:117
+#: rhodecode/templates/admin/repos/repo_edit.html:112
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+msgid "Enable locking"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:116
+msgid "Enable lock-by-pulling on repository."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:126
 msgid "Change owner of this repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:133
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67
+#: 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:180
+#: rhodecode/templates/admin/settings/settings.html:168
+#: rhodecode/templates/admin/settings/settings.html:258
 #: rhodecode/templates/admin/users/user_edit.html:130
-#: rhodecode/templates/admin/users/user_edit.html:155
-#: rhodecode/templates/admin/users/user_edit.html:258
+#: rhodecode/templates/admin/users/user_edit.html:175
+#: rhodecode/templates/admin/users/user_edit.html:278
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:116
+#: 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
@@ -1810,90 +1908,126 b' msgstr ""'
 msgid "Reset"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:143
+#: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:146
+#: rhodecode/templates/admin/repos/repo_edit.html:155
 msgid "Statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:150
+#: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Reset current statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:150
+#: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Confirm to remove current statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:153
-msgid "Fetched to rev"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:154
-msgid "Stats gathered"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:162
+msgid "Fetched to rev"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:163
+msgid "Stats gathered"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:171
 msgid "Remote"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:166
+#: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Pull changes from remote location"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:166
+#: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Confirm to pull changes from remote side"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:177
-msgid "Cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:181
-msgid "Invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:181
-msgid "Confirm to invalidate repository cache"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:186
-#: rhodecode/templates/base/base.html:316
+msgid "Cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:190
+msgid "Invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:190
+msgid "Confirm to invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:195
 #: rhodecode/templates/base/base.html:318
 #: rhodecode/templates/base/base.html:320
+#: rhodecode/templates/base/base.html:322
 msgid "Public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:192
+#: rhodecode/templates/admin/repos/repo_edit.html:201
 msgid "Remove from public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:194
+#: rhodecode/templates/admin/repos/repo_edit.html:203
 msgid "Add to public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:199
+#: rhodecode/templates/admin/repos/repo_edit.html:208
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:206
+#: rhodecode/templates/admin/repos/repo_edit.html:215
+msgid "Locking"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:220
+msgid "Unlock locked repo"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:220
+msgid "Confirm to unlock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:223
+msgid "lock repo"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:223
+msgid "Confirm to lock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:224
+msgid "Repository is not locked"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:229
+msgid "Force locking on repository. Works only when anonymous access is disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:236
+msgid "Set as fork of"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:245
+msgid "Manually set this repository as a fork of another from the list"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:251
 #: rhodecode/templates/changeset/changeset_file_comment.html:26
 msgid "Delete"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:210
+#: rhodecode/templates/admin/repos/repo_edit.html:255
 msgid "Remove this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:210
+#: rhodecode/templates/admin/repos/repo_edit.html:255
 #: rhodecode/templates/journal/journal.html:84
 msgid "Confirm to delete this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:214
+#: rhodecode/templates/admin/repos/repo_edit.html:259
 msgid ""
 "This repository will be renamed in a special way in order to be "
 "unaccesible for RhodeCode and VCS systems.\n"
@@ -1901,14 +2035,6 b' msgid ""'
 "please do it manually"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:222
-msgid "Set as fork of"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:231
-msgid "Manually set this repository as a fork of another from the list"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
 msgid "none"
@@ -1926,8 +2052,8 b' 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:83
-#: rhodecode/templates/base/base.html:215
+#: rhodecode/templates/admin/users/users.html:85
+#: rhodecode/templates/base/base.html:217
 msgid "admin"
 msgstr ""
 
@@ -1956,18 +2082,18 b' msgstr ""'
 msgid "revoke"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:80
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:83
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67
 msgid "Add another member"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:94
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:97
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
 msgid "Failed to remove user"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:109
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:112
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96
 msgid "Failed to remove users group"
 msgstr ""
 
@@ -2005,7 +2131,7 b' 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:93
+#: rhodecode/templates/pullrequests/pullrequest_show.html:113
 msgid "save"
 msgstr ""
 
@@ -2017,6 +2143,12 b' msgstr ""'
 msgid "edit repos group"
 msgstr ""
 
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other"
+" groups and repositories inside"
+msgstr ""
+
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
 msgid "Repositories groups administration"
 msgstr ""
@@ -2030,13 +2162,13 b' msgid "Number of toplevel repositories"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
-#: rhodecode/templates/admin/users/users.html:85
+#: rhodecode/templates/admin/users/users.html:87
 #: rhodecode/templates/admin/users_groups/users_groups.html:35
 msgid "action"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
-#: rhodecode/templates/admin/users/user_edit.html:235
+#: rhodecode/templates/admin/users/user_edit.html:255
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 #: rhodecode/templates/data_table/_dt_elements.html:7
 #: rhodecode/templates/data_table/_dt_elements.html:103
@@ -2141,90 +2273,133 b' msgid "GA code"'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:112
-#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:167
+#: rhodecode/templates/admin/settings/settings.html:257
 msgid "Save settings"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:119
-msgid "VCS settings"
+msgid "Visualisation settings"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:128
-msgid "Web"
+msgid "Icons"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:133
+msgid "Show public repo icon on repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:137
+msgid "Show private repo icon on repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:144
+msgid "Meta-Tagging"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:149
+msgid "Stylify recognised metatags:"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:176
+msgid "VCS settings"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:185
+msgid "Web"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:190
 msgid "require ssl for vcs operations"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:135
+#: rhodecode/templates/admin/settings/settings.html:192
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
 "will return HTTP Error 406: Not Acceptable"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:141
+#: rhodecode/templates/admin/settings/settings.html:198
 msgid "Hooks"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:146
+#: rhodecode/templates/admin/settings/settings.html:203
 msgid "Update repository after push (hg update)"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:150
+#: rhodecode/templates/admin/settings/settings.html:207
 msgid "Show repository size after push"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:154
+#: rhodecode/templates/admin/settings/settings.html:211
 msgid "Log user push commands"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:158
+#: rhodecode/templates/admin/settings/settings.html:215
 msgid "Log user pull commands"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:162
+#: rhodecode/templates/admin/settings/settings.html:219
 msgid "advanced setup"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:167
+#: rhodecode/templates/admin/settings/settings.html:224
+msgid "Mercurial Extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:229
+msgid "largefiles extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:233
+msgid "hgsubversion extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:235
+msgid ""
+"Requires hgsubversion library installed. Allows clonning from svn remote "
+"locations"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:245
 msgid "Repositories location"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:172
+#: rhodecode/templates/admin/settings/settings.html:250
 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 ""
 
-#: rhodecode/templates/admin/settings/settings.html:173
+#: rhodecode/templates/admin/settings/settings.html:251
 msgid "unlock"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:174
+#: rhodecode/templates/admin/settings/settings.html:252
 msgid ""
 "Location where repositories are stored. After changing this value a "
 "restart, and rescan is required"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:194
+#: rhodecode/templates/admin/settings/settings.html:272
 msgid "Test Email"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:202
+#: rhodecode/templates/admin/settings/settings.html:280
 msgid "Email to"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:210
+#: rhodecode/templates/admin/settings/settings.html:288
 msgid "Send"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:216
+#: rhodecode/templates/admin/settings/settings.html:294
 msgid "System Info and Packages"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:219
+#: rhodecode/templates/admin/settings/settings.html:297
 msgid "show"
 msgstr ""
 
@@ -2287,37 +2462,57 b' msgstr ""'
 
 #: rhodecode/templates/admin/users/user_edit.html:147
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
+msgid "Inherit default permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:152
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:113
+#, python-format
+msgid ""
+"Select to inherit permissions from %s settings. With this selected below "
+"options does not have any action"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:158
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:166
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:127
+msgid "Fork repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:186
+#: 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:173
+#: rhodecode/templates/admin/users/user_edit.html:193
 #: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:191
+#: rhodecode/templates/admin/users/user_edit_my_account.html:194
 msgid "Permission"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:174
+#: rhodecode/templates/admin/users/user_edit.html:194
 msgid "Edit Permission"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:223
+#: rhodecode/templates/admin/users/user_edit.html:243
 msgid "Email addresses"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:236
+#: rhodecode/templates/admin/users/user_edit.html:256
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:250
+#: rhodecode/templates/admin/users/user_edit.html:270
 msgid "New email address"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:257
+#: rhodecode/templates/admin/users/user_edit.html:277
 msgid "Add"
 msgstr ""
 
@@ -2351,16 +2546,20 b' msgstr ""'
 msgid "Opened by me"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10
 #, python-format
 msgid "Pull request #%s opened on %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
+msgid "Confirm to delete this pull request"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26
 msgid "I participate in"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
@@ -2402,7 +2601,7 b' msgid "Users administration"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:221
+#: rhodecode/templates/base/base.html:223
 msgid "users"
 msgstr ""
 
@@ -2410,29 +2609,29 b' msgstr ""'
 msgid "ADD NEW USER"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:76
+#: rhodecode/templates/admin/users/users.html:77
 msgid "username"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:79
-msgid "firstname"
-msgstr ""
-
 #: rhodecode/templates/admin/users/users.html:80
-msgid "lastname"
+msgid "firstname"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:81
-msgid "last login"
+msgid "lastname"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:82
-#: rhodecode/templates/admin/users_groups/users_groups.html:34
-msgid "active"
+msgid "last login"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/base/base.html:224
+#: rhodecode/templates/admin/users_groups/users_groups.html:34
+msgid "active"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:86
+#: rhodecode/templates/base/base.html:226
 msgid "ldap"
 msgstr ""
 
@@ -2477,7 +2676,7 b' msgstr ""'
 msgid "Add all elements"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:126
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:146
 msgid "Group members"
 msgstr ""
 
@@ -2524,9 +2723,9 b' msgid "Inbox"'
 msgstr ""
 
 #: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:298
 #: rhodecode/templates/base/base.html:300
 #: rhodecode/templates/base/base.html:302
+#: rhodecode/templates/base/base.html:304
 #: rhodecode/templates/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
@@ -2550,9 +2749,9 b' msgid "Home"'
 msgstr ""
 
 #: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:307
 #: rhodecode/templates/base/base.html:309
 #: rhodecode/templates/base/base.html:311
+#: rhodecode/templates/base/base.html:313
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
@@ -2607,7 +2806,6 b' msgstr ""'
 #: 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/files/files.html:40
 msgid "Files"
 msgstr ""
 
@@ -2618,7 +2816,7 b' msgstr ""'
 
 #: rhodecode/templates/base/base.html:204
 #: rhodecode/templates/base/base.html:206
-#: rhodecode/templates/base/base.html:225
+#: rhodecode/templates/base/base.html:227
 msgid "settings"
 msgstr ""
 
@@ -2628,40 +2826,40 b' msgstr ""'
 msgid "fork"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/changelog/changelog.html:39
+#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/changelog/changelog.html:40
 msgid "Open new pull request"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/base/base.html:213
 msgid "search"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:220
-msgid "repositories groups"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:222
+msgid "repositories groups"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:224
 msgid "users groups"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:223
+#: rhodecode/templates/base/base.html:225
 msgid "permissions"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:236
 #: rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:240
 msgid "Followers"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:244
 #: rhodecode/templates/base/base.html:246
+#: rhodecode/templates/base/base.html:248
 msgid "Forks"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:325
 #: rhodecode/templates/base/base.html:327
 #: rhodecode/templates/base/base.html:329
+#: rhodecode/templates/base/base.html:331
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr ""
@@ -2766,46 +2964,46 b' msgstr ""'
 msgid "Compare fork"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:44
+#: rhodecode/templates/changelog/changelog.html:46
 msgid "Show"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:70
-#: rhodecode/templates/summary/summary.html:360
+#: rhodecode/templates/changelog/changelog.html:72
+#: rhodecode/templates/summary/summary.html:364
 msgid "show more"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:74
+#: rhodecode/templates/changelog/changelog.html:76
 msgid "Affected number of files, click to show more details"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:87
+#: rhodecode/templates/changelog/changelog.html:89
 #: rhodecode/templates/changeset/changeset.html:38
 #: rhodecode/templates/changeset/changeset_file_comment.html:20
 #: rhodecode/templates/changeset/changeset_range.html:46
 msgid "Changeset status"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:90
+#: rhodecode/templates/changelog/changelog.html:92
 msgid "Click to open associated pull request"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:100
+#: rhodecode/templates/changelog/changelog.html:102
 #: rhodecode/templates/changeset/changeset.html:78
 msgid "Parent"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:106
+#: rhodecode/templates/changelog/changelog.html:108
 #: rhodecode/templates/changeset/changeset.html:84
 msgid "No parents"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:111
+#: rhodecode/templates/changelog/changelog.html:113
 #: rhodecode/templates/changeset/changeset.html:88
 msgid "merge"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:114
+#: rhodecode/templates/changelog/changelog.html:116
 #: rhodecode/templates/changeset/changeset.html:91
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_add.html:33
@@ -2814,20 +3012,20 b' msgstr ""'
 msgid "branch"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:120
+#: rhodecode/templates/changelog/changelog.html:122
 msgid "bookmark"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:128
 #: rhodecode/templates/changeset/changeset.html:96
 msgid "tag"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:162
+#: rhodecode/templates/changelog/changelog.html:164
 msgid "Show selected changes __S -> __E"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:253
+#: rhodecode/templates/changelog/changelog.html:255
 msgid "There are no changes yet"
 msgstr ""
 
@@ -2965,7 +3163,7 b' msgstr ""'
 
 #: rhodecode/templates/changeset/changeset_range.html:54
 #: rhodecode/templates/compare/compare_diff.html:41
-#: rhodecode/templates/pullrequests/pullrequest_show.html:50
+#: rhodecode/templates/pullrequests/pullrequest_show.html:69
 msgid "Files affected"
 msgstr ""
 
@@ -3043,12 +3241,13 b' msgid "File diff"'
 msgstr ""
 
 #: rhodecode/templates/files/files.html:4
+#: rhodecode/templates/files/files.html:72
 #, python-format
-msgid "%s Files"
+msgid "%s files"
 msgstr ""
 
 #: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:336
+#: rhodecode/templates/summary/summary.html:340
 msgid "files"
 msgstr ""
 
@@ -3367,17 +3566,17 b' msgid "Detailed compare view"'
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:63
+#: rhodecode/templates/pullrequests/pullrequest_show.html:82
 msgid "Pull request reviewers"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:75
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
 msgid "owner"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:89
+#: rhodecode/templates/pullrequests/pullrequest_show.html:109
 msgid "Add reviewer to this pull request."
 msgstr ""
 
@@ -3404,19 +3603,34 b' msgstr ""'
 msgid "Closed %s"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:28
+#: rhodecode/templates/pullrequests/pullrequest_show.html:31
+msgid "Status"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Pull request status"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+#: rhodecode/templates/pullrequests/pullrequest_show.html:44
+msgid "Still not reviewed by"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:47
+#, python-format
+msgid "%d reviewer"
+msgid_plural "%d reviewers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:54
 msgid "Created on"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:61
 msgid "Compare view"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:46
+#: rhodecode/templates/pullrequests/pullrequest_show.html:65
 msgid "Incoming changesets"
 msgstr ""
 
@@ -3473,7 +3687,7 b' msgstr ""'
 msgid "File names"
 msgstr ""
 
-#: rhodecode/templates/search/search_commit.html:34
+#: rhodecode/templates/search/search_commit.html:35
 #: rhodecode/templates/search/search_content.html:21
 #: rhodecode/templates/search/search_path.html:15
 msgid "Permission denied"
@@ -3550,115 +3764,115 b' msgstr ""'
 msgid "remote clone"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:112
+#: rhodecode/templates/summary/summary.html:116
 msgid "Contact"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:126
-msgid "Clone url"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:129
-msgid "Show by Name"
-msgstr ""
-
 #: rhodecode/templates/summary/summary.html:130
+msgid "Clone url"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:133
+msgid "Show by Name"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:134
 msgid "Show by ID"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:138
+#: rhodecode/templates/summary/summary.html:142
 msgid "Trending files"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:146
-#: rhodecode/templates/summary/summary.html:162
-#: rhodecode/templates/summary/summary.html:190
+#: rhodecode/templates/summary/summary.html:150
+#: rhodecode/templates/summary/summary.html:166
+#: rhodecode/templates/summary/summary.html:194
 msgid "enable"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:154
-msgid "Download"
-msgstr ""
-
 #: rhodecode/templates/summary/summary.html:158
+msgid "Download"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:162
 msgid "There are no downloads yet"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:160
+#: rhodecode/templates/summary/summary.html:164
 msgid "Downloads are disabled for this repository"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:166
+#: rhodecode/templates/summary/summary.html:170
 msgid "Download as zip"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:169
+#: rhodecode/templates/summary/summary.html:173
 msgid "Check this to download archive with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:169
+#: rhodecode/templates/summary/summary.html:173
 msgid "with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:182
+#: rhodecode/templates/summary/summary.html:186
 msgid "Commit activity by day / author"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:193
+#: rhodecode/templates/summary/summary.html:197
 msgid "Stats gathered: "
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:214
+#: rhodecode/templates/summary/summary.html:218
 msgid "Shortlog"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:216
+#: rhodecode/templates/summary/summary.html:220
 msgid "Quick start"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:229
+#: rhodecode/templates/summary/summary.html:233
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:232
+#: rhodecode/templates/summary/summary.html:236
 msgid "Permalink to this readme"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:289
+#: rhodecode/templates/summary/summary.html:293
 #, python-format
 msgid "Download %s as %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:646
+#: rhodecode/templates/summary/summary.html:650
 msgid "commits"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:647
+#: rhodecode/templates/summary/summary.html:651
 msgid "files added"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:648
-msgid "files changed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:649
-msgid "files removed"
-msgstr ""
-
 #: rhodecode/templates/summary/summary.html:652
-msgid "commit"
+msgid "files changed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:653
+msgid "files removed"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:656
+msgid "commit"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:657
 msgid "file added"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:654
+#: rhodecode/templates/summary/summary.html:658
 msgid "file changed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:655
+#: rhodecode/templates/summary/summary.html:659
 msgid "file removed"
 msgstr ""
 

rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode 1.1.5\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-07-26 23:35+0200\n"
+"POT-Creation-Date: 2012-09-02 20:30+0200\n"
 "PO-Revision-Date: 2012-06-05 20:07+0100\n"
 "Last-Translator: Vincent Duvert <[e-mail]>\n"
 "Language-Team: fr <[e-mail]>\n"
@@ -21,24 +21,30 b' msgstr ""'
 msgid "All Branches"
 msgstr "Toutes les branches"
 
-#: rhodecode/controllers/changeset.py:81
+#: rhodecode/controllers/changeset.py:83
 msgid "show white space"
 msgstr "afficher les espaces et tabulations"
 
-#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95
+#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
 msgid "ignore white space"
 msgstr "ignorer les espaces et tabulations"
 
-#: rhodecode/controllers/changeset.py:155
+#: rhodecode/controllers/changeset.py:157
 #, python-format
 msgid "%s line context"
 msgstr "afficher %s lignes de contexte"
 
-#: rhodecode/controllers/changeset.py:331
-#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69
+#: rhodecode/controllers/changeset.py:333
+#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70
 msgid "binary file"
 msgstr "fichier binaire"
 
+#: rhodecode/controllers/changeset.py:408
+msgid ""
+"Changing status on a changeset associated witha closed pull request is "
+"not allowed"
+msgstr ""
+
 #: rhodecode/controllers/compare.py:69
 #, fuzzy
 msgid "There are no changesets yet"
@@ -89,80 +95,85 b' msgid "commited on"'
 msgstr "a commité, le"
 
 #: rhodecode/controllers/files.py:84
-#: rhodecode/templates/admin/repos/repo_add.html:13
-msgid "add new"
-msgstr "ajouter un nouveau"
+#, fuzzy
+msgid "click here to add new file"
+msgstr "Ajouter un fichier"
 
 #: rhodecode/controllers/files.py:85
 #, python-format
 msgid "There are no files yet %s"
 msgstr "Il n’y a pas encore de fichiers %s"
 
-#: rhodecode/controllers/files.py:254
+#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299
+#, python-format
+msgid "This repository is has been locked by %s on %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:266
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr "%s édité via RhodeCode"
 
-#: rhodecode/controllers/files.py:259
+#: rhodecode/controllers/files.py:271
 msgid "No changes"
 msgstr "Aucun changement"
 
-#: rhodecode/controllers/files.py:270 rhodecode/controllers/files.py:324
+#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Commit réalisé avec succès sur %s"
 
-#: rhodecode/controllers/files.py:275 rhodecode/controllers/files.py:330
+#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352
 msgid "Error occurred during commit"
 msgstr "Une erreur est survenue durant le commit"
 
-#: rhodecode/controllers/files.py:296
+#: rhodecode/controllers/files.py:318
 #, python-format
 msgid "Added %s via RhodeCode"
 msgstr "%s ajouté par RhodeCode"
 
-#: rhodecode/controllers/files.py:310
+#: rhodecode/controllers/files.py:332
 msgid "No content"
 msgstr "Aucun contenu"
 
-#: rhodecode/controllers/files.py:314
+#: rhodecode/controllers/files.py:336
 msgid "No filename"
 msgstr "Aucun nom de fichier"
 
-#: rhodecode/controllers/files.py:356
+#: rhodecode/controllers/files.py:378
 msgid "downloads disabled"
 msgstr "Les téléchargements sont désactivés"
 
-#: rhodecode/controllers/files.py:367
+#: rhodecode/controllers/files.py:389
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Révision %s inconnue."
 
-#: rhodecode/controllers/files.py:369
+#: rhodecode/controllers/files.py:391
 msgid "Empty repository"
 msgstr "Dépôt vide."
 
-#: rhodecode/controllers/files.py:371
+#: rhodecode/controllers/files.py:393
 msgid "Unknown archive type"
 msgstr "Type d’archive inconnu"
 
-#: rhodecode/controllers/files.py:472
+#: rhodecode/controllers/files.py:494
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "Changesets"
 
-#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70
-#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534
+#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72
+#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543
 msgid "Branches"
 msgstr "Branches"
 
-#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545
+#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76
+#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554
 msgid "Tags"
 msgstr "Tags"
 
-#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90
+#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -173,7 +184,7 b' msgstr ""'
 "probablement été créé ou renommé manuellement. Veuillez relancer "
 "l’application pour rescanner les dépôts."
 
-#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72
+#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -184,12 +195,12 b' msgstr ""'
 "probablement été créé ou renommé manuellement. Veuillez relancer "
 "l’application pour rescanner les dépôts."
 
-#: rhodecode/controllers/forks.py:164
+#: rhodecode/controllers/forks.py:167
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "dépôt %s forké en tant que %s"
 
-#: rhodecode/controllers/forks.py:178
+#: rhodecode/controllers/forks.py:181
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "Une erreur est survenue durant le fork du dépôt %s."
@@ -200,19 +211,19 b' msgid "public journal"'
 msgstr "Journal public"
 
 #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243
-#: rhodecode/templates/base/base.html:218
+#: rhodecode/templates/base/base.html:220
 msgid "journal"
 msgstr "Journal"
 
-#: rhodecode/controllers/login.py:130
+#: rhodecode/controllers/login.py:143
 msgid "You have successfully registered into rhodecode"
 msgstr "Vous vous êtes inscrits avec succès à RhodeCode"
 
-#: rhodecode/controllers/login.py:151
+#: rhodecode/controllers/login.py:164
 msgid "Your password reset link was sent"
 msgstr "Un lien de rénitialisation de votre mot de passe vous a été envoyé."
 
-#: rhodecode/controllers/login.py:171
+#: rhodecode/controllers/login.py:184
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
@@ -220,21 +231,34 b' msgstr ""'
 "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a "
 "été envoyé par e-mail."
 
-#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540
+#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549
 #, fuzzy
 msgid "Bookmarks"
 msgstr "Signets"
 
+#: rhodecode/controllers/pullrequests.py:158
+msgid "Pull request requires a title with min. 3 chars"
+msgstr ""
+
 #: rhodecode/controllers/pullrequests.py:160
+msgid "error during creation of pull request"
+msgstr "erreur lors de la création de la demande traction"
+
+#: rhodecode/controllers/pullrequests.py:181
 #, fuzzy
 msgid "Successfully opened new pull request"
 msgstr "L’utilisateur a été supprimé avec succès."
 
-#: rhodecode/controllers/pullrequests.py:163
+#: rhodecode/controllers/pullrequests.py:184
 #, fuzzy
 msgid "Error occurred during sending pull request"
 msgstr "Une erreur est survenue durant la création du dépôt %s."
 
+#: rhodecode/controllers/pullrequests.py:217
+#, fuzzy
+msgid "Successfully deleted pull request"
+msgstr "L’utilisateur a été supprimé avec succès."
+
 #: rhodecode/controllers/search.py:131
 msgid "Invalid search query. Try quoting it."
 msgstr "Requête invalide. Essayer de la mettre entre guillemets."
@@ -250,19 +274,19 b' msgid "An error occurred during this sea'
 msgstr "Une erreur est survenue durant l’opération de recherche."
 
 #: rhodecode/controllers/settings.py:107
-#: rhodecode/controllers/admin/repos.py:264
+#: rhodecode/controllers/admin/repos.py:266
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Dépôt %s mis à jour avec succès."
 
 #: rhodecode/controllers/settings.py:125
-#: rhodecode/controllers/admin/repos.py:282
+#: rhodecode/controllers/admin/repos.py:284
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr "Une erreur est survenue lors de la mise à jour du dépôt %s."
 
 #: rhodecode/controllers/settings.py:143
-#: rhodecode/controllers/admin/repos.py:300
+#: rhodecode/controllers/admin/repos.py:302
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from "
@@ -274,14 +298,14 b' msgstr ""'
 "l’application pour rescanner les dépôts."
 
 #: rhodecode/controllers/settings.py:155
-#: rhodecode/controllers/admin/repos.py:312
+#: rhodecode/controllers/admin/repos.py:314
 #, python-format
 msgid "deleted repository %s"
 msgstr "Dépôt %s supprimé"
 
 #: rhodecode/controllers/settings.py:159
-#: rhodecode/controllers/admin/repos.py:322
-#: rhodecode/controllers/admin/repos.py:328
+#: rhodecode/controllers/admin/repos.py:324
+#: rhodecode/controllers/admin/repos.py:330
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Erreur pendant la suppression de %s"
@@ -291,7 +315,7 b' msgid "No data loaded yet"'
 msgstr "Aucune donnée actuellement disponible."
 
 #: rhodecode/controllers/summary.py:142
-#: rhodecode/templates/summary/summary.html:144
+#: rhodecode/templates/summary/summary.html:148
 msgid "Statistics are disabled for this repository"
 msgstr "La mise à jour des statistiques est désactivée pour ce dépôt."
 
@@ -382,9 +406,9 b' msgstr "\xc3\x89crire"'
 #: 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:335
 #: rhodecode/templates/base/base.html:337
 #: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:341
 msgid "Admin"
 msgstr "Administration"
 
@@ -401,18 +425,20 b' msgid "allowed with automatic account ac'
 msgstr "Autorisé avec activation automatique du compte"
 
 #: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/controllers/admin/permissions.py:74
 msgid "Disabled"
 msgstr "Interdite"
 
 #: rhodecode/controllers/admin/permissions.py:72
+#: rhodecode/controllers/admin/permissions.py:75
 msgid "Enabled"
 msgstr "Autorisée"
 
-#: rhodecode/controllers/admin/permissions.py:106
+#: rhodecode/controllers/admin/permissions.py:116
 msgid "Default permissions updated successfully"
 msgstr "Permissions par défaut mises à jour avec succès"
 
-#: rhodecode/controllers/admin/permissions.py:123
+#: rhodecode/controllers/admin/permissions.py:130
 msgid "error occurred during update of permissions"
 msgstr "erreur pendant la mise à jour des permissions"
 
@@ -420,126 +446,131 b' msgstr "erreur pendant la mise \xc3\xa0 jour des permissions"'
 msgid "--REMOVE FORK--"
 msgstr "[Pas un fork]"
 
-#: rhodecode/controllers/admin/repos.py:191
+#: rhodecode/controllers/admin/repos.py:192
 #, python-format
 msgid "created repository %s from %s"
 msgstr "Le dépôt %s a été créé depuis %s."
 
-#: rhodecode/controllers/admin/repos.py:195
+#: rhodecode/controllers/admin/repos.py:196
 #, python-format
 msgid "created repository %s"
 msgstr "Le dépôt %s a été créé."
 
-#: rhodecode/controllers/admin/repos.py:226
+#: rhodecode/controllers/admin/repos.py:227
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr "Une erreur est survenue durant la création du dépôt %s."
 
-#: rhodecode/controllers/admin/repos.py:317
+#: rhodecode/controllers/admin/repos.py:319
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr "Impossible de supprimer le dépôt %s : Des forks y sont attachés."
 
-#: rhodecode/controllers/admin/repos.py:346
+#: rhodecode/controllers/admin/repos.py:348
 msgid "An error occurred during deletion of repository user"
 msgstr "Une erreur est survenue durant la suppression de l’utilisateur du dépôt."
 
-#: rhodecode/controllers/admin/repos.py:365
+#: rhodecode/controllers/admin/repos.py:367
 msgid "An error occurred during deletion of repository users groups"
 msgstr ""
 "Une erreur est survenue durant la suppression du groupe d’utilisateurs de"
 " ce dépôt."
 
-#: rhodecode/controllers/admin/repos.py:382
+#: rhodecode/controllers/admin/repos.py:385
 msgid "An error occurred during deletion of repository stats"
 msgstr "Une erreur est survenue durant la suppression des statistiques du dépôt."
 
-#: rhodecode/controllers/admin/repos.py:398
+#: rhodecode/controllers/admin/repos.py:402
 msgid "An error occurred during cache invalidation"
 msgstr "Une erreur est survenue durant l’invalidation du cache."
 
-#: rhodecode/controllers/admin/repos.py:418
+#: rhodecode/controllers/admin/repos.py:422
+#, fuzzy
+msgid "An error occurred during unlocking"
+msgstr "Une erreur est survenue durant cette opération."
+
+#: rhodecode/controllers/admin/repos.py:442
 msgid "Updated repository visibility in public journal"
 msgstr "La visibilité du dépôt dans le journal public a été mise à jour."
 
-#: rhodecode/controllers/admin/repos.py:422
+#: rhodecode/controllers/admin/repos.py:446
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 "Une erreur est survenue durant la configuration du journal public pour ce"
 " dépôt."
 
-#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269
+#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299
 msgid "Token mismatch"
 msgstr "Jeton d’authentification incorrect."
 
-#: rhodecode/controllers/admin/repos.py:440
+#: rhodecode/controllers/admin/repos.py:464
 msgid "Pulled from remote location"
 msgstr "Les changements distants ont été récupérés."
 
-#: rhodecode/controllers/admin/repos.py:442
+#: rhodecode/controllers/admin/repos.py:466
 msgid "An error occurred during pull from remote location"
 msgstr "Une erreur est survenue durant le pull depuis la source distante."
 
-#: rhodecode/controllers/admin/repos.py:458
+#: rhodecode/controllers/admin/repos.py:482
 msgid "Nothing"
 msgstr "[Aucun dépôt]"
 
-#: rhodecode/controllers/admin/repos.py:460
+#: rhodecode/controllers/admin/repos.py:484
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "Le dépôt %s a été marké comme fork de %s"
 
-#: rhodecode/controllers/admin/repos.py:464
+#: rhodecode/controllers/admin/repos.py:488
 msgid "An error occurred during this operation"
 msgstr "Une erreur est survenue durant cette opération."
 
-#: rhodecode/controllers/admin/repos_groups.py:119
+#: rhodecode/controllers/admin/repos_groups.py:116
 #, python-format
 msgid "created repos group %s"
 msgstr "Le groupe de dépôts %s a été créé."
 
-#: rhodecode/controllers/admin/repos_groups.py:132
+#: rhodecode/controllers/admin/repos_groups.py:129
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr "Une erreur est survenue durant la création du groupe de dépôts %s."
 
-#: rhodecode/controllers/admin/repos_groups.py:166
+#: rhodecode/controllers/admin/repos_groups.py:163
 #, python-format
 msgid "updated repos group %s"
 msgstr "Le groupe de dépôts %s a été mis à jour."
 
-#: rhodecode/controllers/admin/repos_groups.py:179
+#: rhodecode/controllers/admin/repos_groups.py:176
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr "Une erreur est survenue durant la mise à jour du groupe de dépôts %s."
 
-#: rhodecode/controllers/admin/repos_groups.py:197
+#: rhodecode/controllers/admin/repos_groups.py:194
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr "Ce groupe contient %s dépôts et ne peut être supprimé."
 
-#: rhodecode/controllers/admin/repos_groups.py:205
+#: rhodecode/controllers/admin/repos_groups.py:202
 #, python-format
 msgid "removed repos group %s"
 msgstr "Le groupe de dépôts %s a été supprimé."
 
-#: rhodecode/controllers/admin/repos_groups.py:210
+#: rhodecode/controllers/admin/repos_groups.py:208
 msgid "Cannot delete this group it still contains subgroups"
 msgstr "Impossible de supprimer ce groupe : Il contient des sous-groupes."
 
-#: rhodecode/controllers/admin/repos_groups.py:215
-#: rhodecode/controllers/admin/repos_groups.py:220
+#: rhodecode/controllers/admin/repos_groups.py:213
+#: rhodecode/controllers/admin/repos_groups.py:218
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr "Une erreur est survenue durant la suppression du groupe de dépôts %s."
 
-#: rhodecode/controllers/admin/repos_groups.py:240
+#: rhodecode/controllers/admin/repos_groups.py:238
 msgid "An error occurred during deletion of group user"
 msgstr ""
 "Une erreur est survenue durant la suppression de l’utilisateur du groupe "
 "de dépôts."
 
-#: rhodecode/controllers/admin/repos_groups.py:260
+#: rhodecode/controllers/admin/repos_groups.py:258
 msgid "An error occurred during deletion of group users groups"
 msgstr ""
 "Une erreur est survenue durant la suppression du groupe d’utilisateurs du"
@@ -559,93 +590,118 b' msgid "Updated application settings"'
 msgstr "Réglages mis à jour"
 
 #: rhodecode/controllers/admin/settings.py:164
-#: rhodecode/controllers/admin/settings.py:230
+#: rhodecode/controllers/admin/settings.py:275
 msgid "error occurred during updating application settings"
 msgstr "Une erreur est survenue durant la mise à jour des options."
 
-#: rhodecode/controllers/admin/settings.py:226
-msgid "Updated mercurial settings"
+#: rhodecode/controllers/admin/settings.py:200
+#, fuzzy
+msgid "Updated visualisation settings"
+msgstr "Réglages mis à jour"
+
+#: rhodecode/controllers/admin/settings.py:205
+#, fuzzy
+msgid "error occurred during updating visualisation settings"
+msgstr "Une erreur est survenue durant la mise à jour des options."
+
+#: rhodecode/controllers/admin/settings.py:271
+#, fuzzy
+msgid "Updated VCS settings"
 msgstr "Réglages de Mercurial mis à jour"
 
-#: rhodecode/controllers/admin/settings.py:240
+#: rhodecode/controllers/admin/settings.py:285
 msgid "Added new hook"
 msgstr "Le nouveau hook a été ajouté."
 
-#: rhodecode/controllers/admin/settings.py:252
+#: rhodecode/controllers/admin/settings.py:297
 msgid "Updated hooks"
 msgstr "Hooks mis à jour"
 
-#: rhodecode/controllers/admin/settings.py:256
+#: rhodecode/controllers/admin/settings.py:301
 msgid "error occurred during hook creation"
 msgstr "Une erreur est survenue durant la création du hook."
 
-#: rhodecode/controllers/admin/settings.py:275
+#: rhodecode/controllers/admin/settings.py:320
 msgid "Email task created"
 msgstr "La tâche d’e-mail a été créée."
 
-#: rhodecode/controllers/admin/settings.py:330
+#: rhodecode/controllers/admin/settings.py:375
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon"
 " fonctionnement de l’application."
 
-#: rhodecode/controllers/admin/settings.py:361
+#: rhodecode/controllers/admin/settings.py:406
 msgid "Your account was updated successfully"
 msgstr "Votre compte a été mis à jour avec succès"
 
-#: rhodecode/controllers/admin/settings.py:376
-#: rhodecode/controllers/admin/users.py:186
+#: rhodecode/controllers/admin/settings.py:421
+#: rhodecode/controllers/admin/users.py:191
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr "Une erreur est survenue durant la mise à jour de l’utilisateur %s."
 
-#: rhodecode/controllers/admin/users.py:127
+#: rhodecode/controllers/admin/users.py:130
 #, python-format
 msgid "created user %s"
 msgstr "utilisateur %s créé"
 
-#: rhodecode/controllers/admin/users.py:139
+#: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "error occurred during creation of user %s"
 msgstr "Une erreur est survenue durant la création de l’utilisateur %s."
 
-#: rhodecode/controllers/admin/users.py:168
+#: rhodecode/controllers/admin/users.py:171
 msgid "User updated successfully"
 msgstr "L’utilisateur a été mis à jour avec succès."
 
-#: rhodecode/controllers/admin/users.py:202
+#: rhodecode/controllers/admin/users.py:207
 msgid "successfully deleted user"
 msgstr "L’utilisateur a été supprimé avec succès."
 
-#: rhodecode/controllers/admin/users.py:207
+#: rhodecode/controllers/admin/users.py:212
 msgid "An error occurred during deletion of user"
 msgstr "Une erreur est survenue durant la suppression de l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:221
+#: rhodecode/controllers/admin/users.py:226
 msgid "You can't edit this user"
 msgstr "Vous ne pouvez pas éditer cet utilisateur"
 
-#: rhodecode/controllers/admin/users.py:253
-#: rhodecode/controllers/admin/users_groups.py:219
+#: rhodecode/controllers/admin/users.py:266
 msgid "Granted 'repository create' permission to user"
 msgstr "La permission de création de dépôts a été accordée à l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:262
-#: rhodecode/controllers/admin/users_groups.py:229
+#: rhodecode/controllers/admin/users.py:271
 msgid "Revoked 'repository create' permission to user"
 msgstr "La permission de création de dépôts a été révoquée à l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:278
+#: rhodecode/controllers/admin/users.py:277
+#, fuzzy
+msgid "Granted 'repository fork' permission to user"
+msgstr "La permission de création de dépôts a été accordée à l’utilisateur."
+
+#: rhodecode/controllers/admin/users.py:282
+#, fuzzy
+msgid "Revoked 'repository fork' permission to user"
+msgstr "La permission de création de dépôts a été révoquée à l’utilisateur."
+
+#: rhodecode/controllers/admin/users.py:288
+#: rhodecode/controllers/admin/users_groups.py:255
+#, fuzzy
+msgid "An error occurred during permissions saving"
+msgstr "Une erreur est survenue durant cette opération."
+
+#: rhodecode/controllers/admin/users.py:303
 #, python-format
 msgid "Added email %s to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:284
+#: rhodecode/controllers/admin/users.py:309
 #, fuzzy
 msgid "An error occurred during email saving"
 msgstr "Une erreur est survenue durant cette opération."
 
-#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users.py:319
 #, fuzzy
 msgid "Removed email from user"
 msgstr "Le groupe de dépôts %s a été supprimé."
@@ -665,171 +721,191 b' msgstr "Une erreur est survenue durant la cr\xc3\xa9ation du groupe d\xe2\x80\x99utilisateurs %s."'
 msgid "updated users group %s"
 msgstr "Le groupe d’utilisateurs %s a été mis à jour."
 
-#: rhodecode/controllers/admin/users_groups.py:152
+#: rhodecode/controllers/admin/users_groups.py:157
 #, python-format
 msgid "error occurred during update of users group %s"
 msgstr "Une erreur est survenue durant la mise à jour du groupe d’utilisateurs %s."
 
-#: rhodecode/controllers/admin/users_groups.py:169
+#: rhodecode/controllers/admin/users_groups.py:174
 msgid "successfully deleted users group"
 msgstr "Le groupe d’utilisateurs a été supprimé avec succès."
 
-#: rhodecode/controllers/admin/users_groups.py:174
+#: rhodecode/controllers/admin/users_groups.py:179
 msgid "An error occurred during deletion of users group"
 msgstr "Une erreur est survenue lors de la suppression du groupe d’utilisateurs."
 
-#: rhodecode/lib/auth.py:497
+#: rhodecode/controllers/admin/users_groups.py:233
+#, fuzzy
+msgid "Granted 'repository create' permission to users group"
+msgstr "La permission de création de dépôts a été accordée à l’utilisateur."
+
+#: rhodecode/controllers/admin/users_groups.py:238
+#, fuzzy
+msgid "Revoked 'repository create' permission to users group"
+msgstr "La permission de création de dépôts a été révoquée à l’utilisateur."
+
+#: rhodecode/controllers/admin/users_groups.py:244
+#, fuzzy
+msgid "Granted 'repository fork' permission to users group"
+msgstr "La permission de création de dépôts a été accordée à l’utilisateur."
+
+#: rhodecode/controllers/admin/users_groups.py:249
+#, fuzzy
+msgid "Revoked 'repository fork' permission to users group"
+msgstr "La permission de création de dépôts a été révoquée à l’utilisateur."
+
+#: rhodecode/lib/auth.py:499
 msgid "You need to be a registered user to perform this action"
 msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action."
 
-#: rhodecode/lib/auth.py:538
+#: rhodecode/lib/auth.py:540
 msgid "You need to be a signed in to view this page"
 msgstr "Vous devez être connecté pour visualiser cette page."
 
-#: rhodecode/lib/diffs.py:85
+#: rhodecode/lib/diffs.py:86
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 "Cet ensemble de changements était trop gros pour être affiché et a été "
 "découpé, utilisez le menu « Diff » pour afficher les différences."
 
-#: rhodecode/lib/diffs.py:95
+#: rhodecode/lib/diffs.py:96
 msgid "No changes detected"
 msgstr "Aucun changement détecté."
 
-#: rhodecode/lib/helpers.py:369
+#: rhodecode/lib/helpers.py:372
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr "%d/%m/%Y à %H:%M:%S"
 
-#: rhodecode/lib/helpers.py:442
+#: rhodecode/lib/helpers.py:484
 msgid "True"
 msgstr "Vrai"
 
-#: rhodecode/lib/helpers.py:446
+#: rhodecode/lib/helpers.py:488
 msgid "False"
 msgstr "Faux"
 
-#: rhodecode/lib/helpers.py:490
+#: rhodecode/lib/helpers.py:532
 msgid "Changeset not found"
 msgstr "Ensemble de changements non trouvé"
 
-#: rhodecode/lib/helpers.py:513
+#: rhodecode/lib/helpers.py:555
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "Afficher les changements combinés %s->%s"
 
-#: rhodecode/lib/helpers.py:519
+#: rhodecode/lib/helpers.py:561
 msgid "compare view"
 msgstr "vue de comparaison"
 
-#: rhodecode/lib/helpers.py:539
+#: rhodecode/lib/helpers.py:581
 msgid "and"
 msgstr "et"
 
-#: rhodecode/lib/helpers.py:540
+#: rhodecode/lib/helpers.py:582
 #, python-format
 msgid "%s more"
 msgstr "%s de plus"
 
-#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46
+#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48
 msgid "revisions"
 msgstr "révisions"
 
-#: rhodecode/lib/helpers.py:564
+#: rhodecode/lib/helpers.py:606
 msgid "fork name "
 msgstr "Nom du fork"
 
-#: rhodecode/lib/helpers.py:578
+#: rhodecode/lib/helpers.py:620
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #: rhodecode/templates/pullrequests/pullrequest_show.html:12
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:584
+#: rhodecode/lib/helpers.py:626
 msgid "[deleted] repository"
 msgstr "[a supprimé] le dépôt"
 
-#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596
+#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638
 msgid "[created] repository"
 msgstr "[a créé] le dépôt"
 
-#: rhodecode/lib/helpers.py:588
+#: rhodecode/lib/helpers.py:630
 msgid "[created] repository as fork"
 msgstr "[a créé] le dépôt en tant que fork"
 
-#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598
+#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640
 msgid "[forked] repository"
 msgstr "[a forké] le dépôt"
 
-#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600
+#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642
 msgid "[updated] repository"
 msgstr "[a mis à jour] le dépôt"
 
-#: rhodecode/lib/helpers.py:594
+#: rhodecode/lib/helpers.py:636
 msgid "[delete] repository"
 msgstr "[a supprimé] le dépôt"
 
-#: rhodecode/lib/helpers.py:602
+#: rhodecode/lib/helpers.py:644
 msgid "[created] user"
 msgstr "[a créé] l’utilisateur"
 
-#: rhodecode/lib/helpers.py:604
+#: rhodecode/lib/helpers.py:646
 msgid "[updated] user"
 msgstr "[a mis à jour] l’utilisateur"
 
-#: rhodecode/lib/helpers.py:606
+#: rhodecode/lib/helpers.py:648
 msgid "[created] users group"
 msgstr "[a créé] le groupe d’utilisateurs"
 
-#: rhodecode/lib/helpers.py:608
+#: rhodecode/lib/helpers.py:650
 msgid "[updated] users group"
 msgstr "[a mis à jour] le groupe d’utilisateurs"
 
-#: rhodecode/lib/helpers.py:610
+#: rhodecode/lib/helpers.py:652
 msgid "[commented] on revision in repository"
 msgstr "[a commenté] une révision du dépôt"
 
-#: rhodecode/lib/helpers.py:612
+#: rhodecode/lib/helpers.py:654
 #, fuzzy
 msgid "[commented] on pull request for"
 msgstr "[a commenté] une révision du dépôt"
 
-#: rhodecode/lib/helpers.py:614
+#: rhodecode/lib/helpers.py:656
 #, fuzzy
 msgid "[closed] pull request for"
 msgstr "[a commenté] une révision du dépôt"
 
-#: rhodecode/lib/helpers.py:616
+#: rhodecode/lib/helpers.py:658
 msgid "[pushed] into"
 msgstr "[a pushé] dans"
 
-#: rhodecode/lib/helpers.py:618
+#: rhodecode/lib/helpers.py:660
 msgid "[committed via RhodeCode] into repository"
 msgstr "[a commité via RhodeCode] dans le dépôt"
 
-#: rhodecode/lib/helpers.py:620
+#: rhodecode/lib/helpers.py:662
 msgid "[pulled from remote] into repository"
 msgstr "[a pullé depuis un site distant] dans le dépôt"
 
-#: rhodecode/lib/helpers.py:622
+#: rhodecode/lib/helpers.py:664
 msgid "[pulled] from"
 msgstr "[a pullé] depuis"
 
-#: rhodecode/lib/helpers.py:624
+#: rhodecode/lib/helpers.py:666
 msgid "[started following] repository"
 msgstr "[suit maintenant] le dépôt"
 
-#: rhodecode/lib/helpers.py:626
+#: rhodecode/lib/helpers.py:668
 msgid "[stopped following] repository"
 msgstr "[ne suit plus] le dépôt"
 
-#: rhodecode/lib/helpers.py:790
+#: rhodecode/lib/helpers.py:840
 #, python-format
 msgid " and %s more"
 msgstr "et %s de plus"
 
-#: rhodecode/lib/helpers.py:794
+#: rhodecode/lib/helpers.py:844
 msgid "No Files"
 msgstr "Aucun fichier"
 
@@ -902,88 +978,98 b' msgstr "\xc3\xa0 la ligne %s"'
 msgid "[Mention]"
 msgstr "[Mention]"
 
-#: rhodecode/model/db.py:1063
+#: rhodecode/model/db.py:1140
 #, fuzzy
 msgid "Repository no access"
 msgstr "Dépôts"
 
-#: rhodecode/model/db.py:1064
+#: rhodecode/model/db.py:1141
 #, fuzzy
 msgid "Repository read access"
 msgstr "Ce dépôt existe déjà"
 
-#: rhodecode/model/db.py:1065
+#: rhodecode/model/db.py:1142
 #, fuzzy
 msgid "Repository write access"
 msgstr "Dépôts"
 
-#: rhodecode/model/db.py:1066
+#: rhodecode/model/db.py:1143
 #, fuzzy
 msgid "Repository admin access"
 msgstr "Dépôts"
 
-#: rhodecode/model/db.py:1068
+#: rhodecode/model/db.py:1145
 #, fuzzy
 msgid "Repositories Group no access"
 msgstr "Groupes de dépôts"
 
-#: rhodecode/model/db.py:1069
+#: rhodecode/model/db.py:1146
 #, fuzzy
 msgid "Repositories Group read access"
 msgstr "Groupes de dépôts"
 
-#: rhodecode/model/db.py:1070
+#: rhodecode/model/db.py:1147
 #, fuzzy
 msgid "Repositories Group write access"
 msgstr "Groupes de dépôts"
 
-#: rhodecode/model/db.py:1071
+#: rhodecode/model/db.py:1148
 #, fuzzy
 msgid "Repositories Group admin access"
 msgstr "Groupes de dépôts"
 
-#: rhodecode/model/db.py:1073
+#: rhodecode/model/db.py:1150
 #, fuzzy
 msgid "RhodeCode Administrator"
 msgstr "Administration des utilisateurs"
 
-#: rhodecode/model/db.py:1074
+#: rhodecode/model/db.py:1151
 #, fuzzy
 msgid "Repository creation disabled"
 msgstr "Création de dépôt"
 
-#: rhodecode/model/db.py:1075
+#: rhodecode/model/db.py:1152
 #, fuzzy
 msgid "Repository creation enabled"
 msgstr "Création de dépôt"
 
-#: rhodecode/model/db.py:1076
+#: rhodecode/model/db.py:1153
+#, fuzzy
+msgid "Repository forking disabled"
+msgstr "Création de dépôt"
+
+#: rhodecode/model/db.py:1154
+#, fuzzy
+msgid "Repository forking enabled"
+msgstr "Création de dépôt"
+
+#: rhodecode/model/db.py:1155
 #, fuzzy
 msgid "Register disabled"
 msgstr "Désactivé"
 
-#: rhodecode/model/db.py:1077
+#: rhodecode/model/db.py:1156
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1080
+#: rhodecode/model/db.py:1159
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1481
+#: rhodecode/model/db.py:1579
 msgid "Not Reviewed"
 msgstr ""
 
-#: rhodecode/model/db.py:1482
+#: rhodecode/model/db.py:1580
 #, fuzzy
 msgid "Approved"
 msgstr "Supprimés"
 
-#: rhodecode/model/db.py:1483
+#: rhodecode/model/db.py:1581
 msgid "Rejected"
 msgstr ""
 
-#: rhodecode/model/db.py:1484
+#: rhodecode/model/db.py:1582
 msgid "Under Review"
 msgstr ""
 
@@ -1035,29 +1121,29 b' msgstr "a post\xc3\xa9 un commentaire sur le commit"'
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:526
+#: rhodecode/model/scm.py:535
 #, fuzzy
 msgid "latest tip"
 msgstr "Dernière connexion"
 
-#: rhodecode/model/user.py:240
+#: rhodecode/model/user.py:230
 msgid "new user registration"
 msgstr "Nouveau compte utilisateur enregistré"
 
-#: rhodecode/model/user.py:265 rhodecode/model/user.py:287
-#: rhodecode/model/user.py:309
+#: rhodecode/model/user.py:255 rhodecode/model/user.py:277
+#: rhodecode/model/user.py:299
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon"
 " fonctionnement de l’application."
 
-#: rhodecode/model/user.py:333
+#: rhodecode/model/user.py:323
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 "Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le "
 "bon fonctionnement de l’application."
 
-#: rhodecode/model/user.py:339
+#: rhodecode/model/user.py:329
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch "
@@ -1066,17 +1152,21 b' msgstr ""'
 "L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez "
 "les propriétaires de ces dépôts. %s"
 
-#: rhodecode/model/validators.py:52
+#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36
+msgid "Value cannot be an empty list"
+msgstr ""
+
+#: rhodecode/model/validators.py:82
 #, fuzzy, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "Ce nom \"%(username)s\" d’utilisateur existe déjà"
 
-#: rhodecode/model/validators.py:54
+#: rhodecode/model/validators.py:84
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr ""
 
-#: rhodecode/model/validators.py:56
+#: rhodecode/model/validators.py:86
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
@@ -1085,22 +1175,22 b' msgstr ""'
 "numériques ainsi que les caractères suivants : « _ . - ». Il doit "
 "commencer par un caractère alpha-numérique."
 
-#: rhodecode/model/validators.py:84
-#, fuzzy, python-format
+#: rhodecode/model/validators.py:114
+#, python-format
 msgid "Username %(username)s is not valid"
-msgstr "Ce nom d’utilisateur ou de groupe n’est pas valide."
-
-#: rhodecode/model/validators.py:103
+msgstr "%(username)s Nom d'utilisateur n'est pas valide"
+
+#: rhodecode/model/validators.py:133
 #, fuzzy
 msgid "Invalid users group name"
 msgstr "nom d’utilisateur invalide"
 
-#: rhodecode/model/validators.py:104
-#, fuzzy, python-format
+#: rhodecode/model/validators.py:134
+#, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
-msgstr "Ce groupe d’utilisateurs existe déjà."
-
-#: rhodecode/model/validators.py:106
+msgstr "Ce groupe \"%(usersgroup)s\" d’utilisateurs existe déjà."
+
+#: rhodecode/model/validators.py:136
 msgid ""
 "users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
@@ -1109,94 +1199,95 b' msgstr ""'
 "numériques ainsi que les caractères suivants : « _ . - ». Il doit "
 "commencer par un caractère alpha-numérique."
 
-#: rhodecode/model/validators.py:144
+#: rhodecode/model/validators.py:174
 msgid "Cannot assign this group as parent"
 msgstr "Impossible d’assigner ce groupe en tant que parent."
 
-#: rhodecode/model/validators.py:145
-#, fuzzy, python-format
+#: rhodecode/model/validators.py:175
+#, python-format
 msgid "Group \"%(group_name)s\" already exists"
-msgstr "Ce nom d’utilisateur existe déjà"
-
-#: rhodecode/model/validators.py:147
-#, fuzzy, python-format
+msgstr "Ce nom d’utilisateur \"%(group_name)s\" existe déjà"
+
+#: rhodecode/model/validators.py:177
+#, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
-msgstr "Un dépôt portant ce nom existe déjà."
-
-#: rhodecode/model/validators.py:205
+msgstr "Dépôt avec le nom de \"%(group_name)s\" existe déjà"
+
+#: rhodecode/model/validators.py:235
 #, fuzzy
 msgid "Invalid characters (non-ascii) in password"
 msgstr "Caractères incorrects dans le mot de passe"
 
-#: rhodecode/model/validators.py:220
+#: rhodecode/model/validators.py:250
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas."
 
-#: rhodecode/model/validators.py:237
+#: rhodecode/model/validators.py:267
 msgid "invalid password"
 msgstr "mot de passe invalide"
 
-#: rhodecode/model/validators.py:238
+#: rhodecode/model/validators.py:268
 msgid "invalid user name"
 msgstr "nom d’utilisateur invalide"
 
-#: rhodecode/model/validators.py:239
+#: rhodecode/model/validators.py:269
 msgid "Your account is disabled"
 msgstr "Votre compte est désactivé"
 
-#: rhodecode/model/validators.py:283
-#, fuzzy, python-format
+#: rhodecode/model/validators.py:313
+#, python-format
 msgid "Repository name %(repo)s is disallowed"
-msgstr "Ce nom de dépôt est interdit"
-
-#: rhodecode/model/validators.py:285
-#, fuzzy, python-format
+msgstr "Ce nom de dépôt %(repo)s est interdit"
+
+#: rhodecode/model/validators.py:315
+#, python-format
 msgid "Repository named %(repo)s already exists"
-msgstr "Un dépôt portant ce nom existe déjà."
-
-#: rhodecode/model/validators.py:286
-#, fuzzy, python-format
+msgstr "Un dépôt portant %(repo)s ce nom existe déjà."
+
+#: rhodecode/model/validators.py:316
+#, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
-msgstr "Ce dépôt existe déjà dans le groupe « \"%(group)s\" »."
-
-#: rhodecode/model/validators.py:288
-#, fuzzy, python-format
+msgstr "Ce dépôt \"%(repo)s\" existe déjà dans le groupe « \"%(group)s\" »."
+
+#: rhodecode/model/validators.py:318
+#, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr "Un dépôt portant \"%(repo)s\" ce nom existe déjà."
 
-#: rhodecode/model/validators.py:386
+#: rhodecode/model/validators.py:431
 msgid "invalid clone url"
 msgstr "URL de clonage invalide."
 
-#: rhodecode/model/validators.py:387
-msgid "Invalid clone url, provide a valid clone http\\s url"
+#: rhodecode/model/validators.py:432
+#, fuzzy
+msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 "URL à cloner invalide. Veuillez fournir une URL valide commençant par "
 "http(s)."
 
-#: rhodecode/model/validators.py:418
+#: rhodecode/model/validators.py:457
 #, fuzzy
 msgid "Fork have to be the same type as parent"
 msgstr "Le fork doit être du même type que l’original"
 
-#: rhodecode/model/validators.py:439
+#: rhodecode/model/validators.py:478
 msgid "This username or users group name is not valid"
 msgstr "Ce nom d’utilisateur ou de groupe n’est pas valide."
 
-#: rhodecode/model/validators.py:509
+#: rhodecode/model/validators.py:562
 msgid "This is not a valid path"
 msgstr "Ceci n’est pas un chemin valide"
 
-#: rhodecode/model/validators.py:524
+#: rhodecode/model/validators.py:577
 msgid "This e-mail address is already taken"
 msgstr "Cette adresse e-mail est déjà enregistrée"
 
-#: rhodecode/model/validators.py:544
-#, fuzzy, python-format
+#: rhodecode/model/validators.py:597
+#, python-format
 msgid "e-mail \"%(email)s\" does not exist."
-msgstr "Cette adresse e-mail n’existe pas"
-
-#: rhodecode/model/validators.py:581
+msgstr "Cette adresse e-mail \"%(email)s\" n’existe pas"
+
+#: rhodecode/model/validators.py:634
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
@@ -1204,6 +1295,11 b' msgstr ""'
 "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom"
 " d’utilisateur."
 
+#: rhodecode/model/validators.py:653
+#, python-format
+msgid "Revisions %(revs)s are already part of pull request or have set status"
+msgstr ""
+
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr "Tableau de bord"
@@ -1222,7 +1318,7 b' msgstr "Filtre rapide\xe2\x80\xa6"'
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:219
+#: rhodecode/templates/base/base.html:221
 msgid "repositories"
 msgstr "Dépôts"
 
@@ -1242,9 +1338,9 b' msgid "Group name"'
 msgstr "Nom de groupe"
 
 #: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:67
-#: rhodecode/templates/index_base.html:132
-#: rhodecode/templates/index_base.html:158
+#: rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/index_base.html:168
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:72
@@ -1262,15 +1358,15 b' msgstr "Description"'
 msgid "Repositories group"
 msgstr "Groupe de dépôts"
 
-#: rhodecode/templates/index_base.html:66
-#: rhodecode/templates/index_base.html:156
+#: rhodecode/templates/index_base.html:70
+#: rhodecode/templates/index_base.html:166
 #: 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:172
+#: rhodecode/templates/admin/users/user_edit.html:192
 #: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:154
-#: rhodecode/templates/admin/users/user_edit_my_account.html:190
+#: rhodecode/templates/admin/users/user_edit_my_account.html:157
+#: rhodecode/templates/admin/users/user_edit_my_account.html:193
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
@@ -1281,61 +1377,61 b' msgstr "Groupe de d\xc3\xa9p\xc3\xb4ts"'
 #: rhodecode/templates/journal/journal.html:186
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:119
+#: rhodecode/templates/summary/summary.html:123
 #: rhodecode/templates/tags/tags.html:36
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr "Nom"
 
-#: rhodecode/templates/index_base.html:68
+#: rhodecode/templates/index_base.html:72
 msgid "Last change"
 msgstr "Dernière modification"
 
-#: rhodecode/templates/index_base.html:69
-#: rhodecode/templates/index_base.html:161
-#: rhodecode/templates/admin/users/user_edit_my_account.html:156
+#: rhodecode/templates/index_base.html:73
+#: rhodecode/templates/index_base.html:171
+#: rhodecode/templates/admin/users/user_edit_my_account.html:159
 #: rhodecode/templates/journal/journal.html:188
 msgid "Tip"
 msgstr "Sommet"
 
-#: rhodecode/templates/index_base.html:70
-#: rhodecode/templates/index_base.html:163
-#: rhodecode/templates/admin/repos/repo_edit.html:112
+#: rhodecode/templates/index_base.html:74
+#: rhodecode/templates/index_base.html:173
+#: rhodecode/templates/admin/repos/repo_edit.html:121
 #: rhodecode/templates/admin/repos/repos.html:73
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:75
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr "RSS"
 
-#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/index_base.html:76
 msgid "Atom"
 msgstr "Atom"
 
-#: rhodecode/templates/index_base.html:102
-#: rhodecode/templates/index_base.html:104
+#: rhodecode/templates/index_base.html:110
+#: rhodecode/templates/index_base.html:112
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "S’abonner au flux RSS de %s"
 
-#: rhodecode/templates/index_base.html:109
-#: rhodecode/templates/index_base.html:111
+#: rhodecode/templates/index_base.html:117
+#: rhodecode/templates/index_base.html:119
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "S’abonner au flux ATOM de %s"
 
-#: rhodecode/templates/index_base.html:130
+#: rhodecode/templates/index_base.html:140
 msgid "Group Name"
 msgstr "Nom du groupe"
 
-#: rhodecode/templates/index_base.html:148
-#: rhodecode/templates/index_base.html:188
+#: rhodecode/templates/index_base.html:158
+#: rhodecode/templates/index_base.html:198
 #: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:176
-#: rhodecode/templates/admin/users/users.html:105
+#: rhodecode/templates/admin/users/user_edit_my_account.html:179
+#: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
 #: rhodecode/templates/branches/branches.html:77
 #: rhodecode/templates/journal/journal.html:211
@@ -1343,11 +1439,11 b' msgstr "Nom du groupe"'
 msgid "Click to sort ascending"
 msgstr "Tri ascendant"
 
-#: rhodecode/templates/index_base.html:149
-#: rhodecode/templates/index_base.html:189
+#: rhodecode/templates/index_base.html:159
+#: rhodecode/templates/index_base.html:199
 #: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:177
-#: rhodecode/templates/admin/users/users.html:106
+#: rhodecode/templates/admin/users/user_edit_my_account.html:180
+#: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:78
 #: rhodecode/templates/journal/journal.html:212
@@ -1355,14 +1451,14 b' msgstr "Tri ascendant"'
 msgid "Click to sort descending"
 msgstr "Tri descendant"
 
-#: rhodecode/templates/index_base.html:159
+#: rhodecode/templates/index_base.html:169
 msgid "Last Change"
 msgstr "Dernière modification"
 
-#: rhodecode/templates/index_base.html:190
+#: rhodecode/templates/index_base.html:200
 #: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:178
-#: rhodecode/templates/admin/users/users.html:107
+#: rhodecode/templates/admin/users/user_edit_my_account.html:181
+#: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
 #: rhodecode/templates/branches/branches.html:79
 #: rhodecode/templates/journal/journal.html:213
@@ -1370,10 +1466,10 b' msgstr "Derni\xc3\xa8re modification"'
 msgid "No records found."
 msgstr "Aucun élément n’a été trouvé."
 
-#: rhodecode/templates/index_base.html:191
+#: rhodecode/templates/index_base.html:201
 #: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:179
-#: rhodecode/templates/admin/users/users.html:108
+#: rhodecode/templates/admin/users/user_edit_my_account.html:182
+#: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:80
 #: rhodecode/templates/journal/journal.html:214
@@ -1381,10 +1477,10 b' msgstr "Aucun \xc3\xa9l\xc3\xa9ment n\xe2\x80\x99a \xc3\xa9t\xc3\xa9 trouv\xc3\xa9."'
 msgid "Data error."
 msgstr "Erreur d’intégrité des données."
 
-#: rhodecode/templates/index_base.html:192
+#: rhodecode/templates/index_base.html:202
 #: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:180
-#: rhodecode/templates/admin/users/users.html:109
+#: rhodecode/templates/admin/users/user_edit_my_account.html:183
+#: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:81
 #: rhodecode/templates/journal/journal.html:215
@@ -1406,7 +1502,7 b' msgstr "Connexion \xc3\xa0"'
 #: rhodecode/templates/admin/users/user_edit.html:50
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
 #: rhodecode/templates/base/base.html:83
-#: rhodecode/templates/summary/summary.html:118
+#: rhodecode/templates/summary/summary.html:122
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
@@ -1479,7 +1575,7 b' msgstr "Nom"'
 #: rhodecode/templates/admin/users/user_add.html:77
 #: rhodecode/templates/admin/users/user_edit.html:104
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:120
+#: rhodecode/templates/summary/summary.html:124
 msgid "Email"
 msgstr "E-mail"
 
@@ -1641,13 +1737,13 b' msgid "E-mail Attribute"'
 msgstr "Attribut pour l’e-mail"
 
 #: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/repos/repo_edit.html:132
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
 #: rhodecode/templates/admin/settings/hooks.html:73
 #: rhodecode/templates/admin/users/user_edit.html:129
-#: rhodecode/templates/admin/users/user_edit.html:154
+#: rhodecode/templates/admin/users/user_edit.html:174
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:115
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:93
 msgid "Save"
 msgstr "Enregistrer"
@@ -1667,8 +1763,8 b' msgid "Comments"'
 msgstr "commits"
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:252
 #: rhodecode/templates/base/base.html:254
+#: rhodecode/templates/base/base.html:256
 msgid "Pull requests"
 msgstr ""
 
@@ -1694,7 +1790,7 b' msgid "Permissions administration"'
 msgstr "Gestion des permissions"
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:125
+#: 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:139
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
@@ -1737,7 +1833,12 b' msgid "Repository creation"'
 msgstr "Création de dépôt"
 
 #: rhodecode/templates/admin/permissions/permissions.html:71
-#: rhodecode/templates/admin/repos/repo_edit.html:227
+#, fuzzy
+msgid "Repository forking"
+msgstr "Création de dépôt"
+
+#: rhodecode/templates/admin/permissions/permissions.html:78
+#: rhodecode/templates/admin/repos/repo_edit.html:241
 msgid "set"
 msgstr "Définir"
 
@@ -1752,6 +1853,10 b' msgstr "Ajouter un d\xc3\xa9p\xc3\xb4t"'
 msgid "Repositories"
 msgstr "Dépôts"
 
+#: rhodecode/templates/admin/repos/repo_add.html:13
+msgid "add new"
+msgstr "ajouter un nouveau"
+
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
 #: rhodecode/templates/summary/summary.html:95
 #: rhodecode/templates/summary/summary.html:96
@@ -1836,8 +1941,8 b' msgstr "\xc3\x89diter le d\xc3\xa9p\xc3\xb4t"'
 
 #: rhodecode/templates/admin/repos/repo_edit.html:13
 #: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:204
-#: rhodecode/templates/admin/users/user_edit.html:206
+#: rhodecode/templates/admin/users/user_edit.html:224
+#: rhodecode/templates/admin/users/user_edit.html:226
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
 #: rhodecode/templates/files/files_source.html:44
@@ -1871,19 +1976,30 b' msgstr "Activer les t\xc3\xa9l\xc3\xa9chargements"'
 msgid "Enable download menu on summary page."
 msgstr "Afficher le menu de téléchargements sur la page du dépôt."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:117
+#: rhodecode/templates/admin/repos/repo_edit.html:112
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#, fuzzy
+msgid "Enable locking"
+msgstr "Activer"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:116
+msgid "Enable lock-by-pulling on repository."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:126
 msgid "Change owner of this repository."
 msgstr "Changer le propriétaire de ce dépôt."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:133
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67
+#: 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:180
+#: rhodecode/templates/admin/settings/settings.html:168
+#: rhodecode/templates/admin/settings/settings.html:258
 #: rhodecode/templates/admin/users/user_edit.html:130
-#: rhodecode/templates/admin/users/user_edit.html:155
-#: rhodecode/templates/admin/users/user_edit.html:258
+#: rhodecode/templates/admin/users/user_edit.html:175
+#: rhodecode/templates/admin/users/user_edit.html:278
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:116
+#: 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
@@ -1891,70 +2007,70 b' msgstr "Changer le propri\xc3\xa9taire de ce d\xc3\xa9p\xc3\xb4t."'
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:143
+#: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr "Administration"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:146
+#: rhodecode/templates/admin/repos/repo_edit.html:155
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:150
+#: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Reset current statistics"
 msgstr "Réinitialiser les statistiques"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:150
+#: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Confirm to remove current statistics"
 msgstr "Souhaitez-vous vraiment réinitialiser les statistiques de ce dépôt ?"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:153
+#: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Fetched to rev"
 msgstr "Parcouru jusqu’à la révision"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:154
+#: rhodecode/templates/admin/repos/repo_edit.html:163
 msgid "Stats gathered"
 msgstr "Statistiques obtenues"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:162
+#: rhodecode/templates/admin/repos/repo_edit.html:171
 msgid "Remote"
 msgstr "Dépôt distant"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:166
+#: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Pull changes from remote location"
 msgstr "Récupérer les changements depuis le site distant"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:166
+#: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Confirm to pull changes from remote side"
 msgstr "Voulez-vous vraiment récupérer les changements depuis le site distant ?"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:177
+#: rhodecode/templates/admin/repos/repo_edit.html:186
 msgid "Cache"
 msgstr "Cache"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:181
+#: rhodecode/templates/admin/repos/repo_edit.html:190
 msgid "Invalidate repository cache"
 msgstr "Invalider le cache du dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:181
+#: rhodecode/templates/admin/repos/repo_edit.html:190
 msgid "Confirm to invalidate repository cache"
 msgstr "Voulez-vous vraiment invalider le cache du dépôt ?"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:186
-#: rhodecode/templates/base/base.html:316
+#: rhodecode/templates/admin/repos/repo_edit.html:195
 #: rhodecode/templates/base/base.html:318
 #: rhodecode/templates/base/base.html:320
+#: rhodecode/templates/base/base.html:322
 msgid "Public journal"
 msgstr "Journal public"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:192
+#: rhodecode/templates/admin/repos/repo_edit.html:201
 msgid "Remove from public journal"
 msgstr "Supprimer du journal public"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:194
+#: rhodecode/templates/admin/repos/repo_edit.html:203
 msgid "Add to public journal"
 msgstr "Ajouter le dépôt au journal public"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:199
+#: rhodecode/templates/admin/repos/repo_edit.html:208
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
@@ -1962,21 +2078,63 b' msgstr ""'
 "Le descriptif des actions réalisées sur ce dépôt sera visible à tous "
 "depuis le journal public."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:206
+#: rhodecode/templates/admin/repos/repo_edit.html:215
+#, fuzzy
+msgid "Locking"
+msgstr "Déverrouiller"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:220
+msgid "Unlock locked repo"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:220
+#, fuzzy
+msgid "Confirm to unlock repository"
+msgstr "Voulez-vous vraiment supprimer ce dépôt ?"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:223
+msgid "lock repo"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:223
+#, fuzzy
+msgid "Confirm to lock repository"
+msgstr "Voulez-vous vraiment supprimer ce dépôt ?"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:224
+#, fuzzy
+msgid "Repository is not locked"
+msgstr "Dépôts"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:229
+msgid "Force locking on repository. Works only when anonymous access is disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:236
+#, fuzzy
+msgid "Set as fork of"
+msgstr "Indiquer comme fork"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:245
+#, fuzzy
+msgid "Manually set this repository as a fork of another from the list"
+msgstr "Permet d’indiquer manuellement que ce dépôt est un fork d’un autre dépôt."
+
+#: rhodecode/templates/admin/repos/repo_edit.html:251
 #: rhodecode/templates/changeset/changeset_file_comment.html:26
 msgid "Delete"
 msgstr "Supprimer"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:210
+#: rhodecode/templates/admin/repos/repo_edit.html:255
 msgid "Remove this repository"
 msgstr "Supprimer ce dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:210
+#: rhodecode/templates/admin/repos/repo_edit.html:255
 #: rhodecode/templates/journal/journal.html:84
 msgid "Confirm to delete this repository"
 msgstr "Voulez-vous vraiment supprimer ce dépôt ?"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:214
+#: rhodecode/templates/admin/repos/repo_edit.html:259
 msgid ""
 "This repository will be renamed in a special way in order to be "
 "unaccesible for RhodeCode and VCS systems.\n"
@@ -1988,16 +2146,6 b' msgstr ""'
 "Si vous voulez le supprimer complètement, effectuez la suppression "
 "manuellement."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:222
-#, fuzzy
-msgid "Set as fork of"
-msgstr "Indiquer comme fork"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:231
-#, fuzzy
-msgid "Manually set this repository as a fork of another from the list"
-msgstr "Permet d’indiquer manuellement que ce dépôt est un fork d’un autre dépôt."
-
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
 msgid "none"
@@ -2015,8 +2163,8 b' msgstr "\xc3\x89criture"'
 
 #: 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:83
-#: rhodecode/templates/base/base.html:215
+#: rhodecode/templates/admin/users/users.html:85
+#: rhodecode/templates/base/base.html:217
 msgid "admin"
 msgstr "Administration"
 
@@ -2045,18 +2193,18 b' msgstr "[Par d\xc3\xa9faut]"'
 msgid "revoke"
 msgstr "Révoquer"
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:80
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:83
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67
 msgid "Add another member"
 msgstr "Ajouter un utilisateur"
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:94
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:97
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
 msgid "Failed to remove user"
 msgstr "Échec de suppression de l’utilisateur"
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:109
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:112
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96
 msgid "Failed to remove users group"
 msgstr "Erreur lors de la suppression du groupe d’utilisateurs."
 
@@ -2094,7 +2242,7 b' msgstr "Parent du groupe"'
 #: 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:93
+#: rhodecode/templates/pullrequests/pullrequest_show.html:113
 msgid "save"
 msgstr "Enregistrer"
 
@@ -2106,6 +2254,12 b' msgstr "\xc3\x89diter le groupe de d\xc3\xa9p\xc3\xb4t"'
 msgid "edit repos group"
 msgstr "Édition du groupe de dépôt"
 
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other"
+" groups and repositories inside"
+msgstr ""
+
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
 msgid "Repositories groups administration"
 msgstr "Administration des groupes de dépôts"
@@ -2119,13 +2273,13 b' msgid "Number of toplevel repositories"'
 msgstr "Nombre de sous-dépôts"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
-#: rhodecode/templates/admin/users/users.html:85
+#: rhodecode/templates/admin/users/users.html:87
 #: rhodecode/templates/admin/users_groups/users_groups.html:35
 msgid "action"
 msgstr "Action"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
-#: rhodecode/templates/admin/users/user_edit.html:235
+#: rhodecode/templates/admin/users/user_edit.html:255
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 #: rhodecode/templates/data_table/_dt_elements.html:7
 #: rhodecode/templates/data_table/_dt_elements.html:103
@@ -2232,59 +2386,107 b' msgid "GA code"'
 msgstr "Code GA"
 
 #: rhodecode/templates/admin/settings/settings.html:112
-#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:167
+#: rhodecode/templates/admin/settings/settings.html:257
 msgid "Save settings"
 msgstr "Enregister les options"
 
 #: rhodecode/templates/admin/settings/settings.html:119
 #, fuzzy
-msgid "VCS settings"
-msgstr "Réglages"
+msgid "Visualisation settings"
+msgstr "Réglages d’application globaux"
 
 #: rhodecode/templates/admin/settings/settings.html:128
+#, fuzzy
+msgid "Icons"
+msgstr "Options"
+
+#: rhodecode/templates/admin/settings/settings.html:133
+msgid "Show public repo icon on repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:137
+#, fuzzy
+msgid "Show private repo icon on repositories"
+msgstr "Dépôt privé"
+
+#: rhodecode/templates/admin/settings/settings.html:144
+#, fuzzy
+msgid "Meta-Tagging"
+msgstr "Réglages"
+
+#: rhodecode/templates/admin/settings/settings.html:149
+msgid "Stylify recognised metatags:"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:176
+#, fuzzy
+msgid "VCS settings"
+msgstr "Réglages"
+
+#: rhodecode/templates/admin/settings/settings.html:185
 msgid "Web"
 msgstr "Web"
 
-#: rhodecode/templates/admin/settings/settings.html:133
+#: rhodecode/templates/admin/settings/settings.html:190
 #, fuzzy
 msgid "require ssl for vcs operations"
 msgstr "SSL requis pour les pushs"
 
-#: rhodecode/templates/admin/settings/settings.html:135
+#: rhodecode/templates/admin/settings/settings.html:192
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
 "will return HTTP Error 406: Not Acceptable"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:141
+#: rhodecode/templates/admin/settings/settings.html:198
 msgid "Hooks"
 msgstr "Hooks"
 
-#: rhodecode/templates/admin/settings/settings.html:146
+#: rhodecode/templates/admin/settings/settings.html:203
 msgid "Update repository after push (hg update)"
 msgstr "Mettre à jour les dépôts après un push (hg update)"
 
-#: rhodecode/templates/admin/settings/settings.html:150
+#: rhodecode/templates/admin/settings/settings.html:207
 msgid "Show repository size after push"
 msgstr "Afficher la taille du dépôt après un push"
 
-#: rhodecode/templates/admin/settings/settings.html:154
+#: rhodecode/templates/admin/settings/settings.html:211
 msgid "Log user push commands"
 msgstr "Journaliser les commandes de push"
 
-#: rhodecode/templates/admin/settings/settings.html:158
+#: rhodecode/templates/admin/settings/settings.html:215
 msgid "Log user pull commands"
 msgstr "Journaliser les commandes de pull"
 
-#: rhodecode/templates/admin/settings/settings.html:162
+#: rhodecode/templates/admin/settings/settings.html:219
 msgid "advanced setup"
 msgstr "Avancé"
 
-#: rhodecode/templates/admin/settings/settings.html:167
+#: rhodecode/templates/admin/settings/settings.html:224
+#, fuzzy
+msgid "Mercurial Extensions"
+msgstr "Dépôt Mercurial"
+
+#: rhodecode/templates/admin/settings/settings.html:229
+msgid "largefiles extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:233
+msgid "hgsubversion extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:235
+msgid ""
+"Requires hgsubversion library installed. Allows clonning from svn remote "
+"locations"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:245
 msgid "Repositories location"
 msgstr "Emplacement des dépôts"
 
-#: rhodecode/templates/admin/settings/settings.html:172
+#: rhodecode/templates/admin/settings/settings.html:250
 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 "
@@ -2294,33 +2496,33 b' msgstr ""'
 "vraiment le faire, redémarrer l’application une fois le changement "
 "effectué. Cliquez sur ce texte pour déverrouiller."
 
-#: rhodecode/templates/admin/settings/settings.html:173
+#: rhodecode/templates/admin/settings/settings.html:251
 msgid "unlock"
 msgstr "Déverrouiller"
 
-#: rhodecode/templates/admin/settings/settings.html:174
+#: rhodecode/templates/admin/settings/settings.html:252
 msgid ""
 "Location where repositories are stored. After changing this value a "
 "restart, and rescan is required"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:194
+#: rhodecode/templates/admin/settings/settings.html:272
 msgid "Test Email"
 msgstr "E-mail de test"
 
-#: rhodecode/templates/admin/settings/settings.html:202
+#: rhodecode/templates/admin/settings/settings.html:280
 msgid "Email to"
 msgstr "Envoyer l’e-mail à"
 
-#: rhodecode/templates/admin/settings/settings.html:210
+#: rhodecode/templates/admin/settings/settings.html:288
 msgid "Send"
 msgstr "Envoyer"
 
-#: rhodecode/templates/admin/settings/settings.html:216
+#: rhodecode/templates/admin/settings/settings.html:294
 msgid "System Info and Packages"
 msgstr "Information système et paquets"
 
-#: rhodecode/templates/admin/settings/settings.html:219
+#: rhodecode/templates/admin/settings/settings.html:297
 msgid "show"
 msgstr "Montrer"
 
@@ -2383,41 +2585,63 b' msgstr "Confirmation du nouveau mot de p'
 
 #: rhodecode/templates/admin/users/user_edit.html:147
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
+#, fuzzy
+msgid "Inherit default permissions"
+msgstr "Permissions par défaut"
+
+#: rhodecode/templates/admin/users/user_edit.html:152
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:113
+#, python-format
+msgid ""
+"Select to inherit permissions from %s settings. With this selected below "
+"options does not have any action"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:158
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr "Création de dépôts"
 
 #: rhodecode/templates/admin/users/user_edit.html:166
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:127
+#, fuzzy
+msgid "Fork repositories"
+msgstr "Dépôts"
+
+#: rhodecode/templates/admin/users/user_edit.html:186
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
 #, fuzzy
 msgid "Nothing here yet"
 msgstr "Aucune notification pour le moment."
 
-#: rhodecode/templates/admin/users/user_edit.html:173
+#: rhodecode/templates/admin/users/user_edit.html:193
 #: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:191
+#: rhodecode/templates/admin/users/user_edit_my_account.html:194
 msgid "Permission"
 msgstr "Permission"
 
-#: rhodecode/templates/admin/users/user_edit.html:174
+#: rhodecode/templates/admin/users/user_edit.html:194
 #, fuzzy
 msgid "Edit Permission"
 msgstr "Permissions du dépôt"
 
-#: rhodecode/templates/admin/users/user_edit.html:223
+#: rhodecode/templates/admin/users/user_edit.html:243
 #, fuzzy
 msgid "Email addresses"
 msgstr "Adresse e-mail"
 
-#: rhodecode/templates/admin/users/user_edit.html:236
+#: rhodecode/templates/admin/users/user_edit.html:256
 #, fuzzy, python-format
 msgid "Confirm to delete this email: %s"
 msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?"
 
-#: rhodecode/templates/admin/users/user_edit.html:250
+#: rhodecode/templates/admin/users/user_edit.html:270
 #, fuzzy
 msgid "New email address"
 msgstr "Adresse e-mail"
 
-#: rhodecode/templates/admin/users/user_edit.html:257
+#: rhodecode/templates/admin/users/user_edit.html:277
 #, fuzzy
 msgid "Add"
 msgstr "Ajouter"
@@ -2454,16 +2678,21 b' msgstr "ajouter un nouveau"'
 msgid "Opened by me"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10
 #, python-format
 msgid "Pull request #%s opened on %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
+#, fuzzy
+msgid "Confirm to delete this pull request"
+msgstr "Voulez-vous vraiment supprimer ce dépôt ?"
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26
 msgid "I participate in"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
@@ -2505,7 +2734,7 b' msgid "Users administration"'
 msgstr "Administration des utilisateurs"
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:221
+#: rhodecode/templates/base/base.html:223
 msgid "users"
 msgstr "Utilisateurs"
 
@@ -2513,30 +2742,30 b' msgstr "Utilisateurs"'
 msgid "ADD NEW USER"
 msgstr "NOUVEL UTILISATEUR"
 
-#: rhodecode/templates/admin/users/users.html:76
+#: rhodecode/templates/admin/users/users.html:77
 msgid "username"
 msgstr "Nom d’utilisateur"
 
-#: rhodecode/templates/admin/users/users.html:79
+#: rhodecode/templates/admin/users/users.html:80
 #, fuzzy
 msgid "firstname"
 msgstr "Prénom"
 
-#: rhodecode/templates/admin/users/users.html:80
+#: rhodecode/templates/admin/users/users.html:81
 msgid "lastname"
 msgstr "Nom de famille"
 
-#: rhodecode/templates/admin/users/users.html:81
+#: rhodecode/templates/admin/users/users.html:82
 msgid "last login"
 msgstr "Dernière connexion"
 
-#: rhodecode/templates/admin/users/users.html:82
+#: rhodecode/templates/admin/users/users.html:84
 #: rhodecode/templates/admin/users_groups/users_groups.html:34
 msgid "active"
 msgstr "Actif"
 
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/base/base.html:224
+#: rhodecode/templates/admin/users/users.html:86
+#: rhodecode/templates/base/base.html:226
 msgid "ldap"
 msgstr "LDAP"
 
@@ -2581,7 +2810,7 b' msgstr "Membres disponibles"'
 msgid "Add all elements"
 msgstr "Tout ajouter"
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:126
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:146
 msgid "Group members"
 msgstr "Membres du groupe"
 
@@ -2628,9 +2857,9 b' msgid "Inbox"'
 msgstr "Boîte de réception"
 
 #: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:298
 #: rhodecode/templates/base/base.html:300
 #: rhodecode/templates/base/base.html:302
+#: rhodecode/templates/base/base.html:304
 #: rhodecode/templates/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
@@ -2654,9 +2883,9 b' msgid "Home"'
 msgstr "Accueil"
 
 #: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:307
 #: rhodecode/templates/base/base.html:309
 #: rhodecode/templates/base/base.html:311
+#: rhodecode/templates/base/base.html:313
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
@@ -2711,7 +2940,6 b' msgstr "Aller"'
 #: 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/files/files.html:40
 msgid "Files"
 msgstr "Fichiers"
 
@@ -2722,7 +2950,7 b' msgstr "Options"'
 
 #: rhodecode/templates/base/base.html:204
 #: rhodecode/templates/base/base.html:206
-#: rhodecode/templates/base/base.html:225
+#: rhodecode/templates/base/base.html:227
 msgid "settings"
 msgstr "Réglages"
 
@@ -2732,40 +2960,40 b' msgstr "R\xc3\xa9glages"'
 msgid "fork"
 msgstr "Fork"
 
-#: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/changelog/changelog.html:39
+#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/changelog/changelog.html:40
 msgid "Open new pull request"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/base/base.html:213
 msgid "search"
 msgstr "Rechercher"
 
-#: rhodecode/templates/base/base.html:220
+#: rhodecode/templates/base/base.html:222
 msgid "repositories groups"
 msgstr "Groupes de dépôts"
 
-#: rhodecode/templates/base/base.html:222
+#: rhodecode/templates/base/base.html:224
 msgid "users groups"
 msgstr "Groupes d’utilisateurs"
 
-#: rhodecode/templates/base/base.html:223
+#: rhodecode/templates/base/base.html:225
 msgid "permissions"
 msgstr "Permissions"
 
-#: rhodecode/templates/base/base.html:236
 #: rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:240
 msgid "Followers"
 msgstr "Followers"
 
-#: rhodecode/templates/base/base.html:244
 #: rhodecode/templates/base/base.html:246
+#: rhodecode/templates/base/base.html:248
 msgid "Forks"
 msgstr "Forks"
 
-#: rhodecode/templates/base/base.html:325
 #: rhodecode/templates/base/base.html:327
 #: rhodecode/templates/base/base.html:329
+#: rhodecode/templates/base/base.html:331
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "Rechercher"
@@ -2874,20 +3102,20 b' msgstr ""'
 msgid "Compare fork"
 msgstr "vue de comparaison"
 
-#: rhodecode/templates/changelog/changelog.html:44
+#: rhodecode/templates/changelog/changelog.html:46
 msgid "Show"
 msgstr "Afficher"
 
-#: rhodecode/templates/changelog/changelog.html:70
-#: rhodecode/templates/summary/summary.html:360
+#: rhodecode/templates/changelog/changelog.html:72
+#: rhodecode/templates/summary/summary.html:364
 msgid "show more"
 msgstr "montrer plus"
 
-#: rhodecode/templates/changelog/changelog.html:74
+#: rhodecode/templates/changelog/changelog.html:76
 msgid "Affected number of files, click to show more details"
 msgstr "Nombre de fichiers modifiés, cliquez pour plus de détails"
 
-#: rhodecode/templates/changelog/changelog.html:87
+#: rhodecode/templates/changelog/changelog.html:89
 #: rhodecode/templates/changeset/changeset.html:38
 #: rhodecode/templates/changeset/changeset_file_comment.html:20
 #: rhodecode/templates/changeset/changeset_range.html:46
@@ -2895,26 +3123,26 b' msgstr "Nombre de fichiers modifi\xc3\xa9s, cliquez pour plus de d\xc3\xa9tails"'
 msgid "Changeset status"
 msgstr "Changesets"
 
-#: rhodecode/templates/changelog/changelog.html:90
+#: rhodecode/templates/changelog/changelog.html:92
 msgid "Click to open associated pull request"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:100
+#: rhodecode/templates/changelog/changelog.html:102
 #: rhodecode/templates/changeset/changeset.html:78
 msgid "Parent"
 msgstr "Parent"
 
-#: rhodecode/templates/changelog/changelog.html:106
+#: rhodecode/templates/changelog/changelog.html:108
 #: rhodecode/templates/changeset/changeset.html:84
 msgid "No parents"
 msgstr "Aucun parent"
 
-#: rhodecode/templates/changelog/changelog.html:111
+#: rhodecode/templates/changelog/changelog.html:113
 #: rhodecode/templates/changeset/changeset.html:88
 msgid "merge"
 msgstr "Fusion"
 
-#: rhodecode/templates/changelog/changelog.html:114
+#: rhodecode/templates/changelog/changelog.html:116
 #: rhodecode/templates/changeset/changeset.html:91
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_add.html:33
@@ -2923,20 +3151,20 b' msgstr "Fusion"'
 msgid "branch"
 msgstr "Branche"
 
-#: rhodecode/templates/changelog/changelog.html:120
+#: rhodecode/templates/changelog/changelog.html:122
 msgid "bookmark"
 msgstr "Signet"
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:128
 #: rhodecode/templates/changeset/changeset.html:96
 msgid "tag"
 msgstr "Tag"
 
-#: rhodecode/templates/changelog/changelog.html:162
+#: rhodecode/templates/changelog/changelog.html:164
 msgid "Show selected changes __S -> __E"
 msgstr "Afficher les changements sélections de __S à __E"
 
-#: rhodecode/templates/changelog/changelog.html:253
+#: rhodecode/templates/changelog/changelog.html:255
 msgid "There are no changes yet"
 msgstr "Il n’y a aucun changement pour le moment"
 
@@ -3079,7 +3307,7 b' msgstr "Comparaison"'
 
 #: rhodecode/templates/changeset/changeset_range.html:54
 #: rhodecode/templates/compare/compare_diff.html:41
-#: rhodecode/templates/pullrequests/pullrequest_show.html:50
+#: rhodecode/templates/pullrequests/pullrequest_show.html:69
 msgid "Files affected"
 msgstr "Fichiers affectés"
 
@@ -3159,12 +3387,13 b' msgid "File diff"'
 msgstr "Diff de fichier"
 
 #: rhodecode/templates/files/files.html:4
-#, python-format
-msgid "%s Files"
+#: rhodecode/templates/files/files.html:72
+#, fuzzy, python-format
+msgid "%s files"
 msgstr "Fichiers de %s"
 
 #: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:336
+#: rhodecode/templates/summary/summary.html:340
 msgid "files"
 msgstr "Fichiers"
 
@@ -3313,11 +3542,11 b' msgid "show at revision"'
 msgstr "révision suivante"
 
 #: rhodecode/templates/files/files_source.html:14
-#, fuzzy, python-format
+#, python-format
 msgid "%s author"
 msgid_plural "%s authors"
-msgstr[0] "Auteur"
-msgstr[1] ""
+msgstr[0] "%s Auteur"
+msgstr[1] "%s Auteurs"
 
 #: rhodecode/templates/files/files_source.html:36
 msgid "show source"
@@ -3490,18 +3719,18 b' msgid "Detailed compare view"'
 msgstr "vue de comparaison"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:63
+#: rhodecode/templates/pullrequests/pullrequest_show.html:82
 msgid "Pull request reviewers"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:75
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
 #, fuzzy
 msgid "owner"
 msgstr "Propriétaire"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:89
+#: rhodecode/templates/pullrequests/pullrequest_show.html:109
 msgid "Add reviewer to this pull request."
 msgstr ""
 
@@ -3531,21 +3760,37 b' msgstr ""'
 msgid "Closed %s"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:28
+#: rhodecode/templates/pullrequests/pullrequest_show.html:31
+#, fuzzy
+msgid "Status"
+msgstr "Changesets"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Pull request status"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+#: rhodecode/templates/pullrequests/pullrequest_show.html:44
+msgid "Still not reviewed by"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:47
+#, python-format
+msgid "%d reviewer"
+msgid_plural "%d reviewers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:54
 #, fuzzy
 msgid "Created on"
 msgstr "En créer un maintenant"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:61
 #, fuzzy
 msgid "Compare view"
 msgstr "vue de comparaison"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:46
+#: rhodecode/templates/pullrequests/pullrequest_show.html:65
 #, fuzzy
 msgid "Incoming changesets"
 msgstr "Dépôt vide"
@@ -3564,20 +3809,20 b' msgid "Closed"'
 msgstr ""
 
 #: rhodecode/templates/search/search.html:6
-#, fuzzy, python-format
+#, python-format
 msgid "Search \"%s\" in repository: %s"
-msgstr "dans le dépôt :"
+msgstr "dans \"%s\" le dépôt: %s"
 
 #: rhodecode/templates/search/search.html:8
-#, fuzzy, python-format
+#, python-format
 msgid "Search \"%s\" in all repositories"
-msgstr "dans tous les dépôts"
+msgstr "Recherche \"%s\" dans tous les référentiels"
 
 #: rhodecode/templates/search/search.html:12
 #: rhodecode/templates/search/search.html:32
-#, fuzzy, python-format
+#, python-format
 msgid "Search in repository: %s"
-msgstr "dans le dépôt :"
+msgstr "dans le dépôt : %s"
 
 #: rhodecode/templates/search/search.html:14
 #: rhodecode/templates/search/search.html:34
@@ -3606,7 +3851,7 b' msgstr "Message de commit"'
 msgid "File names"
 msgstr "Les noms de fichiers"
 
-#: rhodecode/templates/search/search_commit.html:34
+#: rhodecode/templates/search/search_commit.html:35
 #: rhodecode/templates/search/search_content.html:21
 #: rhodecode/templates/search/search_path.html:15
 msgid "Permission denied"
@@ -3683,115 +3928,115 b' msgstr "publique"'
 msgid "remote clone"
 msgstr "Clone distant"
 
-#: rhodecode/templates/summary/summary.html:112
+#: rhodecode/templates/summary/summary.html:116
 msgid "Contact"
 msgstr "Contact"
 
-#: rhodecode/templates/summary/summary.html:126
+#: rhodecode/templates/summary/summary.html:130
 msgid "Clone url"
 msgstr "URL de clone"
 
-#: rhodecode/templates/summary/summary.html:129
+#: rhodecode/templates/summary/summary.html:133
 msgid "Show by Name"
 msgstr "Afficher par nom"
 
-#: rhodecode/templates/summary/summary.html:130
+#: rhodecode/templates/summary/summary.html:134
 msgid "Show by ID"
 msgstr "Afficher par ID"
 
-#: rhodecode/templates/summary/summary.html:138
+#: rhodecode/templates/summary/summary.html:142
 msgid "Trending files"
 msgstr "Populaires"
 
-#: rhodecode/templates/summary/summary.html:146
-#: rhodecode/templates/summary/summary.html:162
-#: rhodecode/templates/summary/summary.html:190
+#: rhodecode/templates/summary/summary.html:150
+#: rhodecode/templates/summary/summary.html:166
+#: rhodecode/templates/summary/summary.html:194
 msgid "enable"
 msgstr "Activer"
 
-#: rhodecode/templates/summary/summary.html:154
+#: rhodecode/templates/summary/summary.html:158
 msgid "Download"
 msgstr "Téléchargements"
 
-#: rhodecode/templates/summary/summary.html:158
+#: rhodecode/templates/summary/summary.html:162
 msgid "There are no downloads yet"
 msgstr "Il n’y a pas encore de téléchargements proposés."
 
-#: rhodecode/templates/summary/summary.html:160
+#: rhodecode/templates/summary/summary.html:164
 msgid "Downloads are disabled for this repository"
 msgstr "Les téléchargements sont désactivés pour ce dépôt."
 
-#: rhodecode/templates/summary/summary.html:166
+#: rhodecode/templates/summary/summary.html:170
 msgid "Download as zip"
 msgstr "Télécharger en ZIP"
 
-#: rhodecode/templates/summary/summary.html:169
+#: rhodecode/templates/summary/summary.html:173
 msgid "Check this to download archive with subrepos"
 msgstr "Télécharger une archive contenant également les sous-dépôts éventuels"
 
-#: rhodecode/templates/summary/summary.html:169
+#: rhodecode/templates/summary/summary.html:173
 msgid "with subrepos"
 msgstr "avec les sous-dépôts"
 
-#: rhodecode/templates/summary/summary.html:182
+#: rhodecode/templates/summary/summary.html:186
 msgid "Commit activity by day / author"
 msgstr "Activité de commit par jour et par auteur"
 
-#: rhodecode/templates/summary/summary.html:193
+#: rhodecode/templates/summary/summary.html:197
 msgid "Stats gathered: "
 msgstr "Statistiques obtenues :"
 
-#: rhodecode/templates/summary/summary.html:214
+#: rhodecode/templates/summary/summary.html:218
 msgid "Shortlog"
 msgstr "Résumé des changements"
 
-#: rhodecode/templates/summary/summary.html:216
+#: rhodecode/templates/summary/summary.html:220
 msgid "Quick start"
 msgstr "Démarrage rapide"
 
-#: rhodecode/templates/summary/summary.html:229
+#: rhodecode/templates/summary/summary.html:233
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:232
+#: rhodecode/templates/summary/summary.html:236
 msgid "Permalink to this readme"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:289
+#: rhodecode/templates/summary/summary.html:293
 #, python-format
 msgid "Download %s as %s"
 msgstr "Télécharger %s comme archive %s"
 
-#: rhodecode/templates/summary/summary.html:646
+#: rhodecode/templates/summary/summary.html:650
 msgid "commits"
 msgstr "commits"
 
-#: rhodecode/templates/summary/summary.html:647
+#: rhodecode/templates/summary/summary.html:651
 msgid "files added"
 msgstr "fichiers ajoutés"
 
-#: rhodecode/templates/summary/summary.html:648
+#: rhodecode/templates/summary/summary.html:652
 msgid "files changed"
 msgstr "fichiers modifiés"
 
-#: rhodecode/templates/summary/summary.html:649
+#: rhodecode/templates/summary/summary.html:653
 msgid "files removed"
 msgstr "fichiers supprimés"
 
-#: rhodecode/templates/summary/summary.html:652
+#: rhodecode/templates/summary/summary.html:656
 msgid "commit"
 msgstr "commit"
 
-#: rhodecode/templates/summary/summary.html:653
+#: rhodecode/templates/summary/summary.html:657
 msgid "file added"
 msgstr "fichier ajouté"
 
-#: rhodecode/templates/summary/summary.html:654
+#: rhodecode/templates/summary/summary.html:658
 msgid "file changed"
 msgstr "fichié modifié"
 
-#: rhodecode/templates/summary/summary.html:655
+#: rhodecode/templates/summary/summary.html:659
 msgid "file removed"
 msgstr "fichier supprimé"
 

rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po

@@ -12,7 +12,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode 1.2.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-07-26 23:35+0200\n"
+"POT-Creation-Date: 2012-09-02 20:30+0200\n"
 "PO-Revision-Date: 2012-07-14 03:16+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ja <[e-mail]>\n"
@@ -26,24 +26,30 b' msgstr ""'
 msgid "All Branches"
 msgstr "すべてのブランチ"
 
-#: rhodecode/controllers/changeset.py:81
+#: rhodecode/controllers/changeset.py:83
 msgid "show white space"
 msgstr "空白を表示"
 
-#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95
+#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
 msgid "ignore white space"
 msgstr "空白を無視"
 
-#: rhodecode/controllers/changeset.py:155
+#: rhodecode/controllers/changeset.py:157
 #, python-format
 msgid "%s line context"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:331
-#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69
+#: rhodecode/controllers/changeset.py:333
+#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70
 msgid "binary file"
 msgstr "バイナリファイル"
 
+#: rhodecode/controllers/changeset.py:408
+msgid ""
+"Changing status on a changeset associated witha closed pull request is "
+"not allowed"
+msgstr ""
+
 #: rhodecode/controllers/compare.py:69
 #, fuzzy
 msgid "There are no changesets yet"
@@ -90,80 +96,85 b' msgid "commited on"'
 msgstr "コミット"
 
 #: rhodecode/controllers/files.py:84
-#: rhodecode/templates/admin/repos/repo_add.html:13
-msgid "add new"
-msgstr "新規追加"
+#, fuzzy
+msgid "click here to add new file"
+msgstr "新しいファイルを追加"
 
 #: rhodecode/controllers/files.py:85
 #, python-format
 msgid "There are no files yet %s"
 msgstr "まだファイルがありません %s"
 
-#: rhodecode/controllers/files.py:254
+#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299
+#, python-format
+msgid "This repository is has been locked by %s on %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:266
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr "RhodeCode経由で %s を変更"
 
-#: rhodecode/controllers/files.py:259
+#: rhodecode/controllers/files.py:271
 msgid "No changes"
 msgstr "変更点なし"
 
-#: rhodecode/controllers/files.py:270 rhodecode/controllers/files.py:324
+#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "%s へのコミットが成功しました"
 
-#: rhodecode/controllers/files.py:275 rhodecode/controllers/files.py:330
+#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352
 msgid "Error occurred during commit"
 msgstr "コミット中にエラーが発生しました"
 
-#: rhodecode/controllers/files.py:296
+#: rhodecode/controllers/files.py:318
 #, python-format
 msgid "Added %s via RhodeCode"
 msgstr "RhodeCode経由で %s を追加"
 
-#: rhodecode/controllers/files.py:310
+#: rhodecode/controllers/files.py:332
 msgid "No content"
 msgstr "内容がありません"
 
-#: rhodecode/controllers/files.py:314
+#: rhodecode/controllers/files.py:336
 msgid "No filename"
 msgstr "ファイル名がありません"
 
-#: rhodecode/controllers/files.py:356
+#: rhodecode/controllers/files.py:378
 msgid "downloads disabled"
 msgstr "ダウンロードは無効化されています"
 
-#: rhodecode/controllers/files.py:367
+#: rhodecode/controllers/files.py:389
 #, python-format
 msgid "Unknown revision %s"
 msgstr "%s は未知のリビジョンです"
 
-#: rhodecode/controllers/files.py:369
+#: rhodecode/controllers/files.py:391
 msgid "Empty repository"
 msgstr "空のリポジトリ"
 
-#: rhodecode/controllers/files.py:371
+#: rhodecode/controllers/files.py:393
 msgid "Unknown archive type"
 msgstr "未知のアーカイブ種別です"
 
-#: rhodecode/controllers/files.py:472
+#: rhodecode/controllers/files.py:494
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "チェンジセット"
 
-#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70
-#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534
+#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72
+#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543
 msgid "Branches"
 msgstr "ブランチ"
 
-#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545
+#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76
+#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554
 msgid "Tags"
 msgstr "タグ"
 
-#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90
+#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -173,7 +184,7 b' msgstr ""'
 "%s "
 "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。"
 
-#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72
+#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -183,12 +194,12 b' msgstr ""'
 "%s "
 "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。"
 
-#: rhodecode/controllers/forks.py:164
+#: rhodecode/controllers/forks.py:167
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "リポジトリ %s を %s としてフォーク"
 
-#: rhodecode/controllers/forks.py:178
+#: rhodecode/controllers/forks.py:181
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "リポジトリ %s のフォーク中にエラーが発生しました"
@@ -198,36 +209,50 b' msgid "public journal"'
 msgstr "公開ジャーナル"
 
 #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243
-#: rhodecode/templates/base/base.html:218
+#: rhodecode/templates/base/base.html:220
 msgid "journal"
 msgstr "ジャーナル"
 
-#: rhodecode/controllers/login.py:130
+#: rhodecode/controllers/login.py:143
 msgid "You have successfully registered into rhodecode"
 msgstr "rhodecodeへの登録を受け付けました"
 
-#: rhodecode/controllers/login.py:151
+#: rhodecode/controllers/login.py:164
 msgid "Your password reset link was sent"
 msgstr "パスワードリセットのリンクを送信しました"
 
-#: rhodecode/controllers/login.py:171
+#: rhodecode/controllers/login.py:184
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
 msgstr "パスワードをリセットしました。新しいパスワードをあなたのメールアドレスに送りました"
 
-#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540
+#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
+#: rhodecode/controllers/pullrequests.py:158
+msgid "Pull request requires a title with min. 3 chars"
+msgstr ""
+
 #: rhodecode/controllers/pullrequests.py:160
+#, fuzzy
+msgid "error during creation of pull request"
+msgstr "ユーザー %s の作成中にエラーが発生しました"
+
+#: rhodecode/controllers/pullrequests.py:181
 msgid "Successfully opened new pull request"
 msgstr "新しいプルリクエストを作成しました"
 
-#: rhodecode/controllers/pullrequests.py:163
+#: rhodecode/controllers/pullrequests.py:184
 msgid "Error occurred during sending pull request"
 msgstr "プルリクエストの作成中にエラーが発生しました"
 
+#: rhodecode/controllers/pullrequests.py:217
+#, fuzzy
+msgid "Successfully deleted pull request"
+msgstr "新しいプルリクエストを作成しました"
+
 #: rhodecode/controllers/search.py:131
 msgid "Invalid search query. Try quoting it."
 msgstr "無効な検索クエリーです。\\\"で囲んで下さい"
@@ -241,19 +266,19 b' msgid "An error occurred during this sea'
 msgstr "検索を実行する際にエラーがおきました"
 
 #: rhodecode/controllers/settings.py:107
-#: rhodecode/controllers/admin/repos.py:264
+#: rhodecode/controllers/admin/repos.py:266
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "リポジトリ %s の更新に成功しました"
 
 #: rhodecode/controllers/settings.py:125
-#: rhodecode/controllers/admin/repos.py:282
+#: rhodecode/controllers/admin/repos.py:284
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr "リポジトリ %s の更新中にエラーが発生しました"
 
 #: rhodecode/controllers/settings.py:143
-#: rhodecode/controllers/admin/repos.py:300
+#: rhodecode/controllers/admin/repos.py:302
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from "
@@ -264,14 +289,14 b' msgstr ""'
 "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。"
 
 #: rhodecode/controllers/settings.py:155
-#: rhodecode/controllers/admin/repos.py:312
+#: rhodecode/controllers/admin/repos.py:314
 #, python-format
 msgid "deleted repository %s"
 msgstr "リポジトリ %s を削除しました"
 
 #: rhodecode/controllers/settings.py:159
-#: rhodecode/controllers/admin/repos.py:322
-#: rhodecode/controllers/admin/repos.py:328
+#: rhodecode/controllers/admin/repos.py:324
+#: rhodecode/controllers/admin/repos.py:330
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "リポジトリ %s の削除中にエラーが発生しました"
@@ -281,7 +306,7 b' msgid "No data loaded yet"'
 msgstr ""
 
 #: rhodecode/controllers/summary.py:142
-#: rhodecode/templates/summary/summary.html:144
+#: rhodecode/templates/summary/summary.html:148
 msgid "Statistics are disabled for this repository"
 msgstr "このリポジトリの統計は無効化されています"
 
@@ -372,9 +397,9 b' msgstr "\xe6\x9b\xb8\xe8\xbe\xbc"'
 #: 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:335
 #: rhodecode/templates/base/base.html:337
 #: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:341
 msgid "Admin"
 msgstr "管理"
 
@@ -391,18 +416,20 b' msgid "allowed with automatic account ac'
 msgstr "自動でアカウントを有効にする"
 
 #: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/controllers/admin/permissions.py:74
 msgid "Disabled"
 msgstr "無効"
 
 #: rhodecode/controllers/admin/permissions.py:72
+#: rhodecode/controllers/admin/permissions.py:75
 msgid "Enabled"
 msgstr "有効"
 
-#: rhodecode/controllers/admin/permissions.py:106
+#: rhodecode/controllers/admin/permissions.py:116
 msgid "Default permissions updated successfully"
 msgstr "デフォルトの権限を更新しました"
 
-#: rhodecode/controllers/admin/permissions.py:123
+#: rhodecode/controllers/admin/permissions.py:130
 msgid "error occurred during update of permissions"
 msgstr "権限の更新中にエラーが発生しました"
 
@@ -410,120 +437,125 b' msgstr "\xe6\xa8\xa9\xe9\x99\x90\xe3\x81\xae\xe6\x9b\xb4\xe6\x96\xb0\xe4\xb8\xad\xe3\x81\xab\xe3\x82\xa8\xe3\x83\xa9\xe3\x83\xbc\xe3\x81\x8c\xe7\x99\xba\xe7\x94\x9f\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f"'
 msgid "--REMOVE FORK--"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:191
+#: rhodecode/controllers/admin/repos.py:192
 #, python-format
 msgid "created repository %s from %s"
 msgstr "リポジトリ %s を %s から作成"
 
-#: rhodecode/controllers/admin/repos.py:195
+#: rhodecode/controllers/admin/repos.py:196
 #, python-format
 msgid "created repository %s"
 msgstr "リポジトリ %s を作成しました"
 
-#: rhodecode/controllers/admin/repos.py:226
+#: rhodecode/controllers/admin/repos.py:227
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr "リポジトリ %s を作成中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:317
+#: rhodecode/controllers/admin/repos.py:319
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:346
+#: rhodecode/controllers/admin/repos.py:348
 msgid "An error occurred during deletion of repository user"
 msgstr "リポジトリユーザーの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:365
+#: rhodecode/controllers/admin/repos.py:367
 msgid "An error occurred during deletion of repository users groups"
 msgstr "リポジトリユーザーグループの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:382
+#: rhodecode/controllers/admin/repos.py:385
 msgid "An error occurred during deletion of repository stats"
 msgstr "リポジトリステートの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:398
+#: rhodecode/controllers/admin/repos.py:402
 msgid "An error occurred during cache invalidation"
 msgstr "キャッシュの無効化時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:418
-msgid "Updated repository visibility in public journal"
-msgstr ""
-
 #: rhodecode/controllers/admin/repos.py:422
+#, fuzzy
+msgid "An error occurred during unlocking"
+msgstr "メールの保存時にエラーが発生しました"
+
+#: rhodecode/controllers/admin/repos.py:442
+msgid "Updated repository visibility in public journal"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:446
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269
+#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299
 msgid "Token mismatch"
 msgstr "トークンが合いません"
 
-#: rhodecode/controllers/admin/repos.py:440
+#: rhodecode/controllers/admin/repos.py:464
 msgid "Pulled from remote location"
 msgstr "リモートから取得"
 
-#: rhodecode/controllers/admin/repos.py:442
+#: rhodecode/controllers/admin/repos.py:466
 msgid "An error occurred during pull from remote location"
 msgstr "リモートから取得中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:458
+#: rhodecode/controllers/admin/repos.py:482
 msgid "Nothing"
 msgstr "ありません"
 
-#: rhodecode/controllers/admin/repos.py:460
+#: rhodecode/controllers/admin/repos.py:484
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "%s リポジトリを %s のフォークとして印をつける"
 
-#: rhodecode/controllers/admin/repos.py:464
+#: rhodecode/controllers/admin/repos.py:488
 msgid "An error occurred during this operation"
 msgstr "操作中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:119
+#: rhodecode/controllers/admin/repos_groups.py:116
 #, python-format
 msgid "created repos group %s"
 msgstr "リポジトリグループ %s を作成しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:132
+#: rhodecode/controllers/admin/repos_groups.py:129
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr "リポジトリグループ %s を作成中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:166
+#: rhodecode/controllers/admin/repos_groups.py:163
 #, python-format
 msgid "updated repos group %s"
 msgstr "リポジトリグループ %s を更新しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:179
+#: rhodecode/controllers/admin/repos_groups.py:176
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr "リポジトリグループ %s を更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:197
+#: rhodecode/controllers/admin/repos_groups.py:194
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr "このグループは %s リポジトリを含んでいるため削除出来ません"
 
-#: rhodecode/controllers/admin/repos_groups.py:205
+#: rhodecode/controllers/admin/repos_groups.py:202
 #, python-format
 msgid "removed repos group %s"
 msgstr "リポジトリグループ %s を削除しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:210
+#: rhodecode/controllers/admin/repos_groups.py:208
 msgid "Cannot delete this group it still contains subgroups"
 msgstr "サブグループを含んでいるため、このグループを削除できません"
 
-#: rhodecode/controllers/admin/repos_groups.py:215
-#: rhodecode/controllers/admin/repos_groups.py:220
+#: rhodecode/controllers/admin/repos_groups.py:213
+#: rhodecode/controllers/admin/repos_groups.py:218
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr "リポジトリグループの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:240
+#: rhodecode/controllers/admin/repos_groups.py:238
 msgid "An error occurred during deletion of group user"
 msgstr "グループユーザーを削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:260
+#: rhodecode/controllers/admin/repos_groups.py:258
 msgid "An error occurred during deletion of group users groups"
 msgstr ""
 
@@ -541,90 +573,115 b' msgid "Updated application settings"'
 msgstr "アプリケーション設定を更新しました"
 
 #: rhodecode/controllers/admin/settings.py:164
-#: rhodecode/controllers/admin/settings.py:230
+#: rhodecode/controllers/admin/settings.py:275
 msgid "error occurred during updating application settings"
 msgstr "アプリケーション設定を更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:226
-msgid "Updated mercurial settings"
+#: rhodecode/controllers/admin/settings.py:200
+#, fuzzy
+msgid "Updated visualisation settings"
+msgstr "アプリケーション設定を更新しました"
+
+#: rhodecode/controllers/admin/settings.py:205
+#, fuzzy
+msgid "error occurred during updating visualisation settings"
+msgstr "アプリケーション設定を更新中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/settings.py:271
+#, fuzzy
+msgid "Updated VCS settings"
 msgstr "Mercurialの設定を更新しました"
 
-#: rhodecode/controllers/admin/settings.py:240
+#: rhodecode/controllers/admin/settings.py:285
 msgid "Added new hook"
 msgstr "新しいフックを追加しました"
 
-#: rhodecode/controllers/admin/settings.py:252
+#: rhodecode/controllers/admin/settings.py:297
 msgid "Updated hooks"
 msgstr "フックを更新しました"
 
-#: rhodecode/controllers/admin/settings.py:256
+#: rhodecode/controllers/admin/settings.py:301
 msgid "error occurred during hook creation"
 msgstr "フックの作成時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:275
+#: rhodecode/controllers/admin/settings.py:320
 msgid "Email task created"
 msgstr "メールのタスクを作成しました"
 
-#: rhodecode/controllers/admin/settings.py:330
+#: rhodecode/controllers/admin/settings.py:375
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr "このユーザーを編集出来ません。このユーザーはアプリケーションにとって必要不可欠です。"
 
-#: rhodecode/controllers/admin/settings.py:361
+#: rhodecode/controllers/admin/settings.py:406
 msgid "Your account was updated successfully"
 msgstr "アカウントを更新しました"
 
-#: rhodecode/controllers/admin/settings.py:376
-#: rhodecode/controllers/admin/users.py:186
+#: rhodecode/controllers/admin/settings.py:421
+#: rhodecode/controllers/admin/users.py:191
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr "ユーザー %s の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:127
+#: rhodecode/controllers/admin/users.py:130
 #, python-format
 msgid "created user %s"
 msgstr "ユーザー %s を作成しました"
 
-#: rhodecode/controllers/admin/users.py:139
+#: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "error occurred during creation of user %s"
 msgstr "ユーザー %s の作成中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:168
+#: rhodecode/controllers/admin/users.py:171
 msgid "User updated successfully"
 msgstr "ユーザーの更新に成功しました"
 
-#: rhodecode/controllers/admin/users.py:202
+#: rhodecode/controllers/admin/users.py:207
 msgid "successfully deleted user"
 msgstr "ユーザーの削除に成功しました"
 
-#: rhodecode/controllers/admin/users.py:207
+#: rhodecode/controllers/admin/users.py:212
 msgid "An error occurred during deletion of user"
 msgstr "ユーザーの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:221
+#: rhodecode/controllers/admin/users.py:226
 msgid "You can't edit this user"
 msgstr "このユーザーは編集できません"
 
-#: rhodecode/controllers/admin/users.py:253
-#: rhodecode/controllers/admin/users_groups.py:219
+#: rhodecode/controllers/admin/users.py:266
 msgid "Granted 'repository create' permission to user"
 msgstr "ユーザーに 'リポジトリ作成' 権限を与えました"
 
-#: rhodecode/controllers/admin/users.py:262
-#: rhodecode/controllers/admin/users_groups.py:229
+#: rhodecode/controllers/admin/users.py:271
 msgid "Revoked 'repository create' permission to user"
 msgstr "ユーザーの 'リポジトリ作成' 権限を取り消しました"
 
-#: rhodecode/controllers/admin/users.py:278
+#: rhodecode/controllers/admin/users.py:277
+#, fuzzy
+msgid "Granted 'repository fork' permission to user"
+msgstr "ユーザーに 'リポジトリ作成' 権限を与えました"
+
+#: rhodecode/controllers/admin/users.py:282
+#, fuzzy
+msgid "Revoked 'repository fork' permission to user"
+msgstr "ユーザーの 'リポジトリ作成' 権限を取り消しました"
+
+#: rhodecode/controllers/admin/users.py:288
+#: rhodecode/controllers/admin/users_groups.py:255
+#, fuzzy
+msgid "An error occurred during permissions saving"
+msgstr "メールの保存時にエラーが発生しました"
+
+#: rhodecode/controllers/admin/users.py:303
 #, python-format
 msgid "Added email %s to user"
 msgstr "ユーザーにメール %s を追加しました"
 
-#: rhodecode/controllers/admin/users.py:284
+#: rhodecode/controllers/admin/users.py:309
 msgid "An error occurred during email saving"
 msgstr "メールの保存時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users.py:319
 msgid "Removed email from user"
 msgstr "ユーザーからメールを削除しました"
 
@@ -643,169 +700,189 b' msgstr "\xe3\x83\xa6\xe3\x83\xbc\xe3\x82\xb6\xe3\x83\xbc\xe3\x82\xb0\xe3\x83\xab\xe3\x83\xbc\xe3\x83\x97 %s \xe3\x81\xae\xe4\xbd\x9c\xe6\x88\x90\xe4\xb8\xad\xe3\x81\xab\xe3\x82\xa8\xe3\x83\xa9\xe3\x83\xbc\xe3\x81\x8c\xe7\x99\xba\xe7\x94\x9f\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f"'
 msgid "updated users group %s"
 msgstr "ユーザーグループ %s を更新しました"
 
-#: rhodecode/controllers/admin/users_groups.py:152
+#: rhodecode/controllers/admin/users_groups.py:157
 #, python-format
 msgid "error occurred during update of users group %s"
 msgstr "ユーザーグループ %s の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users_groups.py:169
+#: rhodecode/controllers/admin/users_groups.py:174
 msgid "successfully deleted users group"
 msgstr "ユーザーグループ"
 
-#: rhodecode/controllers/admin/users_groups.py:174
+#: rhodecode/controllers/admin/users_groups.py:179
 msgid "An error occurred during deletion of users group"
 msgstr "ユーザーグループの削除中にエラーが発生しました"
 
-#: rhodecode/lib/auth.py:497
+#: rhodecode/controllers/admin/users_groups.py:233
+#, fuzzy
+msgid "Granted 'repository create' permission to users group"
+msgstr "ユーザーに 'リポジトリ作成' 権限を与えました"
+
+#: rhodecode/controllers/admin/users_groups.py:238
+#, fuzzy
+msgid "Revoked 'repository create' permission to users group"
+msgstr "ユーザーの 'リポジトリ作成' 権限を取り消しました"
+
+#: rhodecode/controllers/admin/users_groups.py:244
+#, fuzzy
+msgid "Granted 'repository fork' permission to users group"
+msgstr "ユーザーに 'リポジトリ作成' 権限を与えました"
+
+#: rhodecode/controllers/admin/users_groups.py:249
+#, fuzzy
+msgid "Revoked 'repository fork' permission to users group"
+msgstr "ユーザーの 'リポジトリ作成' 権限を取り消しました"
+
+#: rhodecode/lib/auth.py:499
 msgid "You need to be a registered user to perform this action"
 msgstr "このアクションを実行するためには登録ユーザーである必要があります"
 
-#: rhodecode/lib/auth.py:538
+#: rhodecode/lib/auth.py:540
 msgid "You need to be a signed in to view this page"
 msgstr "このページを閲覧するためにはサインインが必要です"
 
-#: rhodecode/lib/diffs.py:85
+#: rhodecode/lib/diffs.py:86
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:95
+#: rhodecode/lib/diffs.py:96
 msgid "No changes detected"
 msgstr "検出された変更はありません"
 
-#: rhodecode/lib/helpers.py:369
+#: rhodecode/lib/helpers.py:372
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr "%a, %d %b %Y %H:%M:%S"
 
-#: rhodecode/lib/helpers.py:442
+#: rhodecode/lib/helpers.py:484
 msgid "True"
 msgstr "True"
 
-#: rhodecode/lib/helpers.py:446
+#: rhodecode/lib/helpers.py:488
 msgid "False"
 msgstr "False"
 
-#: rhodecode/lib/helpers.py:490
+#: rhodecode/lib/helpers.py:532
 msgid "Changeset not found"
 msgstr "リビジョンが見つかりません"
 
-#: rhodecode/lib/helpers.py:513
+#: rhodecode/lib/helpers.py:555
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "%s から %s までのすべてのチェンジセットを表示"
 
-#: rhodecode/lib/helpers.py:519
+#: rhodecode/lib/helpers.py:561
 msgid "compare view"
 msgstr "比較の表示"
 
-#: rhodecode/lib/helpers.py:539
+#: rhodecode/lib/helpers.py:581
 msgid "and"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:540
+#: rhodecode/lib/helpers.py:582
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46
+#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48
 msgid "revisions"
 msgstr "リビジョン"
 
-#: rhodecode/lib/helpers.py:564
+#: rhodecode/lib/helpers.py:606
 msgid "fork name "
 msgstr "フォーク名 "
 
-#: rhodecode/lib/helpers.py:578
+#: rhodecode/lib/helpers.py:620
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #: rhodecode/templates/pullrequests/pullrequest_show.html:12
 #, python-format
 msgid "Pull request #%s"
 msgstr "プルリクエスト #%s"
 
-#: rhodecode/lib/helpers.py:584
+#: rhodecode/lib/helpers.py:626
 msgid "[deleted] repository"
 msgstr "リポジトリを[削除]"
 
-#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596
+#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638
 msgid "[created] repository"
 msgstr "リポジトリを[作成]"
 
-#: rhodecode/lib/helpers.py:588
+#: rhodecode/lib/helpers.py:630
 msgid "[created] repository as fork"
 msgstr "フォークしてリポジトリを[作成]"
 
-#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598
+#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640
 msgid "[forked] repository"
 msgstr "リポジトリを[フォーク]"
 
-#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600
+#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642
 msgid "[updated] repository"
 msgstr "リポジトリを[更新]"
 
-#: rhodecode/lib/helpers.py:594
+#: rhodecode/lib/helpers.py:636
 msgid "[delete] repository"
 msgstr "リポジトリを[削除]"
 
-#: rhodecode/lib/helpers.py:602
+#: rhodecode/lib/helpers.py:644
 msgid "[created] user"
 msgstr "ユーザーを[作成]"
 
-#: rhodecode/lib/helpers.py:604
+#: rhodecode/lib/helpers.py:646
 msgid "[updated] user"
 msgstr "ユーザーを[更新]"
 
-#: rhodecode/lib/helpers.py:606
+#: rhodecode/lib/helpers.py:648
 msgid "[created] users group"
 msgstr "ユーザーグループを[作成]"
 
-#: rhodecode/lib/helpers.py:608
+#: rhodecode/lib/helpers.py:650
 msgid "[updated] users group"
 msgstr "ユーザーグループを[更新]"
 
-#: rhodecode/lib/helpers.py:610
+#: rhodecode/lib/helpers.py:652
 msgid "[commented] on revision in repository"
 msgstr "リポジトリのリビジョンに[コメント]"
 
-#: rhodecode/lib/helpers.py:612
+#: rhodecode/lib/helpers.py:654
 #, fuzzy
 msgid "[commented] on pull request for"
 msgstr "プルリクエストに[コメント]"
 
-#: rhodecode/lib/helpers.py:614
+#: rhodecode/lib/helpers.py:656
 #, fuzzy
 msgid "[closed] pull request for"
 msgstr "プルリクエストに[コメント]"
 
-#: rhodecode/lib/helpers.py:616
+#: rhodecode/lib/helpers.py:658
 msgid "[pushed] into"
 msgstr "[プッシュ]"
 
-#: rhodecode/lib/helpers.py:618
+#: rhodecode/lib/helpers.py:660
 msgid "[committed via RhodeCode] into repository"
 msgstr "リポジトリに[RhodeCode経由でコミット]"
 
-#: rhodecode/lib/helpers.py:620
+#: rhodecode/lib/helpers.py:662
 msgid "[pulled from remote] into repository"
 msgstr "リポジトリに[リモートからプル]"
 
-#: rhodecode/lib/helpers.py:622
+#: rhodecode/lib/helpers.py:664
 msgid "[pulled] from"
 msgstr "[プル]"
 
-#: rhodecode/lib/helpers.py:624
+#: rhodecode/lib/helpers.py:666
 msgid "[started following] repository"
 msgstr "リポジトリの[フォローを開始]"
 
-#: rhodecode/lib/helpers.py:626
+#: rhodecode/lib/helpers.py:668
 msgid "[stopped following] repository"
 msgstr "リポジトリの[フォローを停止]"
 
-#: rhodecode/lib/helpers.py:790
+#: rhodecode/lib/helpers.py:840
 #, python-format
 msgid " and %s more"
 msgstr " と %s 以上"
 
-#: rhodecode/lib/helpers.py:794
+#: rhodecode/lib/helpers.py:844
 msgid "No Files"
 msgstr ""
 
@@ -872,75 +949,83 b' msgstr ""'
 msgid "[Mention]"
 msgstr ""
 
-#: rhodecode/model/db.py:1063
+#: rhodecode/model/db.py:1140
 msgid "Repository no access"
 msgstr ""
 
-#: rhodecode/model/db.py:1064
+#: rhodecode/model/db.py:1141
 msgid "Repository read access"
 msgstr ""
 
-#: rhodecode/model/db.py:1065
+#: rhodecode/model/db.py:1142
 msgid "Repository write access"
 msgstr ""
 
-#: rhodecode/model/db.py:1066
+#: rhodecode/model/db.py:1143
 msgid "Repository admin access"
 msgstr ""
 
-#: rhodecode/model/db.py:1068
+#: rhodecode/model/db.py:1145
 msgid "Repositories Group no access"
 msgstr ""
 
-#: rhodecode/model/db.py:1069
+#: rhodecode/model/db.py:1146
 msgid "Repositories Group read access"
 msgstr ""
 
-#: rhodecode/model/db.py:1070
+#: rhodecode/model/db.py:1147
 msgid "Repositories Group write access"
 msgstr ""
 
-#: rhodecode/model/db.py:1071
+#: rhodecode/model/db.py:1148
 msgid "Repositories Group admin access"
 msgstr ""
 
-#: rhodecode/model/db.py:1073
+#: rhodecode/model/db.py:1150
 msgid "RhodeCode Administrator"
 msgstr ""
 
-#: rhodecode/model/db.py:1074
+#: rhodecode/model/db.py:1151
 msgid "Repository creation disabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1075
+#: rhodecode/model/db.py:1152
 msgid "Repository creation enabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1076
+#: rhodecode/model/db.py:1153
+msgid "Repository forking disabled"
+msgstr ""
+
+#: rhodecode/model/db.py:1154
+msgid "Repository forking enabled"
+msgstr ""
+
+#: rhodecode/model/db.py:1155
 msgid "Register disabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1077
+#: rhodecode/model/db.py:1156
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1080
+#: rhodecode/model/db.py:1159
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1481
+#: rhodecode/model/db.py:1579
 msgid "Not Reviewed"
 msgstr "未レビュー"
 
-#: rhodecode/model/db.py:1482
+#: rhodecode/model/db.py:1580
 msgid "Approved"
 msgstr "承認"
 
-#: rhodecode/model/db.py:1483
+#: rhodecode/model/db.py:1581
 msgid "Rejected"
 msgstr "却下"
 
-#: rhodecode/model/db.py:1484
+#: rhodecode/model/db.py:1582
 msgid "Under Review"
 msgstr "レビュー中"
 
@@ -991,61 +1076,65 b' msgstr ""'
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:526
+#: rhodecode/model/scm.py:535
 msgid "latest tip"
 msgstr "最新のtip"
 
-#: rhodecode/model/user.py:240
+#: rhodecode/model/user.py:230
 msgid "new user registration"
 msgstr "新規ユーザー登録"
 
-#: rhodecode/model/user.py:265 rhodecode/model/user.py:287
-#: rhodecode/model/user.py:309
+#: rhodecode/model/user.py:255 rhodecode/model/user.py:277
+#: rhodecode/model/user.py:299
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:333
+#: rhodecode/model/user.py:323
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:339
+#: rhodecode/model/user.py:329
 #, 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:52
+#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36
+msgid "Value cannot be an empty list"
+msgstr ""
+
+#: rhodecode/model/validators.py:82
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "ユーザー名 \"%(username)s\" はすでに使われています"
 
-#: rhodecode/model/validators.py:54
+#: rhodecode/model/validators.py:84
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr "ユーザー名 \"%(username)s\" は許可されていません"
 
-#: rhodecode/model/validators.py:56
+#: rhodecode/model/validators.py:86
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
 msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります"
 
-#: rhodecode/model/validators.py:84
+#: rhodecode/model/validators.py:114
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr "ユーザー名 %(username)s は不正です"
 
-#: rhodecode/model/validators.py:103
+#: rhodecode/model/validators.py:133
 msgid "Invalid users group name"
 msgstr "不正なユーザーグループ名です"
 
-#: rhodecode/model/validators.py:104
+#: rhodecode/model/validators.py:134
 #, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr "ユーザーグループ \"%(usersgroup)s\" はすでに存在します"
 
-#: rhodecode/model/validators.py:106
+#: rhodecode/model/validators.py:136
 msgid ""
 "users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
@@ -1053,95 +1142,100 b' msgstr ""'
 "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります"
 " "
 
-#: rhodecode/model/validators.py:144
+#: rhodecode/model/validators.py:174
 msgid "Cannot assign this group as parent"
 msgstr "このグループは親にできません"
 
-#: rhodecode/model/validators.py:145
+#: rhodecode/model/validators.py:175
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "グループ \"%(group_name)s\" はすでに存在します"
 
-#: rhodecode/model/validators.py:147
+#: rhodecode/model/validators.py:177
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "グループ名 \"%(group_name)s\" を持つリポジトリはすでに存在します"
 
-#: rhodecode/model/validators.py:205
+#: rhodecode/model/validators.py:235
 msgid "Invalid characters (non-ascii) in password"
 msgstr "パスワードに利用出来ない文字列(non-ascii)です"
 
-#: rhodecode/model/validators.py:220
+#: rhodecode/model/validators.py:250
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: rhodecode/model/validators.py:237
+#: rhodecode/model/validators.py:267
 msgid "invalid password"
 msgstr "不正なパスワードです"
 
-#: rhodecode/model/validators.py:238
+#: rhodecode/model/validators.py:268
 msgid "invalid user name"
 msgstr "不正なユーザー名です"
 
-#: rhodecode/model/validators.py:239
+#: rhodecode/model/validators.py:269
 msgid "Your account is disabled"
 msgstr "アカウントは無効です"
 
-#: rhodecode/model/validators.py:283
+#: rhodecode/model/validators.py:313
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "リポジトリ名 %(repo)s は許可されていません"
 
-#: rhodecode/model/validators.py:285
+#: rhodecode/model/validators.py:315
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "リポジトリ %(repo)s はすでに存在します"
 
-#: rhodecode/model/validators.py:286
+#: rhodecode/model/validators.py:316
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "リポジトリ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します"
 
-#: rhodecode/model/validators.py:288
+#: rhodecode/model/validators.py:318
 #, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します"
 
-#: rhodecode/model/validators.py:386
+#: rhodecode/model/validators.py:431
 msgid "invalid clone url"
 msgstr "無効なクローンURIです"
 
-#: rhodecode/model/validators.py:387
-msgid "Invalid clone url, provide a valid clone http\\s url"
+#: rhodecode/model/validators.py:432
+msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 
-#: rhodecode/model/validators.py:418
+#: rhodecode/model/validators.py:457
 msgid "Fork have to be the same type as parent"
 msgstr "フォークは親と同じタイプの必要があります"
 
-#: rhodecode/model/validators.py:439
+#: rhodecode/model/validators.py:478
 msgid "This username or users group name is not valid"
 msgstr "ユーザー名かユーザーグループが不正です"
 
-#: rhodecode/model/validators.py:509
+#: rhodecode/model/validators.py:562
 msgid "This is not a valid path"
 msgstr "不正なパスです"
 
-#: rhodecode/model/validators.py:524
+#: rhodecode/model/validators.py:577
 msgid "This e-mail address is already taken"
 msgstr "このメールアドレスはすでに取得されています"
 
-#: rhodecode/model/validators.py:544
+#: rhodecode/model/validators.py:597
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "メールアドレス \"%(email)s\" は存在しません"
 
-#: rhodecode/model/validators.py:581
+#: rhodecode/model/validators.py:634
 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:653
+#, python-format
+msgid "Revisions %(revs)s are already part of pull request or have set status"
+msgstr ""
+
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr "ダッシュボード"
@@ -1160,7 +1254,7 b' msgstr "\xe3\x82\xaf\xe3\x82\xa4\xe3\x83\x83\xe3\x82\xaf\xe3\x83\x95\xe3\x82\xa3\xe3\x83\xab\xe3\x82\xbf..."'
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:219
+#: rhodecode/templates/base/base.html:221
 msgid "repositories"
 msgstr "リポジトリ"
 
@@ -1180,9 +1274,9 b' msgid "Group name"'
 msgstr "グループ名"
 
 #: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:67
-#: rhodecode/templates/index_base.html:132
-#: rhodecode/templates/index_base.html:158
+#: rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/index_base.html:168
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:72
@@ -1200,15 +1294,15 b' msgstr "\xe8\xaa\xac\xe6\x98\x8e"'
 msgid "Repositories group"
 msgstr "リポジトリグループ"
 
-#: rhodecode/templates/index_base.html:66
-#: rhodecode/templates/index_base.html:156
+#: rhodecode/templates/index_base.html:70
+#: rhodecode/templates/index_base.html:166
 #: 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:172
+#: rhodecode/templates/admin/users/user_edit.html:192
 #: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:154
-#: rhodecode/templates/admin/users/user_edit_my_account.html:190
+#: rhodecode/templates/admin/users/user_edit_my_account.html:157
+#: rhodecode/templates/admin/users/user_edit_my_account.html:193
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
@@ -1219,61 +1313,61 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x82\xb0\xe3\x83\xab\xe3\x83\xbc\xe3\x83\x97"'
 #: rhodecode/templates/journal/journal.html:186
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:119
+#: rhodecode/templates/summary/summary.html:123
 #: rhodecode/templates/tags/tags.html:36
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr "名前"
 
-#: rhodecode/templates/index_base.html:68
+#: rhodecode/templates/index_base.html:72
 msgid "Last change"
 msgstr "最後の変更時刻"
 
-#: rhodecode/templates/index_base.html:69
-#: rhodecode/templates/index_base.html:161
-#: rhodecode/templates/admin/users/user_edit_my_account.html:156
+#: rhodecode/templates/index_base.html:73
+#: rhodecode/templates/index_base.html:171
+#: rhodecode/templates/admin/users/user_edit_my_account.html:159
 #: rhodecode/templates/journal/journal.html:188
 msgid "Tip"
 msgstr "Tip"
 
-#: rhodecode/templates/index_base.html:70
-#: rhodecode/templates/index_base.html:163
-#: rhodecode/templates/admin/repos/repo_edit.html:112
+#: rhodecode/templates/index_base.html:74
+#: rhodecode/templates/index_base.html:173
+#: rhodecode/templates/admin/repos/repo_edit.html:121
 #: rhodecode/templates/admin/repos/repos.html:73
 msgid "Owner"
 msgstr "所有者"
 
-#: rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:75
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr "RSS"
 
-#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/index_base.html:76
 msgid "Atom"
 msgstr "Atom"
 
-#: rhodecode/templates/index_base.html:102
-#: rhodecode/templates/index_base.html:104
+#: rhodecode/templates/index_base.html:110
+#: rhodecode/templates/index_base.html:112
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "%s の RSS フィードを購読"
 
-#: rhodecode/templates/index_base.html:109
-#: rhodecode/templates/index_base.html:111
+#: rhodecode/templates/index_base.html:117
+#: rhodecode/templates/index_base.html:119
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "%s の ATOM フィードを購読"
 
-#: rhodecode/templates/index_base.html:130
+#: rhodecode/templates/index_base.html:140
 msgid "Group Name"
 msgstr "グループ名"
 
-#: rhodecode/templates/index_base.html:148
-#: rhodecode/templates/index_base.html:188
+#: rhodecode/templates/index_base.html:158
+#: rhodecode/templates/index_base.html:198
 #: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:176
-#: rhodecode/templates/admin/users/users.html:105
+#: rhodecode/templates/admin/users/user_edit_my_account.html:179
+#: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
 #: rhodecode/templates/branches/branches.html:77
 #: rhodecode/templates/journal/journal.html:211
@@ -1281,11 +1375,11 b' msgstr "\xe3\x82\xb0\xe3\x83\xab\xe3\x83\xbc\xe3\x83\x97\xe5\x90\x8d"'
 msgid "Click to sort ascending"
 msgstr "昇順で並び換え"
 
-#: rhodecode/templates/index_base.html:149
-#: rhodecode/templates/index_base.html:189
+#: rhodecode/templates/index_base.html:159
+#: rhodecode/templates/index_base.html:199
 #: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:177
-#: rhodecode/templates/admin/users/users.html:106
+#: rhodecode/templates/admin/users/user_edit_my_account.html:180
+#: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:78
 #: rhodecode/templates/journal/journal.html:212
@@ -1293,14 +1387,14 b' msgstr "\xe6\x98\x87\xe9\xa0\x86\xe3\x81\xa7\xe4\xb8\xa6\xe3\x81\xb3\xe6\x8f\x9b\xe3\x81\x88"'
 msgid "Click to sort descending"
 msgstr "降順で並び替え"
 
-#: rhodecode/templates/index_base.html:159
+#: rhodecode/templates/index_base.html:169
 msgid "Last Change"
 msgstr "最後の変更点"
 
-#: rhodecode/templates/index_base.html:190
+#: rhodecode/templates/index_base.html:200
 #: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:178
-#: rhodecode/templates/admin/users/users.html:107
+#: rhodecode/templates/admin/users/user_edit_my_account.html:181
+#: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
 #: rhodecode/templates/branches/branches.html:79
 #: rhodecode/templates/journal/journal.html:213
@@ -1308,10 +1402,10 b' msgstr "\xe6\x9c\x80\xe5\xbe\x8c\xe3\x81\xae\xe5\xa4\x89\xe6\x9b\xb4\xe7\x82\xb9"'
 msgid "No records found."
 msgstr "レコードが見つかりません"
 
-#: rhodecode/templates/index_base.html:191
+#: rhodecode/templates/index_base.html:201
 #: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:179
-#: rhodecode/templates/admin/users/users.html:108
+#: rhodecode/templates/admin/users/user_edit_my_account.html:182
+#: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:80
 #: rhodecode/templates/journal/journal.html:214
@@ -1319,10 +1413,10 b' msgstr "\xe3\x83\xac\xe3\x82\xb3\xe3\x83\xbc\xe3\x83\x89\xe3\x81\x8c\xe8\xa6\x8b\xe3\x81\xa4\xe3\x81\x8b\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
 msgid "Data error."
 msgstr "データエラー"
 
-#: rhodecode/templates/index_base.html:192
+#: rhodecode/templates/index_base.html:202
 #: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:180
-#: rhodecode/templates/admin/users/users.html:109
+#: rhodecode/templates/admin/users/user_edit_my_account.html:183
+#: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:81
 #: rhodecode/templates/journal/journal.html:215
@@ -1344,7 +1438,7 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_edit.html:50
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
 #: rhodecode/templates/base/base.html:83
-#: rhodecode/templates/summary/summary.html:118
+#: rhodecode/templates/summary/summary.html:122
 msgid "Username"
 msgstr "ユーザー名"
 
@@ -1417,7 +1511,7 b' msgstr "\xe5\x90\x8d\xe5\xad\x97"'
 #: rhodecode/templates/admin/users/user_add.html:77
 #: rhodecode/templates/admin/users/user_edit.html:104
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:120
+#: rhodecode/templates/summary/summary.html:124
 msgid "Email"
 msgstr "メールアドレス"
 
@@ -1579,13 +1673,13 b' msgid "E-mail Attribute"'
 msgstr "メールアドレス属性"
 
 #: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/repos/repo_edit.html:132
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
 #: rhodecode/templates/admin/settings/hooks.html:73
 #: rhodecode/templates/admin/users/user_edit.html:129
-#: rhodecode/templates/admin/users/user_edit.html:154
+#: rhodecode/templates/admin/users/user_edit.html:174
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:115
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:93
 msgid "Save"
 msgstr "保存"
@@ -1604,8 +1698,8 b' msgid "Comments"'
 msgstr "コメント"
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:252
 #: rhodecode/templates/base/base.html:254
+#: rhodecode/templates/base/base.html:256
 msgid "Pull requests"
 msgstr "プルリクエスト"
 
@@ -1631,7 +1725,7 b' msgid "Permissions administration"'
 msgstr "権限管理"
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:125
+#: 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:139
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
@@ -1671,7 +1765,12 b' msgid "Repository creation"'
 msgstr "リポジトリ作成"
 
 #: rhodecode/templates/admin/permissions/permissions.html:71
-#: rhodecode/templates/admin/repos/repo_edit.html:227
+#, fuzzy
+msgid "Repository forking"
+msgstr "リポジトリ作成"
+
+#: rhodecode/templates/admin/permissions/permissions.html:78
+#: rhodecode/templates/admin/repos/repo_edit.html:241
 msgid "set"
 msgstr "保存"
 
@@ -1686,6 +1785,10 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xae\xe8\xbf\xbd\xe5\x8a\xa0"'
 msgid "Repositories"
 msgstr "リポジトリ"
 
+#: rhodecode/templates/admin/repos/repo_add.html:13
+msgid "add new"
+msgstr "新規追加"
+
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
 #: rhodecode/templates/summary/summary.html:95
 #: rhodecode/templates/summary/summary.html:96
@@ -1764,8 +1867,8 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x82\x92\xe7\xb7\xa8\xe9\x9b\x86"'
 
 #: rhodecode/templates/admin/repos/repo_edit.html:13
 #: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:204
-#: rhodecode/templates/admin/users/user_edit.html:206
+#: rhodecode/templates/admin/users/user_edit.html:224
+#: rhodecode/templates/admin/users/user_edit.html:226
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
 #: rhodecode/templates/files/files_source.html:44
@@ -1799,19 +1902,30 b' msgstr "\xe3\x83\x80\xe3\x82\xa6\xe3\x83\xb3\xe3\x83\xad\xe3\x83\xbc\xe3\x83\x89\xe3\x82\x92\xe6\x9c\x89\xe5\x8a\xb9\xe3\x81\xab\xe3\x81\x99\xe3\x82\x8b"'
 msgid "Enable download menu on summary page."
 msgstr "概要ページのダウンロードメニューを有効にします"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:117
+#: rhodecode/templates/admin/repos/repo_edit.html:112
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#, fuzzy
+msgid "Enable locking"
+msgstr "有効にする"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:116
+msgid "Enable lock-by-pulling on repository."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:126
 msgid "Change owner of this repository."
 msgstr "リポジトリの所有者を変更"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:133
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67
+#: 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:180
+#: rhodecode/templates/admin/settings/settings.html:168
+#: rhodecode/templates/admin/settings/settings.html:258
 #: rhodecode/templates/admin/users/user_edit.html:130
-#: rhodecode/templates/admin/users/user_edit.html:155
-#: rhodecode/templates/admin/users/user_edit.html:258
+#: rhodecode/templates/admin/users/user_edit.html:175
+#: rhodecode/templates/admin/users/user_edit.html:278
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:116
+#: 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
@@ -1819,90 +1933,130 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xae\xe6\x89\x80\xe6\x9c\x89\xe8\x80\x85\xe3\x82\x92\xe5\xa4\x89\xe6\x9b\xb4"'
 msgid "Reset"
 msgstr "リセット"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:143
+#: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr "管理"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:146
+#: rhodecode/templates/admin/repos/repo_edit.html:155
 msgid "Statistics"
 msgstr "統計"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:150
+#: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Reset current statistics"
 msgstr "現在の統計情報をリセットする"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:150
+#: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Confirm to remove current statistics"
 msgstr "現在の統計情報をリセットしてもよろしいですか"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:153
+#: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Fetched to rev"
 msgstr "収集するリビジョン"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:154
+#: rhodecode/templates/admin/repos/repo_edit.html:163
 msgid "Stats gathered"
 msgstr "収集した統計情報"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:162
+#: rhodecode/templates/admin/repos/repo_edit.html:171
 msgid "Remote"
 msgstr "リモート"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:166
+#: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Pull changes from remote location"
 msgstr "リモートから変更を取り込む"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:166
+#: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Confirm to pull changes from remote side"
 msgstr "リモートから変更を取り込んでもよろしいですか？"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:177
+#: rhodecode/templates/admin/repos/repo_edit.html:186
 msgid "Cache"
 msgstr "キャッシュ"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:181
+#: rhodecode/templates/admin/repos/repo_edit.html:190
 msgid "Invalidate repository cache"
 msgstr "リポジトリのキャッシュを無効化"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:181
+#: rhodecode/templates/admin/repos/repo_edit.html:190
 msgid "Confirm to invalidate repository cache"
 msgstr "リポジトリのキャッシュを無効化してもよろしいですか？"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:186
-#: rhodecode/templates/base/base.html:316
+#: rhodecode/templates/admin/repos/repo_edit.html:195
 #: rhodecode/templates/base/base.html:318
 #: rhodecode/templates/base/base.html:320
+#: rhodecode/templates/base/base.html:322
 msgid "Public journal"
 msgstr "公開ジャーナル"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:192
+#: rhodecode/templates/admin/repos/repo_edit.html:201
 msgid "Remove from public journal"
 msgstr "公開ジャーナルから削除する"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:194
+#: rhodecode/templates/admin/repos/repo_edit.html:203
 msgid "Add to public journal"
 msgstr "公開ジャーナルに追加する"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:199
+#: rhodecode/templates/admin/repos/repo_edit.html:208
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
 msgstr "公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:206
+#: rhodecode/templates/admin/repos/repo_edit.html:215
+#, fuzzy
+msgid "Locking"
+msgstr "変更可能にする"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:220
+msgid "Unlock locked repo"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:220
+#, fuzzy
+msgid "Confirm to unlock repository"
+msgstr "このリポジトリを削除しますか？"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:223
+msgid "lock repo"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:223
+#, fuzzy
+msgid "Confirm to lock repository"
+msgstr "このリポジトリを削除しますか？"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:224
+#, fuzzy
+msgid "Repository is not locked"
+msgstr "リポジトリロケーション"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:229
+msgid "Force locking on repository. Works only when anonymous access is disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:236
+msgid "Set as fork of"
+msgstr "フォーク元の設定"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:245
+msgid "Manually set this repository as a fork of another from the list"
+msgstr "このリポジトリをリスト中の他のリポジトリのフォークとして、手動で設定します"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:251
 #: rhodecode/templates/changeset/changeset_file_comment.html:26
 msgid "Delete"
 msgstr "削除"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:210
+#: rhodecode/templates/admin/repos/repo_edit.html:255
 msgid "Remove this repository"
 msgstr "このリポジトリを削除"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:210
+#: rhodecode/templates/admin/repos/repo_edit.html:255
 #: rhodecode/templates/journal/journal.html:84
 msgid "Confirm to delete this repository"
 msgstr "このリポジトリを削除しますか？"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:214
+#: rhodecode/templates/admin/repos/repo_edit.html:259
 msgid ""
 "This repository will be renamed in a special way in order to be "
 "unaccesible for RhodeCode and VCS systems.\n"
@@ -1912,14 +2066,6 b' msgstr ""'
 "このリポジトリはRhodeCodeとVCSシステムからアクセスされないような名前に、特別な方法で変更されます。\n"
 "もし、ファイルシステムから完全に削除したい場合、手動で行ってください"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:222
-msgid "Set as fork of"
-msgstr "フォーク元の設定"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:231
-msgid "Manually set this repository as a fork of another from the list"
-msgstr "このリポジトリをリスト中の他のリポジトリのフォークとして、手動で設定します"
-
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
 msgid "none"
@@ -1937,8 +2083,8 b' msgstr "\xe6\x9b\xb8\xe8\xbe\xbc"'
 
 #: 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:83
-#: rhodecode/templates/base/base.html:215
+#: rhodecode/templates/admin/users/users.html:85
+#: rhodecode/templates/base/base.html:217
 msgid "admin"
 msgstr "管理"
 
@@ -1967,18 +2113,18 b' msgstr "default"'
 msgid "revoke"
 msgstr "取消"
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:80
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:83
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67
 msgid "Add another member"
 msgstr "別のメンバーを追加"
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:94
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:97
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
 msgid "Failed to remove user"
 msgstr "ユーザーの削除に失敗しました"
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:109
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:112
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96
 msgid "Failed to remove users group"
 msgstr "ユーザーグループの削除に失敗しました"
 
@@ -2016,7 +2162,7 b' msgstr "\xe8\xa6\xaa\xe3\x82\xb0\xe3\x83\xab\xe3\x83\xbc\xe3\x83\x97"'
 #: 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:93
+#: rhodecode/templates/pullrequests/pullrequest_show.html:113
 msgid "save"
 msgstr "保存"
 
@@ -2028,6 +2174,12 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x82\xb0\xe3\x83\xab\xe3\x83\xbc\xe3\x83\x97\xe3\x82\x92\xe7\xb7\xa8\xe9\x9b\x86"'
 msgid "edit repos group"
 msgstr "リポジトリグループを編集"
 
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other"
+" groups and repositories inside"
+msgstr ""
+
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
 msgid "Repositories groups administration"
 msgstr "リポジトリグループ管理"
@@ -2041,13 +2193,13 b' msgid "Number of toplevel repositories"'
 msgstr "トップレベルリポジトリの数"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
-#: rhodecode/templates/admin/users/users.html:85
+#: rhodecode/templates/admin/users/users.html:87
 #: rhodecode/templates/admin/users_groups/users_groups.html:35
 msgid "action"
 msgstr "アクション"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
-#: rhodecode/templates/admin/users/user_edit.html:235
+#: rhodecode/templates/admin/users/user_edit.html:255
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 #: rhodecode/templates/data_table/_dt_elements.html:7
 #: rhodecode/templates/data_table/_dt_elements.html:103
@@ -2152,92 +2304,140 b' msgid "GA code"'
 msgstr "GAコード"
 
 #: rhodecode/templates/admin/settings/settings.html:112
-#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:167
+#: rhodecode/templates/admin/settings/settings.html:257
 msgid "Save settings"
 msgstr "設定を保存"
 
 #: rhodecode/templates/admin/settings/settings.html:119
 #, fuzzy
-msgid "VCS settings"
-msgstr "設定"
+msgid "Visualisation settings"
+msgstr "アプリケーション全体の設定"
 
 #: rhodecode/templates/admin/settings/settings.html:128
+#, fuzzy
+msgid "Icons"
+msgstr "オプション"
+
+#: rhodecode/templates/admin/settings/settings.html:133
+msgid "Show public repo icon on repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:137
+#, fuzzy
+msgid "Show private repo icon on repositories"
+msgstr "非公開リポジトリ"
+
+#: rhodecode/templates/admin/settings/settings.html:144
+#, fuzzy
+msgid "Meta-Tagging"
+msgstr "設定"
+
+#: rhodecode/templates/admin/settings/settings.html:149
+msgid "Stylify recognised metatags:"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:176
+#, fuzzy
+msgid "VCS settings"
+msgstr "設定"
+
+#: rhodecode/templates/admin/settings/settings.html:185
 msgid "Web"
 msgstr "Web"
 
-#: rhodecode/templates/admin/settings/settings.html:133
+#: rhodecode/templates/admin/settings/settings.html:190
 #, fuzzy
 msgid "require ssl for vcs operations"
 msgstr "プッシュにSSLを必須とする"
 
-#: rhodecode/templates/admin/settings/settings.html:135
+#: rhodecode/templates/admin/settings/settings.html:192
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
 "will return HTTP Error 406: Not Acceptable"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:141
+#: rhodecode/templates/admin/settings/settings.html:198
 msgid "Hooks"
 msgstr "フック"
 
-#: rhodecode/templates/admin/settings/settings.html:146
+#: rhodecode/templates/admin/settings/settings.html:203
 msgid "Update repository after push (hg update)"
 msgstr "プッシュ後にリポジトリをを更新する (hg update)"
 
-#: rhodecode/templates/admin/settings/settings.html:150
+#: rhodecode/templates/admin/settings/settings.html:207
 msgid "Show repository size after push"
 msgstr "プッシュ後にリポジトリのサイズを表示する"
 
-#: rhodecode/templates/admin/settings/settings.html:154
+#: rhodecode/templates/admin/settings/settings.html:211
 msgid "Log user push commands"
 msgstr "ユーザーのプッシュコマンドを記録する"
 
-#: rhodecode/templates/admin/settings/settings.html:158
+#: rhodecode/templates/admin/settings/settings.html:215
 msgid "Log user pull commands"
 msgstr "ユーザーのプルコマンドを記録する"
 
-#: rhodecode/templates/admin/settings/settings.html:162
+#: rhodecode/templates/admin/settings/settings.html:219
 msgid "advanced setup"
 msgstr "高度な設定"
 
-#: rhodecode/templates/admin/settings/settings.html:167
+#: rhodecode/templates/admin/settings/settings.html:224
+#, fuzzy
+msgid "Mercurial Extensions"
+msgstr "Mercurialリポジトリ"
+
+#: rhodecode/templates/admin/settings/settings.html:229
+msgid "largefiles extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:233
+msgid "hgsubversion extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:235
+msgid ""
+"Requires hgsubversion library installed. Allows clonning from svn remote "
+"locations"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:245
 msgid "Repositories location"
 msgstr "リポジトリロケーション"
 
-#: rhodecode/templates/admin/settings/settings.html:172
+#: rhodecode/templates/admin/settings/settings.html:250
 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 "これはアプリケーションの重要な設定です。本当に変更が必要でしょうか。もし、変更した場合、変更を反映さ競るためにアプリケーションを再起動する必要があります。変更可能にするにはこのラベルをクリックして下さい"
 
-#: rhodecode/templates/admin/settings/settings.html:173
+#: rhodecode/templates/admin/settings/settings.html:251
 msgid "unlock"
 msgstr "変更可能にする"
 
-#: rhodecode/templates/admin/settings/settings.html:174
+#: rhodecode/templates/admin/settings/settings.html:252
 msgid ""
 "Location where repositories are stored. After changing this value a "
 "restart, and rescan is required"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:194
+#: rhodecode/templates/admin/settings/settings.html:272
 msgid "Test Email"
 msgstr "テストメール"
 
-#: rhodecode/templates/admin/settings/settings.html:202
+#: rhodecode/templates/admin/settings/settings.html:280
 msgid "Email to"
 msgstr "送信先"
 
-#: rhodecode/templates/admin/settings/settings.html:210
+#: rhodecode/templates/admin/settings/settings.html:288
 msgid "Send"
 msgstr "送る"
 
-#: rhodecode/templates/admin/settings/settings.html:216
+#: rhodecode/templates/admin/settings/settings.html:294
 msgid "System Info and Packages"
 msgstr "システム情報とパッケージ"
 
-#: rhodecode/templates/admin/settings/settings.html:219
+#: rhodecode/templates/admin/settings/settings.html:297
 msgid "show"
 msgstr "表示"
 
@@ -2300,39 +2500,61 b' msgstr "\xe6\x96\xb0\xe3\x81\x97\xe3\x81\x84\xe3\x83\x91\xe3\x82\xb9\xe3\x83\xaf\xe3\x83\xbc\xe3\x83\x89 \xe5\x86\x8d\xe5\x85\xa5\xe5\x8a\x9b"'
 
 #: rhodecode/templates/admin/users/user_edit.html:147
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
+#, fuzzy
+msgid "Inherit default permissions"
+msgstr "デフォルトの権限"
+
+#: rhodecode/templates/admin/users/user_edit.html:152
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:113
+#, python-format
+msgid ""
+"Select to inherit permissions from %s settings. With this selected below "
+"options does not have any action"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:158
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr "リポジトリを作成する"
 
 #: rhodecode/templates/admin/users/user_edit.html:166
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:127
+#, fuzzy
+msgid "Fork repositories"
+msgstr "リポジトリ"
+
+#: rhodecode/templates/admin/users/user_edit.html:186
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
 #, fuzzy
 msgid "Nothing here yet"
 msgstr "通知はまだありません"
 
-#: rhodecode/templates/admin/users/user_edit.html:173
+#: rhodecode/templates/admin/users/user_edit.html:193
 #: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:191
+#: rhodecode/templates/admin/users/user_edit_my_account.html:194
 msgid "Permission"
 msgstr "権限"
 
-#: rhodecode/templates/admin/users/user_edit.html:174
+#: rhodecode/templates/admin/users/user_edit.html:194
 #, fuzzy
 msgid "Edit Permission"
 msgstr "リポジトリの権限"
 
-#: rhodecode/templates/admin/users/user_edit.html:223
+#: rhodecode/templates/admin/users/user_edit.html:243
 msgid "Email addresses"
 msgstr "メールアドレス"
 
-#: rhodecode/templates/admin/users/user_edit.html:236
+#: rhodecode/templates/admin/users/user_edit.html:256
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr "このメールを削除してよろしいですか: %s"
 
-#: rhodecode/templates/admin/users/user_edit.html:250
+#: rhodecode/templates/admin/users/user_edit.html:270
 msgid "New email address"
 msgstr "新しいメールアドレス"
 
-#: rhodecode/templates/admin/users/user_edit.html:257
+#: rhodecode/templates/admin/users/user_edit.html:277
 msgid "Add"
 msgstr "追加"
 
@@ -2368,16 +2590,21 b' msgstr "\xe6\x96\xb0\xe8\xa6\x8f\xe8\xbf\xbd\xe5\x8a\xa0"'
 msgid "Opened by me"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10
 #, fuzzy, python-format
 msgid "Pull request #%s opened on %s"
 msgstr "プルリクエスト #%s"
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
+#, fuzzy
+msgid "Confirm to delete this pull request"
+msgstr "このリポジトリを削除しますか？"
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26
 msgid "I participate in"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
@@ -2419,7 +2646,7 b' msgid "Users administration"'
 msgstr "ユーザー管理"
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:221
+#: rhodecode/templates/base/base.html:223
 msgid "users"
 msgstr "ユーザー"
 
@@ -2427,30 +2654,30 b' msgstr "\xe3\x83\xa6\xe3\x83\xbc\xe3\x82\xb6\xe3\x83\xbc"'
 msgid "ADD NEW USER"
 msgstr "新しいユーザーを追加"
 
-#: rhodecode/templates/admin/users/users.html:76
+#: rhodecode/templates/admin/users/users.html:77
 msgid "username"
 msgstr "ユーザー名"
 
-#: rhodecode/templates/admin/users/users.html:79
+#: rhodecode/templates/admin/users/users.html:80
 #, fuzzy
 msgid "firstname"
 msgstr "名前"
 
-#: rhodecode/templates/admin/users/users.html:80
+#: rhodecode/templates/admin/users/users.html:81
 msgid "lastname"
 msgstr "名字"
 
-#: rhodecode/templates/admin/users/users.html:81
+#: rhodecode/templates/admin/users/users.html:82
 msgid "last login"
 msgstr "最終ログイン日"
 
-#: rhodecode/templates/admin/users/users.html:82
+#: rhodecode/templates/admin/users/users.html:84
 #: rhodecode/templates/admin/users_groups/users_groups.html:34
 msgid "active"
 msgstr "アクティブ"
 
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/base/base.html:224
+#: rhodecode/templates/admin/users/users.html:86
+#: rhodecode/templates/base/base.html:226
 msgid "ldap"
 msgstr "LDAP"
 
@@ -2495,7 +2722,7 b' msgstr "\xe6\x9c\x89\xe5\x8a\xb9\xe3\x81\xaa\xe3\x83\xa1\xe3\x83\xb3\xe3\x83\x90\xe3\x83\xbc"'
 msgid "Add all elements"
 msgstr "全ての要素を追加"
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:126
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:146
 msgid "Group members"
 msgstr "グループメンバー"
 
@@ -2542,9 +2769,9 b' msgid "Inbox"'
 msgstr "受信箱"
 
 #: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:298
 #: rhodecode/templates/base/base.html:300
 #: rhodecode/templates/base/base.html:302
+#: rhodecode/templates/base/base.html:304
 #: rhodecode/templates/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
@@ -2568,9 +2795,9 b' msgid "Home"'
 msgstr "ホーム"
 
 #: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:307
 #: rhodecode/templates/base/base.html:309
 #: rhodecode/templates/base/base.html:311
+#: rhodecode/templates/base/base.html:313
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
@@ -2625,7 +2852,6 b' msgstr "\xe3\x83\x96\xe3\x83\xa9\xe3\x83\xb3\xe3\x83\x81\xe3\x81\xae\xe5\x88\x87\xe3\x82\x8a\xe6\x9b\xbf\xe3\x81\x88"'
 #: 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/files/files.html:40
 msgid "Files"
 msgstr "ファイル"
 
@@ -2636,7 +2862,7 b' msgstr "\xe3\x82\xaa\xe3\x83\x97\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3"'
 
 #: rhodecode/templates/base/base.html:204
 #: rhodecode/templates/base/base.html:206
-#: rhodecode/templates/base/base.html:225
+#: rhodecode/templates/base/base.html:227
 msgid "settings"
 msgstr "設定"
 
@@ -2646,40 +2872,40 b' msgstr "\xe8\xa8\xad\xe5\xae\x9a"'
 msgid "fork"
 msgstr "フォーク"
 
-#: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/changelog/changelog.html:39
+#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/changelog/changelog.html:40
 msgid "Open new pull request"
 msgstr "新しいプルリクエストを作成"
 
-#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/base/base.html:213
 msgid "search"
 msgstr "検索"
 
-#: rhodecode/templates/base/base.html:220
+#: rhodecode/templates/base/base.html:222
 msgid "repositories groups"
 msgstr "リポジトリグループ"
 
-#: rhodecode/templates/base/base.html:222
+#: rhodecode/templates/base/base.html:224
 msgid "users groups"
 msgstr "ユーザーグループ"
 
-#: rhodecode/templates/base/base.html:223
+#: rhodecode/templates/base/base.html:225
 msgid "permissions"
 msgstr "権限"
 
-#: rhodecode/templates/base/base.html:236
 #: rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:240
 msgid "Followers"
 msgstr "フォロワー"
 
-#: rhodecode/templates/base/base.html:244
 #: rhodecode/templates/base/base.html:246
+#: rhodecode/templates/base/base.html:248
 msgid "Forks"
 msgstr "フォーク"
 
-#: rhodecode/templates/base/base.html:325
 #: rhodecode/templates/base/base.html:327
 #: rhodecode/templates/base/base.html:329
+#: rhodecode/templates/base/base.html:331
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "検索"
@@ -2783,46 +3009,46 b' msgstr "%s \xe3\x81\xa8\xe3\x83\x95\xe3\x82\xa9\xe3\x83\xbc\xe3\x82\xaf\xe3\x82\x92\xe6\xaf\x94\xe8\xbc\x83"'
 msgid "Compare fork"
 msgstr "フォークを比較"
 
-#: rhodecode/templates/changelog/changelog.html:44
+#: rhodecode/templates/changelog/changelog.html:46
 msgid "Show"
 msgstr "表示"
 
-#: rhodecode/templates/changelog/changelog.html:70
-#: rhodecode/templates/summary/summary.html:360
+#: rhodecode/templates/changelog/changelog.html:72
+#: rhodecode/templates/summary/summary.html:364
 msgid "show more"
 msgstr "もっと表示"
 
-#: rhodecode/templates/changelog/changelog.html:74
+#: rhodecode/templates/changelog/changelog.html:76
 msgid "Affected number of files, click to show more details"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:87
+#: rhodecode/templates/changelog/changelog.html:89
 #: rhodecode/templates/changeset/changeset.html:38
 #: rhodecode/templates/changeset/changeset_file_comment.html:20
 #: rhodecode/templates/changeset/changeset_range.html:46
 msgid "Changeset status"
 msgstr "リビジョンステータス"
 
-#: rhodecode/templates/changelog/changelog.html:90
+#: rhodecode/templates/changelog/changelog.html:92
 msgid "Click to open associated pull request"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:100
+#: rhodecode/templates/changelog/changelog.html:102
 #: rhodecode/templates/changeset/changeset.html:78
 msgid "Parent"
 msgstr "親リビジョン"
 
-#: rhodecode/templates/changelog/changelog.html:106
+#: rhodecode/templates/changelog/changelog.html:108
 #: rhodecode/templates/changeset/changeset.html:84
 msgid "No parents"
 msgstr "親リビジョンはありません"
 
-#: rhodecode/templates/changelog/changelog.html:111
+#: rhodecode/templates/changelog/changelog.html:113
 #: rhodecode/templates/changeset/changeset.html:88
 msgid "merge"
 msgstr "マージ"
 
-#: rhodecode/templates/changelog/changelog.html:114
+#: rhodecode/templates/changelog/changelog.html:116
 #: rhodecode/templates/changeset/changeset.html:91
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_add.html:33
@@ -2831,20 +3057,20 b' msgstr "\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xb8"'
 msgid "branch"
 msgstr "ブランチ"
 
-#: rhodecode/templates/changelog/changelog.html:120
+#: rhodecode/templates/changelog/changelog.html:122
 msgid "bookmark"
 msgstr "ブックマーク"
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:128
 #: rhodecode/templates/changeset/changeset.html:96
 msgid "tag"
 msgstr "タグ"
 
-#: rhodecode/templates/changelog/changelog.html:162
+#: rhodecode/templates/changelog/changelog.html:164
 msgid "Show selected changes __S -> __E"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:253
+#: rhodecode/templates/changelog/changelog.html:255
 msgid "There are no changes yet"
 msgstr "まだ変更がありません"
 
@@ -2980,7 +3206,7 b' msgstr "\xe6\xaf\x94\xe8\xbc\x83\xe3\x83\x93\xe3\x83\xa5\xe3\x83\xbc"'
 
 #: rhodecode/templates/changeset/changeset_range.html:54
 #: rhodecode/templates/compare/compare_diff.html:41
-#: rhodecode/templates/pullrequests/pullrequest_show.html:50
+#: rhodecode/templates/pullrequests/pullrequest_show.html:69
 msgid "Files affected"
 msgstr ""
 
@@ -3058,12 +3284,13 b' msgid "File diff"'
 msgstr "ファイル差分"
 
 #: rhodecode/templates/files/files.html:4
-#, python-format
-msgid "%s Files"
+#: rhodecode/templates/files/files.html:72
+#, fuzzy, python-format
+msgid "%s files"
 msgstr "%s ファイル"
 
 #: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:336
+#: rhodecode/templates/summary/summary.html:340
 msgid "files"
 msgstr "ファイル"
 
@@ -3380,18 +3607,18 b' msgid "Detailed compare view"'
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:63
+#: rhodecode/templates/pullrequests/pullrequest_show.html:82
 msgid "Pull request reviewers"
 msgstr "プルリクエストレビュアー"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:75
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
 #, fuzzy
 msgid "owner"
 msgstr "所有者"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:89
+#: rhodecode/templates/pullrequests/pullrequest_show.html:109
 #, fuzzy
 msgid "Add reviewer to this pull request."
 msgstr "新しいプルリクエスト"
@@ -3419,19 +3646,35 b' msgstr "\xe3\x83\x97\xe3\x83\xab\xe3\x83\xaa\xe3\x82\xaf\xe3\x82\xa8\xe3\x82\xb9\xe3\x83\x88\xe3\x82\x92\xe9\x80\x81\xe3\x82\x8b"'
 msgid "Closed %s"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:28
+#: rhodecode/templates/pullrequests/pullrequest_show.html:31
+#, fuzzy
+msgid "Status"
+msgstr "ステータスを変更する"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Pull request status"
 msgstr "プルリクエストステータス"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+#: rhodecode/templates/pullrequests/pullrequest_show.html:44
+#, fuzzy
+msgid "Still not reviewed by"
+msgstr "未レビュー"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:47
+#, fuzzy, python-format
+msgid "%d reviewer"
+msgid_plural "%d reviewers"
+msgstr[0] "レビュー中"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:54
 msgid "Created on"
 msgstr "作成日"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:61
 msgid "Compare view"
 msgstr "比較ビュー"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:46
+#: rhodecode/templates/pullrequests/pullrequest_show.html:65
 msgid "Incoming changesets"
 msgstr ""
 
@@ -3490,7 +3733,7 b' msgstr "\xe3\x82\xb3\xe3\x83\x9f\xe3\x83\x83\xe3\x83\x88\xe3\x83\xa1\xe3\x83\x83\xe3\x82\xbb\xe3\x83\xbc\xe3\x82\xb8"'
 msgid "File names"
 msgstr "ファイル名"
 
-#: rhodecode/templates/search/search_commit.html:34
+#: rhodecode/templates/search/search_commit.html:35
 #: rhodecode/templates/search/search_content.html:21
 #: rhodecode/templates/search/search_path.html:15
 msgid "Permission denied"
@@ -3567,115 +3810,115 b' msgstr "\xe5\x85\xac\xe9\x96\x8b"'
 msgid "remote clone"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:112
+#: rhodecode/templates/summary/summary.html:116
 msgid "Contact"
 msgstr "コンタクト"
 
-#: rhodecode/templates/summary/summary.html:126
+#: rhodecode/templates/summary/summary.html:130
 msgid "Clone url"
 msgstr "クローンURL"
 
-#: rhodecode/templates/summary/summary.html:129
+#: rhodecode/templates/summary/summary.html:133
 msgid "Show by Name"
 msgstr "名前で表示"
 
-#: rhodecode/templates/summary/summary.html:130
+#: rhodecode/templates/summary/summary.html:134
 msgid "Show by ID"
 msgstr "IDで表示"
 
-#: rhodecode/templates/summary/summary.html:138
+#: rhodecode/templates/summary/summary.html:142
 msgid "Trending files"
 msgstr "トレンドファイル"
 
-#: rhodecode/templates/summary/summary.html:146
-#: rhodecode/templates/summary/summary.html:162
-#: rhodecode/templates/summary/summary.html:190
+#: rhodecode/templates/summary/summary.html:150
+#: rhodecode/templates/summary/summary.html:166
+#: rhodecode/templates/summary/summary.html:194
 msgid "enable"
 msgstr "有効にする"
 
-#: rhodecode/templates/summary/summary.html:154
+#: rhodecode/templates/summary/summary.html:158
 msgid "Download"
 msgstr "ダウンロード"
 
-#: rhodecode/templates/summary/summary.html:158
+#: rhodecode/templates/summary/summary.html:162
 msgid "There are no downloads yet"
 msgstr "まだダウンロードがありません"
 
-#: rhodecode/templates/summary/summary.html:160
+#: rhodecode/templates/summary/summary.html:164
 msgid "Downloads are disabled for this repository"
 msgstr "このリポジトリのダウンロードは無効化されています"
 
-#: rhodecode/templates/summary/summary.html:166
+#: rhodecode/templates/summary/summary.html:170
 msgid "Download as zip"
 msgstr "ZIPとしてダウンロード"
 
-#: rhodecode/templates/summary/summary.html:169
+#: rhodecode/templates/summary/summary.html:173
 msgid "Check this to download archive with subrepos"
 msgstr "チェックするとダウンロードアーカイブにサブリポジトリが含まれます"
 
-#: rhodecode/templates/summary/summary.html:169
+#: rhodecode/templates/summary/summary.html:173
 msgid "with subrepos"
 msgstr "サブリポジトリを含む"
 
-#: rhodecode/templates/summary/summary.html:182
+#: rhodecode/templates/summary/summary.html:186
 msgid "Commit activity by day / author"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:193
+#: rhodecode/templates/summary/summary.html:197
 msgid "Stats gathered: "
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:214
+#: rhodecode/templates/summary/summary.html:218
 msgid "Shortlog"
 msgstr "ログ"
 
-#: rhodecode/templates/summary/summary.html:216
+#: rhodecode/templates/summary/summary.html:220
 msgid "Quick start"
 msgstr "クイックスタート"
 
-#: rhodecode/templates/summary/summary.html:229
+#: rhodecode/templates/summary/summary.html:233
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:232
+#: rhodecode/templates/summary/summary.html:236
 msgid "Permalink to this readme"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:289
+#: rhodecode/templates/summary/summary.html:293
 #, python-format
 msgid "Download %s as %s"
 msgstr "%s を %sとしてダウンロード"
 
-#: rhodecode/templates/summary/summary.html:646
+#: rhodecode/templates/summary/summary.html:650
 msgid "commits"
 msgstr "コミット"
 
-#: rhodecode/templates/summary/summary.html:647
+#: rhodecode/templates/summary/summary.html:651
 msgid "files added"
 msgstr "追加されたファイル"
 
-#: rhodecode/templates/summary/summary.html:648
+#: rhodecode/templates/summary/summary.html:652
 msgid "files changed"
 msgstr "変更されたファイル"
 
-#: rhodecode/templates/summary/summary.html:649
+#: rhodecode/templates/summary/summary.html:653
 msgid "files removed"
 msgstr "削除されたファイル"
 
-#: rhodecode/templates/summary/summary.html:652
+#: rhodecode/templates/summary/summary.html:656
 msgid "commit"
 msgstr "コミット"
 
-#: rhodecode/templates/summary/summary.html:653
+#: rhodecode/templates/summary/summary.html:657
 msgid "file added"
 msgstr "追加されたファイル"
 
-#: rhodecode/templates/summary/summary.html:654
+#: rhodecode/templates/summary/summary.html:658
 msgid "file changed"
 msgstr "変更されたファイル"
 
-#: rhodecode/templates/summary/summary.html:655
+#: rhodecode/templates/summary/summary.html:659
 msgid "file removed"
 msgstr "削除されたファイル"
 

rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode 1.2.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-07-26 23:35+0200\n"
+"POT-Creation-Date: 2012-09-02 20:30+0200\n"
 "PO-Revision-Date: 2012-05-22 16:47-0300\n"
 "Last-Translator: Augusto Herrmann <[e-mail]>\n"
 "Language-Team: pt_BR <[e-mail]>\n"
@@ -21,24 +21,30 b' msgstr ""'
 msgid "All Branches"
 msgstr "Todos os Ramos"
 
-#: rhodecode/controllers/changeset.py:81
+#: rhodecode/controllers/changeset.py:83
 msgid "show white space"
 msgstr "mostrar espaços em branco"
 
-#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95
+#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
 msgid "ignore white space"
 msgstr "ignorar espaços em branco"
 
-#: rhodecode/controllers/changeset.py:155
+#: rhodecode/controllers/changeset.py:157
 #, python-format
 msgid "%s line context"
 msgstr "contexto de %s linhas"
 
-#: rhodecode/controllers/changeset.py:331
-#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69
+#: rhodecode/controllers/changeset.py:333
+#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70
 msgid "binary file"
 msgstr "arquivo binário"
 
+#: rhodecode/controllers/changeset.py:408
+msgid ""
+"Changing status on a changeset associated witha closed pull request is "
+"not allowed"
+msgstr ""
+
 #: rhodecode/controllers/compare.py:69
 #, fuzzy
 msgid "There are no changesets yet"
@@ -90,80 +96,85 b' msgid "commited on"'
 msgstr "commit"
 
 #: rhodecode/controllers/files.py:84
-#: rhodecode/templates/admin/repos/repo_add.html:13
-msgid "add new"
-msgstr "adicionar novo"
+#, fuzzy
+msgid "click here to add new file"
+msgstr "adicionar novo arquivo"
 
 #: rhodecode/controllers/files.py:85
 #, python-format
 msgid "There are no files yet %s"
 msgstr "Ainda não há arquivos %s"
 
-#: rhodecode/controllers/files.py:254
+#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299
+#, python-format
+msgid "This repository is has been locked by %s on %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:266
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr "Editado %s via RhodeCode"
 
-#: rhodecode/controllers/files.py:259
+#: rhodecode/controllers/files.py:271
 msgid "No changes"
 msgstr "Sem alterações"
 
-#: rhodecode/controllers/files.py:270 rhodecode/controllers/files.py:324
+#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Commit realizado com sucesso para %s"
 
-#: rhodecode/controllers/files.py:275 rhodecode/controllers/files.py:330
+#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352
 msgid "Error occurred during commit"
 msgstr "Ocorreu um erro ao realizar commit"
 
-#: rhodecode/controllers/files.py:296
+#: rhodecode/controllers/files.py:318
 #, python-format
 msgid "Added %s via RhodeCode"
 msgstr "Adicionado %s via RhodeCode"
 
-#: rhodecode/controllers/files.py:310
+#: rhodecode/controllers/files.py:332
 msgid "No content"
 msgstr "Nenhum conteúdo"
 
-#: rhodecode/controllers/files.py:314
+#: rhodecode/controllers/files.py:336
 msgid "No filename"
 msgstr "Nenhum nomes de arquivo"
 
-#: rhodecode/controllers/files.py:356
+#: rhodecode/controllers/files.py:378
 msgid "downloads disabled"
 msgstr "downloads desabilitados"
 
-#: rhodecode/controllers/files.py:367
+#: rhodecode/controllers/files.py:389
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Revisão desconhecida %s"
 
-#: rhodecode/controllers/files.py:369
+#: rhodecode/controllers/files.py:391
 msgid "Empty repository"
 msgstr "Repositório vazio"
 
-#: rhodecode/controllers/files.py:371
+#: rhodecode/controllers/files.py:393
 msgid "Unknown archive type"
 msgstr "Arquivo de tipo desconhecido"
 
-#: rhodecode/controllers/files.py:472
+#: rhodecode/controllers/files.py:494
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "Conjuntos de mudanças"
 
-#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70
-#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534
+#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72
+#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543
 msgid "Branches"
 msgstr "Ramos"
 
-#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545
+#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76
+#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90
+#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -174,7 +185,7 b' msgstr ""'
 "renomeado a partir do sistema de arquivos. Por favor execute a aplicação "
 "outra vez para varrer novamente por repositórios"
 
-#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72
+#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -185,12 +196,12 b' msgstr ""'
 "renomeado a partir do sistema de arquivos. Por favor execute a aplicação "
 "outra vez para varrer novamente por repositórios"
 
-#: rhodecode/controllers/forks.py:164
+#: rhodecode/controllers/forks.py:167
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "bifurcado repositório %s como %s"
 
-#: rhodecode/controllers/forks.py:178
+#: rhodecode/controllers/forks.py:181
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "Ocorreu um erro ao bifurcar o repositório %s"
@@ -201,19 +212,19 b' msgid "public journal"'
 msgstr "Diário público"
 
 #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243
-#: rhodecode/templates/base/base.html:218
+#: rhodecode/templates/base/base.html:220
 msgid "journal"
 msgstr "diário"
 
-#: rhodecode/controllers/login.py:130
+#: rhodecode/controllers/login.py:143
 msgid "You have successfully registered into rhodecode"
 msgstr "Você se registrou com sucesso no rhodecode"
 
-#: rhodecode/controllers/login.py:151
+#: rhodecode/controllers/login.py:164
 msgid "Your password reset link was sent"
 msgstr "Seu link de reinicialização de senha foi enviado"
 
-#: rhodecode/controllers/login.py:171
+#: rhodecode/controllers/login.py:184
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
@@ -221,20 +232,34 b' msgstr ""'
 "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao "
 "seu e-mail"
 
-#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540
+#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549
 msgid "Bookmarks"
 msgstr "Marcadores"
 
+#: rhodecode/controllers/pullrequests.py:158
+msgid "Pull request requires a title with min. 3 chars"
+msgstr ""
+
 #: rhodecode/controllers/pullrequests.py:160
 #, fuzzy
+msgid "error during creation of pull request"
+msgstr "ocorreu um erro ao criar o usuário %s"
+
+#: rhodecode/controllers/pullrequests.py:181
+#, fuzzy
 msgid "Successfully opened new pull request"
 msgstr "usuário excluído com sucesso"
 
-#: rhodecode/controllers/pullrequests.py:163
+#: rhodecode/controllers/pullrequests.py:184
 #, fuzzy
 msgid "Error occurred during sending pull request"
 msgstr "ocorreu um erro ao criar o repositório %s"
 
+#: rhodecode/controllers/pullrequests.py:217
+#, fuzzy
+msgid "Successfully deleted pull request"
+msgstr "usuário excluído com sucesso"
+
 #: rhodecode/controllers/search.py:131
 msgid "Invalid search query. Try quoting it."
 msgstr "Consulta de busca inválida. Tente usar aspas."
@@ -248,19 +273,19 b' msgid "An error occurred during this sea'
 msgstr "Ocorreu um erro durante essa operação de busca"
 
 #: rhodecode/controllers/settings.py:107
-#: rhodecode/controllers/admin/repos.py:264
+#: rhodecode/controllers/admin/repos.py:266
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Repositório %s atualizado com sucesso"
 
 #: rhodecode/controllers/settings.py:125
-#: rhodecode/controllers/admin/repos.py:282
+#: rhodecode/controllers/admin/repos.py:284
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr "ocorreu um erro ao atualizar o repositório %s"
 
 #: rhodecode/controllers/settings.py:143
-#: rhodecode/controllers/admin/repos.py:300
+#: rhodecode/controllers/admin/repos.py:302
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from "
@@ -272,14 +297,14 b' msgstr ""'
 "outra vez para varrer novamente por repositórios"
 
 #: rhodecode/controllers/settings.py:155
-#: rhodecode/controllers/admin/repos.py:312
+#: rhodecode/controllers/admin/repos.py:314
 #, python-format
 msgid "deleted repository %s"
 msgstr "excluído o repositório %s"
 
 #: rhodecode/controllers/settings.py:159
-#: rhodecode/controllers/admin/repos.py:322
-#: rhodecode/controllers/admin/repos.py:328
+#: rhodecode/controllers/admin/repos.py:324
+#: rhodecode/controllers/admin/repos.py:330
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Ocorreu um erro durante a exclusão de %s"
@@ -289,7 +314,7 b' msgid "No data loaded yet"'
 msgstr "Ainda não há dados carregados"
 
 #: rhodecode/controllers/summary.py:142
-#: rhodecode/templates/summary/summary.html:144
+#: rhodecode/templates/summary/summary.html:148
 msgid "Statistics are disabled for this repository"
 msgstr "As estatísticas estão desabillitadas para este repositório"
 
@@ -380,9 +405,9 b' msgstr "Gravar"'
 #: 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:335
 #: rhodecode/templates/base/base.html:337
 #: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:341
 msgid "Admin"
 msgstr "Administrador"
 
@@ -399,18 +424,20 b' msgid "allowed with automatic account ac'
 msgstr "permitido com ativação automática de conta"
 
 #: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/controllers/admin/permissions.py:74
 msgid "Disabled"
 msgstr "Desabilitado"
 
 #: rhodecode/controllers/admin/permissions.py:72
+#: rhodecode/controllers/admin/permissions.py:75
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: rhodecode/controllers/admin/permissions.py:106
+#: rhodecode/controllers/admin/permissions.py:116
 msgid "Default permissions updated successfully"
 msgstr "Permissões padrões atualizadas com sucesso"
 
-#: rhodecode/controllers/admin/permissions.py:123
+#: rhodecode/controllers/admin/permissions.py:130
 msgid "error occurred during update of permissions"
 msgstr "ocorreu um erro ao atualizar as permissões"
 
@@ -418,120 +445,125 b' msgstr "ocorreu um erro ao atualizar as permiss\xc3\xb5es"'
 msgid "--REMOVE FORK--"
 msgstr "--REMOVER BIFURCAÇÂO--"
 
-#: rhodecode/controllers/admin/repos.py:191
+#: rhodecode/controllers/admin/repos.py:192
 #, python-format
 msgid "created repository %s from %s"
 msgstr "repositório %s criado a partir de %s"
 
-#: rhodecode/controllers/admin/repos.py:195
+#: rhodecode/controllers/admin/repos.py:196
 #, python-format
 msgid "created repository %s"
 msgstr "repositório %s criado"
 
-#: rhodecode/controllers/admin/repos.py:226
+#: rhodecode/controllers/admin/repos.py:227
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr "ocorreu um erro ao criar o repositório %s"
 
-#: rhodecode/controllers/admin/repos.py:317
+#: rhodecode/controllers/admin/repos.py:319
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr "Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas"
 
-#: rhodecode/controllers/admin/repos.py:346
+#: rhodecode/controllers/admin/repos.py:348
 msgid "An error occurred during deletion of repository user"
 msgstr "Ocorreu um erro ao excluir usuário de repositório"
 
-#: rhodecode/controllers/admin/repos.py:365
+#: rhodecode/controllers/admin/repos.py:367
 msgid "An error occurred during deletion of repository users groups"
 msgstr "Ocorreu um erro ao excluir grupo de usuário de repositório"
 
-#: rhodecode/controllers/admin/repos.py:382
+#: rhodecode/controllers/admin/repos.py:385
 msgid "An error occurred during deletion of repository stats"
 msgstr "Ocorreu um erro ao excluir estatísticas de repositório"
 
-#: rhodecode/controllers/admin/repos.py:398
+#: rhodecode/controllers/admin/repos.py:402
 msgid "An error occurred during cache invalidation"
 msgstr "Ocorreu um erro ao invalidar o cache"
 
-#: rhodecode/controllers/admin/repos.py:418
-msgid "Updated repository visibility in public journal"
-msgstr "Atualizada a visibilidade do repositório no diário público"
-
 #: rhodecode/controllers/admin/repos.py:422
+#, fuzzy
+msgid "An error occurred during unlocking"
+msgstr "Ocorreu um erro durante essa operação"
+
+#: rhodecode/controllers/admin/repos.py:442
+msgid "Updated repository visibility in public journal"
+msgstr "Atualizada a visibilidade do repositório no diário público"
+
+#: rhodecode/controllers/admin/repos.py:446
 msgid "An error occurred during setting this repository in public journal"
 msgstr "Ocorreu um erro ao ajustar esse repositório no diário público"
 
-#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269
+#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299
 msgid "Token mismatch"
 msgstr "Descompasso de Token"
 
-#: rhodecode/controllers/admin/repos.py:440
+#: rhodecode/controllers/admin/repos.py:464
 msgid "Pulled from remote location"
 msgstr "Realizado pull de localização remota"
 
-#: rhodecode/controllers/admin/repos.py:442
+#: rhodecode/controllers/admin/repos.py:466
 msgid "An error occurred during pull from remote location"
 msgstr "Ocorreu um erro ao realizar pull de localização remota"
 
-#: rhodecode/controllers/admin/repos.py:458
+#: rhodecode/controllers/admin/repos.py:482
 msgid "Nothing"
 msgstr "Nada"
 
-#: rhodecode/controllers/admin/repos.py:460
+#: rhodecode/controllers/admin/repos.py:484
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "Marcado repositório %s como bifurcação de %s"
 
-#: rhodecode/controllers/admin/repos.py:464
+#: rhodecode/controllers/admin/repos.py:488
 msgid "An error occurred during this operation"
 msgstr "Ocorreu um erro durante essa operação"
 
-#: rhodecode/controllers/admin/repos_groups.py:119
+#: rhodecode/controllers/admin/repos_groups.py:116
 #, python-format
 msgid "created repos group %s"
 msgstr "criado grupo de repositórios %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:132
+#: rhodecode/controllers/admin/repos_groups.py:129
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr "ccorreu um erro ao criar grupo de repositório %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:166
+#: rhodecode/controllers/admin/repos_groups.py:163
 #, python-format
 msgid "updated repos group %s"
 msgstr "atualizado grupo de repositórios %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:179
+#: rhodecode/controllers/admin/repos_groups.py:176
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr "ocorreu um erro ao atualizar grupo de repositórios %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:197
+#: rhodecode/controllers/admin/repos_groups.py:194
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr "Esse grupo contém %s repositórios e não pode ser excluído"
 
-#: rhodecode/controllers/admin/repos_groups.py:205
+#: rhodecode/controllers/admin/repos_groups.py:202
 #, python-format
 msgid "removed repos group %s"
 msgstr "removido grupo de repositórios %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:210
+#: rhodecode/controllers/admin/repos_groups.py:208
 msgid "Cannot delete this group it still contains subgroups"
 msgstr "Nao é possível excluir este grupo pois ele ainda contém subgrupos"
 
-#: rhodecode/controllers/admin/repos_groups.py:215
-#: rhodecode/controllers/admin/repos_groups.py:220
+#: rhodecode/controllers/admin/repos_groups.py:213
+#: rhodecode/controllers/admin/repos_groups.py:218
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr "ccorreu um erro ao excluir grupo de repositórios %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:240
+#: rhodecode/controllers/admin/repos_groups.py:238
 msgid "An error occurred during deletion of group user"
 msgstr "Ocorreu um erro ao excluir o usuário de grupo"
 
-#: rhodecode/controllers/admin/repos_groups.py:260
+#: rhodecode/controllers/admin/repos_groups.py:258
 msgid "An error occurred during deletion of group users groups"
 msgstr "Ocorreu um erro ao excluir o grupo do grupo de usuários"
 
@@ -549,91 +581,116 b' msgid "Updated application settings"'
 msgstr "Configurações da aplicação atualizadas"
 
 #: rhodecode/controllers/admin/settings.py:164
-#: rhodecode/controllers/admin/settings.py:230
+#: rhodecode/controllers/admin/settings.py:275
 msgid "error occurred during updating application settings"
 msgstr "ocorreu um erro ao atualizar as configurações da aplicação"
 
-#: rhodecode/controllers/admin/settings.py:226
-msgid "Updated mercurial settings"
+#: rhodecode/controllers/admin/settings.py:200
+#, fuzzy
+msgid "Updated visualisation settings"
+msgstr "Configurações da aplicação atualizadas"
+
+#: rhodecode/controllers/admin/settings.py:205
+#, fuzzy
+msgid "error occurred during updating visualisation settings"
+msgstr "ocorreu um erro ao atualizar as configurações da aplicação"
+
+#: rhodecode/controllers/admin/settings.py:271
+#, fuzzy
+msgid "Updated VCS settings"
 msgstr "Atualizadas as configurações do mercurial"
 
-#: rhodecode/controllers/admin/settings.py:240
+#: rhodecode/controllers/admin/settings.py:285
 msgid "Added new hook"
 msgstr "Adicionado novo gancho"
 
-#: rhodecode/controllers/admin/settings.py:252
+#: rhodecode/controllers/admin/settings.py:297
 msgid "Updated hooks"
 msgstr "Atualizados os ganchos"
 
-#: rhodecode/controllers/admin/settings.py:256
+#: rhodecode/controllers/admin/settings.py:301
 msgid "error occurred during hook creation"
 msgstr "ocorreu um erro ao criar gancho"
 
-#: rhodecode/controllers/admin/settings.py:275
+#: rhodecode/controllers/admin/settings.py:320
 msgid "Email task created"
 msgstr "Tarefa de e-mail criada"
 
-#: rhodecode/controllers/admin/settings.py:330
+#: rhodecode/controllers/admin/settings.py:375
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr "Você não pode editar esse usuário pois ele é crucial para toda a aplicação"
 
-#: rhodecode/controllers/admin/settings.py:361
+#: rhodecode/controllers/admin/settings.py:406
 msgid "Your account was updated successfully"
 msgstr "Sua conta foi atualizada com sucesso"
 
-#: rhodecode/controllers/admin/settings.py:376
-#: rhodecode/controllers/admin/users.py:186
+#: rhodecode/controllers/admin/settings.py:421
+#: rhodecode/controllers/admin/users.py:191
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr "ocorreu um erro ao atualizar o usuário %s"
 
-#: rhodecode/controllers/admin/users.py:127
+#: rhodecode/controllers/admin/users.py:130
 #, python-format
 msgid "created user %s"
 msgstr "usuário %s criado"
 
-#: rhodecode/controllers/admin/users.py:139
+#: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "error occurred during creation of user %s"
 msgstr "ocorreu um erro ao criar o usuário %s"
 
-#: rhodecode/controllers/admin/users.py:168
+#: rhodecode/controllers/admin/users.py:171
 msgid "User updated successfully"
 msgstr "Usuário atualizado com sucesso"
 
-#: rhodecode/controllers/admin/users.py:202
+#: rhodecode/controllers/admin/users.py:207
 msgid "successfully deleted user"
 msgstr "usuário excluído com sucesso"
 
-#: rhodecode/controllers/admin/users.py:207
+#: rhodecode/controllers/admin/users.py:212
 msgid "An error occurred during deletion of user"
 msgstr "Ocorreu um erro ao excluir o usuário"
 
-#: rhodecode/controllers/admin/users.py:221
+#: rhodecode/controllers/admin/users.py:226
 msgid "You can't edit this user"
 msgstr "Você não pode editar esse usuário"
 
-#: rhodecode/controllers/admin/users.py:253
-#: rhodecode/controllers/admin/users_groups.py:219
+#: rhodecode/controllers/admin/users.py:266
 msgid "Granted 'repository create' permission to user"
 msgstr "Concedida permissão de 'criar repositório' ao usuário"
 
-#: rhodecode/controllers/admin/users.py:262
-#: rhodecode/controllers/admin/users_groups.py:229
+#: rhodecode/controllers/admin/users.py:271
 msgid "Revoked 'repository create' permission to user"
 msgstr "Revogada permissão de 'criar repositório' ao usuário"
 
-#: rhodecode/controllers/admin/users.py:278
+#: rhodecode/controllers/admin/users.py:277
+#, fuzzy
+msgid "Granted 'repository fork' permission to user"
+msgstr "Concedida permissão de 'criar repositório' ao usuário"
+
+#: rhodecode/controllers/admin/users.py:282
+#, fuzzy
+msgid "Revoked 'repository fork' permission to user"
+msgstr "Revogada permissão de 'criar repositório' ao usuário"
+
+#: rhodecode/controllers/admin/users.py:288
+#: rhodecode/controllers/admin/users_groups.py:255
+#, fuzzy
+msgid "An error occurred during permissions saving"
+msgstr "Ocorreu um erro durante essa operação"
+
+#: rhodecode/controllers/admin/users.py:303
 #, python-format
 msgid "Added email %s to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:284
+#: rhodecode/controllers/admin/users.py:309
 #, fuzzy
 msgid "An error occurred during email saving"
 msgstr "Ocorreu um erro durante essa operação"
 
-#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users.py:319
 #, fuzzy
 msgid "Removed email from user"
 msgstr "removido grupo de repositórios %s"
@@ -653,178 +710,198 b' msgstr "ocorreu um erro ao criar o grupo de usu\xc3\xa1rios %s"'
 msgid "updated users group %s"
 msgstr "grupo de usuários %s atualizado"
 
-#: rhodecode/controllers/admin/users_groups.py:152
+#: rhodecode/controllers/admin/users_groups.py:157
 #, python-format
 msgid "error occurred during update of users group %s"
 msgstr "ocorreu um erro ao atualizar o grupo de usuários %s"
 
-#: rhodecode/controllers/admin/users_groups.py:169
+#: rhodecode/controllers/admin/users_groups.py:174
 msgid "successfully deleted users group"
 msgstr "grupo de usuários excluído com sucesso"
 
-#: rhodecode/controllers/admin/users_groups.py:174
+#: rhodecode/controllers/admin/users_groups.py:179
 msgid "An error occurred during deletion of users group"
 msgstr "Ocorreu um erro ao excluir o grupo de usuários"
 
-#: rhodecode/lib/auth.py:497
+#: rhodecode/controllers/admin/users_groups.py:233
+#, fuzzy
+msgid "Granted 'repository create' permission to users group"
+msgstr "Concedida permissão de 'criar repositório' ao usuário"
+
+#: rhodecode/controllers/admin/users_groups.py:238
+#, fuzzy
+msgid "Revoked 'repository create' permission to users group"
+msgstr "Revogada permissão de 'criar repositório' ao usuário"
+
+#: rhodecode/controllers/admin/users_groups.py:244
+#, fuzzy
+msgid "Granted 'repository fork' permission to users group"
+msgstr "Concedida permissão de 'criar repositório' ao usuário"
+
+#: rhodecode/controllers/admin/users_groups.py:249
+#, fuzzy
+msgid "Revoked 'repository fork' permission to users group"
+msgstr "Revogada permissão de 'criar repositório' ao usuário"
+
+#: rhodecode/lib/auth.py:499
 msgid "You need to be a registered user to perform this action"
 msgstr "Você precisa ser um usuário registrado para realizar essa ação"
 
-#: rhodecode/lib/auth.py:538
+#: rhodecode/lib/auth.py:540
 msgid "You need to be a signed in to view this page"
 msgstr "Você precisa estar logado para ver essa página"
 
-#: rhodecode/lib/diffs.py:85
+#: rhodecode/lib/diffs.py:86
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 "Conjunto de mudanças é grande demais e foi cortado, use o menu de "
 "diferenças para ver as diferenças"
 
-#: rhodecode/lib/diffs.py:95
+#: rhodecode/lib/diffs.py:96
 msgid "No changes detected"
 msgstr "Nenhuma alteração detectada"
 
-#: rhodecode/lib/helpers.py:369
+#: rhodecode/lib/helpers.py:372
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:442
+#: rhodecode/lib/helpers.py:484
 msgid "True"
 msgstr "Verdadeiro"
 
-#: rhodecode/lib/helpers.py:446
+#: rhodecode/lib/helpers.py:488
 msgid "False"
 msgstr "Falso"
 
-#: rhodecode/lib/helpers.py:490
+#: rhodecode/lib/helpers.py:532
 msgid "Changeset not found"
 msgstr "Conjunto de alterações não encontrado"
 
-#: rhodecode/lib/helpers.py:513
+#: rhodecode/lib/helpers.py:555
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "Ver todos os conjuntos de mudanças combinados %s->%s"
 
-#: rhodecode/lib/helpers.py:519
+#: rhodecode/lib/helpers.py:561
 msgid "compare view"
 msgstr "comparar exibir"
 
-#: rhodecode/lib/helpers.py:539
+#: rhodecode/lib/helpers.py:581
 msgid "and"
 msgstr "e"
 
-#: rhodecode/lib/helpers.py:540
+#: rhodecode/lib/helpers.py:582
 #, python-format
 msgid "%s more"
 msgstr "%s mais"
 
-#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46
+#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48
 msgid "revisions"
 msgstr "revisões"
 
-#: rhodecode/lib/helpers.py:564
+#: rhodecode/lib/helpers.py:606
 msgid "fork name "
 msgstr "nome da bifurcação"
 
-#: rhodecode/lib/helpers.py:578
+#: rhodecode/lib/helpers.py:620
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #: rhodecode/templates/pullrequests/pullrequest_show.html:12
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:584
+#: rhodecode/lib/helpers.py:626
 msgid "[deleted] repository"
 msgstr "repositório [excluído]"
 
-#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596
+#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638
 msgid "[created] repository"
 msgstr "repositório [criado]"
 
-#: rhodecode/lib/helpers.py:588
+#: rhodecode/lib/helpers.py:630
 msgid "[created] repository as fork"
 msgstr "repositório [criado] como uma bifurcação"
 
-#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598
+#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640
 msgid "[forked] repository"
 msgstr "repositório [bifurcado]"
 
-#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600
+#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642
 msgid "[updated] repository"
 msgstr "repositório [atualizado]"
 
-#: rhodecode/lib/helpers.py:594
+#: rhodecode/lib/helpers.py:636
 msgid "[delete] repository"
 msgstr "[excluir] repositório"
 
-#: rhodecode/lib/helpers.py:602
+#: rhodecode/lib/helpers.py:644
 #, fuzzy
 msgid "[created] user"
 msgstr "usuário %s criado"
 
-#: rhodecode/lib/helpers.py:604
+#: rhodecode/lib/helpers.py:646
 #, fuzzy
 msgid "[updated] user"
 msgstr "grupo de usuários %s atualizado"
 
-#: rhodecode/lib/helpers.py:606
+#: rhodecode/lib/helpers.py:648
 #, fuzzy
 msgid "[created] users group"
 msgstr "criado grupo de usuários %s"
 
-#: rhodecode/lib/helpers.py:608
+#: rhodecode/lib/helpers.py:650
 #, fuzzy
 msgid "[updated] users group"
 msgstr "grupo de usuários %s atualizado"
 
-#: rhodecode/lib/helpers.py:610
+#: rhodecode/lib/helpers.py:652
 #, fuzzy
 msgid "[commented] on revision in repository"
 msgstr "repositório [criado]"
 
-#: rhodecode/lib/helpers.py:612
+#: rhodecode/lib/helpers.py:654
 #, fuzzy
 msgid "[commented] on pull request for"
 msgstr "repositório [criado]"
 
-#: rhodecode/lib/helpers.py:614
+#: rhodecode/lib/helpers.py:656
 #, fuzzy
 msgid "[closed] pull request for"
 msgstr "repositório [criado]"
 
-#: rhodecode/lib/helpers.py:616
+#: rhodecode/lib/helpers.py:658
 msgid "[pushed] into"
 msgstr "[realizado push] para"
 
-#: rhodecode/lib/helpers.py:618
+#: rhodecode/lib/helpers.py:660
 #, fuzzy
 msgid "[committed via RhodeCode] into repository"
 msgstr "[realizado commit via RhodeCode] para"
 
-#: rhodecode/lib/helpers.py:620
+#: rhodecode/lib/helpers.py:662
 #, fuzzy
 msgid "[pulled from remote] into repository"
 msgstr "[realizado pull remoto] para"
 
-#: rhodecode/lib/helpers.py:622
+#: rhodecode/lib/helpers.py:664
 msgid "[pulled] from"
 msgstr "[realizado pull] a partir de"
 
-#: rhodecode/lib/helpers.py:624
+#: rhodecode/lib/helpers.py:666
 msgid "[started following] repository"
 msgstr "[passou a seguir] o repositório"
 
-#: rhodecode/lib/helpers.py:626
+#: rhodecode/lib/helpers.py:668
 msgid "[stopped following] repository"
 msgstr "[parou de seguir] o repositório"
 
-#: rhodecode/lib/helpers.py:790
+#: rhodecode/lib/helpers.py:840
 #, python-format
 msgid " and %s more"
 msgstr " e mais %s"
 
-#: rhodecode/lib/helpers.py:794
+#: rhodecode/lib/helpers.py:844
 msgid "No Files"
 msgstr "Nenhum Arquivo"
 
@@ -897,88 +974,98 b' msgstr "na linha %s"'
 msgid "[Mention]"
 msgstr "[Menção]"
 
-#: rhodecode/model/db.py:1063
+#: rhodecode/model/db.py:1140
 #, fuzzy
 msgid "Repository no access"
 msgstr "repositórios"
 
-#: rhodecode/model/db.py:1064
+#: rhodecode/model/db.py:1141
 #, fuzzy
 msgid "Repository read access"
 msgstr "Esse repositório já existe"
 
-#: rhodecode/model/db.py:1065
+#: rhodecode/model/db.py:1142
 #, fuzzy
 msgid "Repository write access"
 msgstr "repositórios"
 
-#: rhodecode/model/db.py:1066
+#: rhodecode/model/db.py:1143
 #, fuzzy
 msgid "Repository admin access"
 msgstr "repositórios"
 
-#: rhodecode/model/db.py:1068
+#: rhodecode/model/db.py:1145
 #, fuzzy
 msgid "Repositories Group no access"
 msgstr "grupos de repositórios"
 
-#: rhodecode/model/db.py:1069
+#: rhodecode/model/db.py:1146
 #, fuzzy
 msgid "Repositories Group read access"
 msgstr "grupos de repositórios"
 
-#: rhodecode/model/db.py:1070
+#: rhodecode/model/db.py:1147
 #, fuzzy
 msgid "Repositories Group write access"
 msgstr "grupos de repositórios"
 
-#: rhodecode/model/db.py:1071
+#: rhodecode/model/db.py:1148
 #, fuzzy
 msgid "Repositories Group admin access"
 msgstr "grupos de repositórios"
 
-#: rhodecode/model/db.py:1073
+#: rhodecode/model/db.py:1150
 #, fuzzy
 msgid "RhodeCode Administrator"
 msgstr "Administração de usuários"
 
-#: rhodecode/model/db.py:1074
+#: rhodecode/model/db.py:1151
 #, fuzzy
 msgid "Repository creation disabled"
 msgstr "Criação de repositório"
 
-#: rhodecode/model/db.py:1075
+#: rhodecode/model/db.py:1152
 #, fuzzy
 msgid "Repository creation enabled"
 msgstr "Criação de repositório"
 
-#: rhodecode/model/db.py:1076
+#: rhodecode/model/db.py:1153
+#, fuzzy
+msgid "Repository forking disabled"
+msgstr "Criação de repositório"
+
+#: rhodecode/model/db.py:1154
+#, fuzzy
+msgid "Repository forking enabled"
+msgstr "Criação de repositório"
+
+#: rhodecode/model/db.py:1155
 #, fuzzy
 msgid "Register disabled"
 msgstr "desabilitado"
 
-#: rhodecode/model/db.py:1077
+#: rhodecode/model/db.py:1156
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1080
+#: rhodecode/model/db.py:1159
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1481
+#: rhodecode/model/db.py:1579
 msgid "Not Reviewed"
 msgstr ""
 
-#: rhodecode/model/db.py:1482
+#: rhodecode/model/db.py:1580
 #, fuzzy
 msgid "Approved"
 msgstr "removidos"
 
-#: rhodecode/model/db.py:1483
+#: rhodecode/model/db.py:1581
 msgid "Rejected"
 msgstr ""
 
-#: rhodecode/model/db.py:1484
+#: rhodecode/model/db.py:1582
 msgid "Under Review"
 msgstr ""
 
@@ -1030,29 +1117,29 b' msgstr "comentado no commit"'
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:526
+#: rhodecode/model/scm.py:535
 #, fuzzy
 msgid "latest tip"
 msgstr "último login"
 
-#: rhodecode/model/user.py:240
+#: rhodecode/model/user.py:230
 msgid "new user registration"
 msgstr "registro de novo usuário"
 
-#: rhodecode/model/user.py:265 rhodecode/model/user.py:287
-#: rhodecode/model/user.py:309
+#: rhodecode/model/user.py:255 rhodecode/model/user.py:277
+#: rhodecode/model/user.py:299
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 "Você não pode Editar esse usuário, pois ele é crucial para toda a "
 "aplicação"
 
-#: rhodecode/model/user.py:333
+#: rhodecode/model/user.py:323
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 "Você não pode remover esse usuário, pois ele é crucial para toda a "
 "aplicação"
 
-#: rhodecode/model/user.py:339
+#: rhodecode/model/user.py:329
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch "
@@ -1061,17 +1148,21 b' msgstr ""'
 "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. "
 "Troque os donos ou remova esses repositórios. %s"
 
-#: rhodecode/model/validators.py:52
+#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36
+msgid "Value cannot be an empty list"
+msgstr ""
+
+#: rhodecode/model/validators.py:82
 #, fuzzy, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "Esse nome de usuário já existe"
 
-#: rhodecode/model/validators.py:54
+#: rhodecode/model/validators.py:84
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr ""
 
-#: rhodecode/model/validators.py:56
+#: rhodecode/model/validators.py:86
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
@@ -1079,22 +1170,22 b' msgstr ""'
 "Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, "
 "pontos e hífens e deve iniciar com caractere alfanumérico"
 
-#: rhodecode/model/validators.py:84
+#: rhodecode/model/validators.py:114
 #, fuzzy, python-format
 msgid "Username %(username)s is not valid"
 msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido"
 
-#: rhodecode/model/validators.py:103
+#: rhodecode/model/validators.py:133
 #, fuzzy
 msgid "Invalid users group name"
 msgstr "nome de usuário inválido"
 
-#: rhodecode/model/validators.py:104
+#: rhodecode/model/validators.py:134
 #, fuzzy, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr "Esse grupo de usuários já existe"
 
-#: rhodecode/model/validators.py:106
+#: rhodecode/model/validators.py:136
 msgid ""
 "users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
@@ -1103,92 +1194,93 b' msgstr ""'
 "alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere "
 "alfanumérico"
 
-#: rhodecode/model/validators.py:144
+#: rhodecode/model/validators.py:174
 msgid "Cannot assign this group as parent"
 msgstr "Não é possível associar esse grupo como progenitor"
 
-#: rhodecode/model/validators.py:145
+#: rhodecode/model/validators.py:175
 #, fuzzy, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "Esse nome de usuário já existe"
 
-#: rhodecode/model/validators.py:147
+#: rhodecode/model/validators.py:177
 #, fuzzy, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "Já existe um repositório com esse nome"
 
-#: rhodecode/model/validators.py:205
+#: rhodecode/model/validators.py:235
 #, fuzzy
 msgid "Invalid characters (non-ascii) in password"
 msgstr "Caracteres inválidos na senha"
 
-#: rhodecode/model/validators.py:220
+#: rhodecode/model/validators.py:250
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: rhodecode/model/validators.py:237
+#: rhodecode/model/validators.py:267
 msgid "invalid password"
 msgstr "senha inválida"
 
-#: rhodecode/model/validators.py:238
+#: rhodecode/model/validators.py:268
 msgid "invalid user name"
 msgstr "nome de usuário inválido"
 
-#: rhodecode/model/validators.py:239
+#: rhodecode/model/validators.py:269
 msgid "Your account is disabled"
 msgstr "Sua conta está desabilitada"
 
-#: rhodecode/model/validators.py:283
+#: rhodecode/model/validators.py:313
 #, fuzzy, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "Esse nome de repositório não é permitido"
 
-#: rhodecode/model/validators.py:285
+#: rhodecode/model/validators.py:315
 #, fuzzy, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "Já existe um repositório com esse nome"
 
-#: rhodecode/model/validators.py:286
+#: rhodecode/model/validators.py:316
 #, fuzzy, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "Esse repositório já existe em um grupo \"%s\""
 
-#: rhodecode/model/validators.py:288
+#: rhodecode/model/validators.py:318
 #, fuzzy, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr "Já existe um repositório com esse nome"
 
-#: rhodecode/model/validators.py:386
+#: rhodecode/model/validators.py:431
 msgid "invalid clone url"
 msgstr "URL de clonagem inválida"
 
-#: rhodecode/model/validators.py:387
-msgid "Invalid clone url, provide a valid clone http\\s url"
+#: rhodecode/model/validators.py:432
+#, fuzzy
+msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr "URL de clonagem inválida, forneça uma URL válida de clonagem http\\s"
 
-#: rhodecode/model/validators.py:418
+#: rhodecode/model/validators.py:457
 #, fuzzy
 msgid "Fork have to be the same type as parent"
 msgstr "Bifurcação precisa ser do mesmo tipo que o original"
 
-#: rhodecode/model/validators.py:439
+#: rhodecode/model/validators.py:478
 msgid "This username or users group name is not valid"
 msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido"
 
-#: rhodecode/model/validators.py:509
+#: rhodecode/model/validators.py:562
 msgid "This is not a valid path"
 msgstr "Esse não é um caminho válido"
 
-#: rhodecode/model/validators.py:524
+#: rhodecode/model/validators.py:577
 msgid "This e-mail address is already taken"
 msgstr "Esse endereço de e-mail já está tomado"
 
-#: rhodecode/model/validators.py:544
+#: rhodecode/model/validators.py:597
 #, fuzzy, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "Esse endereço de e-mail não existe."
 
-#: rhodecode/model/validators.py:581
+#: rhodecode/model/validators.py:634
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
@@ -1196,6 +1288,11 b' msgstr ""'
 "O atributo de login LDAP do CN deve ser especificado - isto é o nome do "
 "atributo que é equivalente ao 'nome de usuário'"
 
+#: rhodecode/model/validators.py:653
+#, python-format
+msgid "Revisions %(revs)s are already part of pull request or have set status"
+msgstr ""
+
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr "Painel de Controle"
@@ -1214,7 +1311,7 b' msgstr "filtro r\xc3\xa1pido..."'
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:219
+#: rhodecode/templates/base/base.html:221
 msgid "repositories"
 msgstr "repositórios"
 
@@ -1234,9 +1331,9 b' msgid "Group name"'
 msgstr "Nome do grupo"
 
 #: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:67
-#: rhodecode/templates/index_base.html:132
-#: rhodecode/templates/index_base.html:158
+#: rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/index_base.html:168
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:72
@@ -1254,15 +1351,15 b' msgstr "Descri\xc3\xa7\xc3\xa3o"'
 msgid "Repositories group"
 msgstr "Grupo de repositórios"
 
-#: rhodecode/templates/index_base.html:66
-#: rhodecode/templates/index_base.html:156
+#: rhodecode/templates/index_base.html:70
+#: rhodecode/templates/index_base.html:166
 #: 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:172
+#: rhodecode/templates/admin/users/user_edit.html:192
 #: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:154
-#: rhodecode/templates/admin/users/user_edit_my_account.html:190
+#: rhodecode/templates/admin/users/user_edit_my_account.html:157
+#: rhodecode/templates/admin/users/user_edit_my_account.html:193
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
@@ -1273,61 +1370,61 b' msgstr "Grupo de reposit\xc3\xb3rios"'
 #: rhodecode/templates/journal/journal.html:186
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:119
+#: rhodecode/templates/summary/summary.html:123
 #: rhodecode/templates/tags/tags.html:36
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr "Nome"
 
-#: rhodecode/templates/index_base.html:68
+#: rhodecode/templates/index_base.html:72
 msgid "Last change"
 msgstr "Última alteração"
 
-#: rhodecode/templates/index_base.html:69
-#: rhodecode/templates/index_base.html:161
-#: rhodecode/templates/admin/users/user_edit_my_account.html:156
+#: rhodecode/templates/index_base.html:73
+#: rhodecode/templates/index_base.html:171
+#: rhodecode/templates/admin/users/user_edit_my_account.html:159
 #: rhodecode/templates/journal/journal.html:188
 msgid "Tip"
 msgstr "Ponta"
 
-#: rhodecode/templates/index_base.html:70
-#: rhodecode/templates/index_base.html:163
-#: rhodecode/templates/admin/repos/repo_edit.html:112
+#: rhodecode/templates/index_base.html:74
+#: rhodecode/templates/index_base.html:173
+#: rhodecode/templates/admin/repos/repo_edit.html:121
 #: rhodecode/templates/admin/repos/repos.html:73
 msgid "Owner"
 msgstr "Dono"
 
-#: rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:75
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr "RSS"
 
-#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/index_base.html:76
 msgid "Atom"
 msgstr "Atom"
 
-#: rhodecode/templates/index_base.html:102
-#: rhodecode/templates/index_base.html:104
+#: rhodecode/templates/index_base.html:110
+#: rhodecode/templates/index_base.html:112
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "Assinar o feed rss de %s"
 
-#: rhodecode/templates/index_base.html:109
-#: rhodecode/templates/index_base.html:111
+#: rhodecode/templates/index_base.html:117
+#: rhodecode/templates/index_base.html:119
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "Assinar o feed atom de %s"
 
-#: rhodecode/templates/index_base.html:130
+#: rhodecode/templates/index_base.html:140
 msgid "Group Name"
 msgstr "Nome do Grupo"
 
-#: rhodecode/templates/index_base.html:148
-#: rhodecode/templates/index_base.html:188
+#: rhodecode/templates/index_base.html:158
+#: rhodecode/templates/index_base.html:198
 #: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:176
-#: rhodecode/templates/admin/users/users.html:105
+#: rhodecode/templates/admin/users/user_edit_my_account.html:179
+#: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
 #: rhodecode/templates/branches/branches.html:77
 #: rhodecode/templates/journal/journal.html:211
@@ -1335,11 +1432,11 b' msgstr "Nome do Grupo"'
 msgid "Click to sort ascending"
 msgstr "Clique para ordenar em ordem crescente"
 
-#: rhodecode/templates/index_base.html:149
-#: rhodecode/templates/index_base.html:189
+#: rhodecode/templates/index_base.html:159
+#: rhodecode/templates/index_base.html:199
 #: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:177
-#: rhodecode/templates/admin/users/users.html:106
+#: rhodecode/templates/admin/users/user_edit_my_account.html:180
+#: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:78
 #: rhodecode/templates/journal/journal.html:212
@@ -1347,14 +1444,14 b' msgstr "Clique para ordenar em ordem cre'
 msgid "Click to sort descending"
 msgstr "Clique para ordenar em ordem descrescente"
 
-#: rhodecode/templates/index_base.html:159
+#: rhodecode/templates/index_base.html:169
 msgid "Last Change"
 msgstr "Última Alteração"
 
-#: rhodecode/templates/index_base.html:190
+#: rhodecode/templates/index_base.html:200
 #: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:178
-#: rhodecode/templates/admin/users/users.html:107
+#: rhodecode/templates/admin/users/user_edit_my_account.html:181
+#: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
 #: rhodecode/templates/branches/branches.html:79
 #: rhodecode/templates/journal/journal.html:213
@@ -1362,10 +1459,10 b' msgstr "\xc3\x9altima Altera\xc3\xa7\xc3\xa3o"'
 msgid "No records found."
 msgstr "Nenhum registro encontrado."
 
-#: rhodecode/templates/index_base.html:191
+#: rhodecode/templates/index_base.html:201
 #: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:179
-#: rhodecode/templates/admin/users/users.html:108
+#: rhodecode/templates/admin/users/user_edit_my_account.html:182
+#: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:80
 #: rhodecode/templates/journal/journal.html:214
@@ -1373,10 +1470,10 b' msgstr "Nenhum registro encontrado."'
 msgid "Data error."
 msgstr "Erro de dados."
 
-#: rhodecode/templates/index_base.html:192
+#: rhodecode/templates/index_base.html:202
 #: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:180
-#: rhodecode/templates/admin/users/users.html:109
+#: rhodecode/templates/admin/users/user_edit_my_account.html:183
+#: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:81
 #: rhodecode/templates/journal/journal.html:215
@@ -1398,7 +1495,7 b' msgstr "Entrar em"'
 #: rhodecode/templates/admin/users/user_edit.html:50
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
 #: rhodecode/templates/base/base.html:83
-#: rhodecode/templates/summary/summary.html:118
+#: rhodecode/templates/summary/summary.html:122
 msgid "Username"
 msgstr "Nome de usuário"
 
@@ -1473,7 +1570,7 b' msgstr "\xc3\x9altimo Nome"'
 #: rhodecode/templates/admin/users/user_add.html:77
 #: rhodecode/templates/admin/users/user_edit.html:104
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:120
+#: rhodecode/templates/summary/summary.html:124
 msgid "Email"
 msgstr "E-mail"
 
@@ -1635,13 +1732,13 b' msgid "E-mail Attribute"'
 msgstr "Atributo de E-mail"
 
 #: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/repos/repo_edit.html:132
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
 #: rhodecode/templates/admin/settings/hooks.html:73
 #: rhodecode/templates/admin/users/user_edit.html:129
-#: rhodecode/templates/admin/users/user_edit.html:154
+#: rhodecode/templates/admin/users/user_edit.html:174
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:115
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:93
 msgid "Save"
 msgstr "Salvar"
@@ -1661,8 +1758,8 b' msgid "Comments"'
 msgstr "commits"
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:252
 #: rhodecode/templates/base/base.html:254
+#: rhodecode/templates/base/base.html:256
 msgid "Pull requests"
 msgstr ""
 
@@ -1688,7 +1785,7 b' msgid "Permissions administration"'
 msgstr "Administração de permissões"
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:125
+#: 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:139
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
@@ -1731,7 +1828,12 b' msgid "Repository creation"'
 msgstr "Criação de repositório"
 
 #: rhodecode/templates/admin/permissions/permissions.html:71
-#: rhodecode/templates/admin/repos/repo_edit.html:227
+#, fuzzy
+msgid "Repository forking"
+msgstr "Criação de repositório"
+
+#: rhodecode/templates/admin/permissions/permissions.html:78
+#: rhodecode/templates/admin/repos/repo_edit.html:241
 msgid "set"
 msgstr "ajustar"
 
@@ -1746,6 +1848,10 b' msgstr "Adicionar reposit\xc3\xb3rio"'
 msgid "Repositories"
 msgstr "Repositórios"
 
+#: rhodecode/templates/admin/repos/repo_add.html:13
+msgid "add new"
+msgstr "adicionar novo"
+
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
 #: rhodecode/templates/summary/summary.html:95
 #: rhodecode/templates/summary/summary.html:96
@@ -1830,8 +1936,8 b' msgstr "Editar reposit\xc3\xb3rio"'
 
 #: rhodecode/templates/admin/repos/repo_edit.html:13
 #: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:204
-#: rhodecode/templates/admin/users/user_edit.html:206
+#: rhodecode/templates/admin/users/user_edit.html:224
+#: rhodecode/templates/admin/users/user_edit.html:226
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
 #: rhodecode/templates/files/files_source.html:44
@@ -1865,19 +1971,30 b' msgstr "Habilitar downloads"'
 msgid "Enable download menu on summary page."
 msgstr "Habilitar menu de descarregar na página de sumário."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:117
+#: rhodecode/templates/admin/repos/repo_edit.html:112
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#, fuzzy
+msgid "Enable locking"
+msgstr "habilitar"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:116
+msgid "Enable lock-by-pulling on repository."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:126
 msgid "Change owner of this repository."
 msgstr "Mudar o dono desse repositório."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:133
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67
+#: 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:180
+#: rhodecode/templates/admin/settings/settings.html:168
+#: rhodecode/templates/admin/settings/settings.html:258
 #: rhodecode/templates/admin/users/user_edit.html:130
-#: rhodecode/templates/admin/users/user_edit.html:155
-#: rhodecode/templates/admin/users/user_edit.html:258
+#: rhodecode/templates/admin/users/user_edit.html:175
+#: rhodecode/templates/admin/users/user_edit.html:278
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:116
+#: 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
@@ -1885,70 +2002,70 b' msgstr "Mudar o dono desse reposit\xc3\xb3rio."'
 msgid "Reset"
 msgstr "Limpar"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:143
+#: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr "Administração"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:146
+#: rhodecode/templates/admin/repos/repo_edit.html:155
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:150
+#: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Reset current statistics"
 msgstr "Reinicializar estatísticas atuais"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:150
+#: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Confirm to remove current statistics"
 msgstr "Confirma remover atuais estatísticas"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:153
+#: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Fetched to rev"
 msgstr "Trazida à rev"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:154
+#: rhodecode/templates/admin/repos/repo_edit.html:163
 msgid "Stats gathered"
 msgstr "Estatísticas coletadas"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:162
+#: rhodecode/templates/admin/repos/repo_edit.html:171
 msgid "Remote"
 msgstr "Remoto"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:166
+#: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Pull changes from remote location"
 msgstr "Realizar pull de alterações a partir de localização remota"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:166
+#: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Confirm to pull changes from remote side"
 msgstr "Confirma realizar pull de alterações a partir de lado remoto"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:177
+#: rhodecode/templates/admin/repos/repo_edit.html:186
 msgid "Cache"
 msgstr "Cache"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:181
+#: rhodecode/templates/admin/repos/repo_edit.html:190
 msgid "Invalidate repository cache"
 msgstr "Invalidar cache do repositório"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:181
+#: rhodecode/templates/admin/repos/repo_edit.html:190
 msgid "Confirm to invalidate repository cache"
 msgstr "Confirma invalidar cache do repositório"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:186
-#: rhodecode/templates/base/base.html:316
+#: rhodecode/templates/admin/repos/repo_edit.html:195
 #: rhodecode/templates/base/base.html:318
 #: rhodecode/templates/base/base.html:320
+#: rhodecode/templates/base/base.html:322
 msgid "Public journal"
 msgstr "Diário público"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:192
+#: rhodecode/templates/admin/repos/repo_edit.html:201
 msgid "Remove from public journal"
 msgstr "Remover do diário público"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:194
+#: rhodecode/templates/admin/repos/repo_edit.html:203
 msgid "Add to public journal"
 msgstr "Adicionar ao diário público"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:199
+#: rhodecode/templates/admin/repos/repo_edit.html:208
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
@@ -1956,21 +2073,63 b' msgstr ""'
 "Todas as ações feitas nesse repositório serão acessíveis a todos no "
 "diário público"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:206
+#: rhodecode/templates/admin/repos/repo_edit.html:215
+#, fuzzy
+msgid "Locking"
+msgstr "destravar"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:220
+msgid "Unlock locked repo"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:220
+#, fuzzy
+msgid "Confirm to unlock repository"
+msgstr "Confirma excluir este repositório"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:223
+msgid "lock repo"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:223
+#, fuzzy
+msgid "Confirm to lock repository"
+msgstr "Confirma excluir este repositório"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:224
+#, fuzzy
+msgid "Repository is not locked"
+msgstr "repositórios"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:229
+msgid "Force locking on repository. Works only when anonymous access is disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:236
+#, fuzzy
+msgid "Set as fork of"
+msgstr "Marcar como bifurcação"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:245
+#, fuzzy
+msgid "Manually set this repository as a fork of another from the list"
+msgstr "Marcar manualmente este repositório como sendo uma bifurcação de outro"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:251
 #: rhodecode/templates/changeset/changeset_file_comment.html:26
 msgid "Delete"
 msgstr "Excluir"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:210
+#: rhodecode/templates/admin/repos/repo_edit.html:255
 msgid "Remove this repository"
 msgstr "Remover deste repositório"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:210
+#: rhodecode/templates/admin/repos/repo_edit.html:255
 #: rhodecode/templates/journal/journal.html:84
 msgid "Confirm to delete this repository"
 msgstr "Confirma excluir este repositório"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:214
+#: rhodecode/templates/admin/repos/repo_edit.html:259
 msgid ""
 "This repository will be renamed in a special way in order to be "
 "unaccesible for RhodeCode and VCS systems.\n"
@@ -1982,16 +2141,6 b' msgstr ""'
 "                         Se você precisa exclui-lo completamente do "
 "sistema de arquivos, por favor faça-o manualmente"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:222
-#, fuzzy
-msgid "Set as fork of"
-msgstr "Marcar como bifurcação"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:231
-#, fuzzy
-msgid "Manually set this repository as a fork of another from the list"
-msgstr "Marcar manualmente este repositório como sendo uma bifurcação de outro"
-
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
 msgid "none"
@@ -2009,8 +2158,8 b' msgstr "escrever"'
 
 #: 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:83
-#: rhodecode/templates/base/base.html:215
+#: rhodecode/templates/admin/users/users.html:85
+#: rhodecode/templates/base/base.html:217
 msgid "admin"
 msgstr "administrador"
 
@@ -2040,18 +2189,18 b' msgstr "excluir"'
 msgid "revoke"
 msgstr "revogar"
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:80
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:83
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67
 msgid "Add another member"
 msgstr "Adicionar outro membro"
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:94
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:97
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
 msgid "Failed to remove user"
 msgstr "Falha ao reomver usuário"
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:109
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:112
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96
 msgid "Failed to remove users group"
 msgstr "Falha ao remover grupo de usuários"
 
@@ -2089,7 +2238,7 b' msgstr "Progenitor do grupo"'
 #: 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:93
+#: rhodecode/templates/pullrequests/pullrequest_show.html:113
 msgid "save"
 msgstr "salvar"
 
@@ -2101,6 +2250,12 b' msgstr "Editar grupo de reposit\xc3\xb3rios"'
 msgid "edit repos group"
 msgstr "editar grupo de repositórios"
 
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other"
+" groups and repositories inside"
+msgstr ""
+
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
 msgid "Repositories groups administration"
 msgstr "Administração de grupos de repositórios"
@@ -2114,13 +2269,13 b' msgid "Number of toplevel repositories"'
 msgstr "Número de repositórios de nível superior"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
-#: rhodecode/templates/admin/users/users.html:85
+#: rhodecode/templates/admin/users/users.html:87
 #: rhodecode/templates/admin/users_groups/users_groups.html:35
 msgid "action"
 msgstr "ação"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
-#: rhodecode/templates/admin/users/user_edit.html:235
+#: rhodecode/templates/admin/users/user_edit.html:255
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 #: rhodecode/templates/data_table/_dt_elements.html:7
 #: rhodecode/templates/data_table/_dt_elements.html:103
@@ -2228,59 +2383,107 b' msgid "GA code"'
 msgstr "Código GA"
 
 #: rhodecode/templates/admin/settings/settings.html:112
-#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:167
+#: rhodecode/templates/admin/settings/settings.html:257
 msgid "Save settings"
 msgstr "Salvar configurações"
 
 #: rhodecode/templates/admin/settings/settings.html:119
 #, fuzzy
-msgid "VCS settings"
-msgstr "configurações"
+msgid "Visualisation settings"
+msgstr "Configurações globais da aplicação"
 
 #: rhodecode/templates/admin/settings/settings.html:128
+#, fuzzy
+msgid "Icons"
+msgstr "Opções"
+
+#: rhodecode/templates/admin/settings/settings.html:133
+msgid "Show public repo icon on repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:137
+#, fuzzy
+msgid "Show private repo icon on repositories"
+msgstr "repositório privado"
+
+#: rhodecode/templates/admin/settings/settings.html:144
+#, fuzzy
+msgid "Meta-Tagging"
+msgstr "configurações"
+
+#: rhodecode/templates/admin/settings/settings.html:149
+msgid "Stylify recognised metatags:"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:176
+#, fuzzy
+msgid "VCS settings"
+msgstr "configurações"
+
+#: rhodecode/templates/admin/settings/settings.html:185
 msgid "Web"
 msgstr "Web"
 
-#: rhodecode/templates/admin/settings/settings.html:133
+#: rhodecode/templates/admin/settings/settings.html:190
 #, fuzzy
 msgid "require ssl for vcs operations"
 msgstr "exigir ssl para realizar push"
 
-#: rhodecode/templates/admin/settings/settings.html:135
+#: rhodecode/templates/admin/settings/settings.html:192
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
 "will return HTTP Error 406: Not Acceptable"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:141
+#: rhodecode/templates/admin/settings/settings.html:198
 msgid "Hooks"
 msgstr "Ganchos"
 
-#: rhodecode/templates/admin/settings/settings.html:146
+#: rhodecode/templates/admin/settings/settings.html:203
 msgid "Update repository after push (hg update)"
 msgstr "Atualizar repositório após realizar push (hg update)"
 
-#: rhodecode/templates/admin/settings/settings.html:150
+#: rhodecode/templates/admin/settings/settings.html:207
 msgid "Show repository size after push"
 msgstr "Mostrar tamanho do repositório após o push"
 
-#: rhodecode/templates/admin/settings/settings.html:154
+#: rhodecode/templates/admin/settings/settings.html:211
 msgid "Log user push commands"
 msgstr "Armazenar registro de comandos de push dos usuários"
 
-#: rhodecode/templates/admin/settings/settings.html:158
+#: rhodecode/templates/admin/settings/settings.html:215
 msgid "Log user pull commands"
 msgstr "Armazenar registro de comandos de pull dos usuários"
 
-#: rhodecode/templates/admin/settings/settings.html:162
+#: rhodecode/templates/admin/settings/settings.html:219
 msgid "advanced setup"
 msgstr "confirguações avançadas"
 
-#: rhodecode/templates/admin/settings/settings.html:167
+#: rhodecode/templates/admin/settings/settings.html:224
+#, fuzzy
+msgid "Mercurial Extensions"
+msgstr "Repositório Mercurial"
+
+#: rhodecode/templates/admin/settings/settings.html:229
+msgid "largefiles extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:233
+msgid "hgsubversion extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:235
+msgid ""
+"Requires hgsubversion library installed. Allows clonning from svn remote "
+"locations"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:245
 msgid "Repositories location"
 msgstr "Localização dos repositórios"
 
-#: rhodecode/templates/admin/settings/settings.html:172
+#: rhodecode/templates/admin/settings/settings.html:250
 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 "
@@ -2290,33 +2493,33 b' msgstr ""'
 "certeza de que quer mudar isto, você precisa reiniciar a aplicação para "
 "que essa configuração tenha efeito. Clique este rótulo para destravar."
 
-#: rhodecode/templates/admin/settings/settings.html:173
+#: rhodecode/templates/admin/settings/settings.html:251
 msgid "unlock"
 msgstr "destravar"
 
-#: rhodecode/templates/admin/settings/settings.html:174
+#: rhodecode/templates/admin/settings/settings.html:252
 msgid ""
 "Location where repositories are stored. After changing this value a "
 "restart, and rescan is required"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:194
+#: rhodecode/templates/admin/settings/settings.html:272
 msgid "Test Email"
 msgstr "Testar E-mail"
 
-#: rhodecode/templates/admin/settings/settings.html:202
+#: rhodecode/templates/admin/settings/settings.html:280
 msgid "Email to"
 msgstr "E-mail para"
 
-#: rhodecode/templates/admin/settings/settings.html:210
+#: rhodecode/templates/admin/settings/settings.html:288
 msgid "Send"
 msgstr "Enviar"
 
-#: rhodecode/templates/admin/settings/settings.html:216
+#: rhodecode/templates/admin/settings/settings.html:294
 msgid "System Info and Packages"
 msgstr "Informações de Sistema e Pacotes"
 
-#: rhodecode/templates/admin/settings/settings.html:219
+#: rhodecode/templates/admin/settings/settings.html:297
 msgid "show"
 msgstr "mostrar"
 
@@ -2379,41 +2582,63 b' msgstr "Confirma\xc3\xa7\xc3\xa3o de nova senha"'
 
 #: rhodecode/templates/admin/users/user_edit.html:147
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
+#, fuzzy
+msgid "Inherit default permissions"
+msgstr "Permissões padrão"
+
+#: rhodecode/templates/admin/users/user_edit.html:152
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:113
+#, python-format
+msgid ""
+"Select to inherit permissions from %s settings. With this selected below "
+"options does not have any action"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:158
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr "Criar repositórios"
 
 #: rhodecode/templates/admin/users/user_edit.html:166
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:127
+#, fuzzy
+msgid "Fork repositories"
+msgstr "repositórios"
+
+#: rhodecode/templates/admin/users/user_edit.html:186
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
 #, fuzzy
 msgid "Nothing here yet"
 msgstr "Ainda não há notificações aqui"
 
-#: rhodecode/templates/admin/users/user_edit.html:173
+#: rhodecode/templates/admin/users/user_edit.html:193
 #: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:191
+#: rhodecode/templates/admin/users/user_edit_my_account.html:194
 msgid "Permission"
 msgstr "Permissão"
 
-#: rhodecode/templates/admin/users/user_edit.html:174
+#: rhodecode/templates/admin/users/user_edit.html:194
 #, fuzzy
 msgid "Edit Permission"
 msgstr "Permissão de repositório"
 
-#: rhodecode/templates/admin/users/user_edit.html:223
+#: rhodecode/templates/admin/users/user_edit.html:243
 #, fuzzy
 msgid "Email addresses"
 msgstr "Endereço de e-mail"
 
-#: rhodecode/templates/admin/users/user_edit.html:236
+#: rhodecode/templates/admin/users/user_edit.html:256
 #, fuzzy, python-format
 msgid "Confirm to delete this email: %s"
 msgstr "Confirma excluir este usuário: %s"
 
-#: rhodecode/templates/admin/users/user_edit.html:250
+#: rhodecode/templates/admin/users/user_edit.html:270
 #, fuzzy
 msgid "New email address"
 msgstr "Endereço de e-mail"
 
-#: rhodecode/templates/admin/users/user_edit.html:257
+#: rhodecode/templates/admin/users/user_edit.html:277
 #, fuzzy
 msgid "Add"
 msgstr "adicionar"
@@ -2450,16 +2675,21 b' msgstr "adicionar novo"'
 msgid "Opened by me"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10
 #, python-format
 msgid "Pull request #%s opened on %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
+#, fuzzy
+msgid "Confirm to delete this pull request"
+msgstr "Confirma excluir este repositório"
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26
 msgid "I participate in"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
@@ -2501,7 +2731,7 b' msgid "Users administration"'
 msgstr "Administração de usuários"
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:221
+#: rhodecode/templates/base/base.html:223
 msgid "users"
 msgstr "usuários"
 
@@ -2509,30 +2739,30 b' msgstr "usu\xc3\xa1rios"'
 msgid "ADD NEW USER"
 msgstr "ADICIONAR NOVO USUÁRIO"
 
-#: rhodecode/templates/admin/users/users.html:76
+#: rhodecode/templates/admin/users/users.html:77
 msgid "username"
 msgstr "nome de usuário"
 
-#: rhodecode/templates/admin/users/users.html:79
+#: rhodecode/templates/admin/users/users.html:80
 #, fuzzy
 msgid "firstname"
 msgstr "Primeiro Nome"
 
-#: rhodecode/templates/admin/users/users.html:80
+#: rhodecode/templates/admin/users/users.html:81
 msgid "lastname"
 msgstr "sobrenome"
 
-#: rhodecode/templates/admin/users/users.html:81
+#: rhodecode/templates/admin/users/users.html:82
 msgid "last login"
 msgstr "último login"
 
-#: rhodecode/templates/admin/users/users.html:82
+#: rhodecode/templates/admin/users/users.html:84
 #: rhodecode/templates/admin/users_groups/users_groups.html:34
 msgid "active"
 msgstr "ativo"
 
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/base/base.html:224
+#: rhodecode/templates/admin/users/users.html:86
+#: rhodecode/templates/base/base.html:226
 msgid "ldap"
 msgstr "ldap"
 
@@ -2577,7 +2807,7 b' msgstr "Membros dispon\xc3\xadveis"'
 msgid "Add all elements"
 msgstr "Adicionar todos os elementos"
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:126
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:146
 msgid "Group members"
 msgstr "Membros do grupo"
 
@@ -2624,9 +2854,9 b' msgid "Inbox"'
 msgstr "Caixa de Entrada"
 
 #: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:298
 #: rhodecode/templates/base/base.html:300
 #: rhodecode/templates/base/base.html:302
+#: rhodecode/templates/base/base.html:304
 #: rhodecode/templates/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
@@ -2650,9 +2880,9 b' msgid "Home"'
 msgstr "Início"
 
 #: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:307
 #: rhodecode/templates/base/base.html:309
 #: rhodecode/templates/base/base.html:311
+#: rhodecode/templates/base/base.html:313
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
@@ -2707,7 +2937,6 b' msgstr "Trocar para"'
 #: 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/files/files.html:40
 msgid "Files"
 msgstr "Arquivos"
 
@@ -2718,7 +2947,7 b' msgstr "Op\xc3\xa7\xc3\xb5es"'
 
 #: rhodecode/templates/base/base.html:204
 #: rhodecode/templates/base/base.html:206
-#: rhodecode/templates/base/base.html:225
+#: rhodecode/templates/base/base.html:227
 msgid "settings"
 msgstr "configurações"
 
@@ -2728,40 +2957,40 b' msgstr "configura\xc3\xa7\xc3\xb5es"'
 msgid "fork"
 msgstr "bifurcação"
 
-#: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/changelog/changelog.html:39
+#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/changelog/changelog.html:40
 msgid "Open new pull request"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/base/base.html:213
 msgid "search"
 msgstr "pesquisar"
 
-#: rhodecode/templates/base/base.html:220
+#: rhodecode/templates/base/base.html:222
 msgid "repositories groups"
 msgstr "grupos de repositórios"
 
-#: rhodecode/templates/base/base.html:222
+#: rhodecode/templates/base/base.html:224
 msgid "users groups"
 msgstr "grupos de usuários"
 
-#: rhodecode/templates/base/base.html:223
+#: rhodecode/templates/base/base.html:225
 msgid "permissions"
 msgstr "permissões"
 
-#: rhodecode/templates/base/base.html:236
 #: rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:240
 msgid "Followers"
 msgstr "Seguidores"
 
-#: rhodecode/templates/base/base.html:244
 #: rhodecode/templates/base/base.html:246
+#: rhodecode/templates/base/base.html:248
 msgid "Forks"
 msgstr "Bifurcações"
 
-#: rhodecode/templates/base/base.html:325
 #: rhodecode/templates/base/base.html:327
 #: rhodecode/templates/base/base.html:329
+#: rhodecode/templates/base/base.html:331
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "Pesquisar"
@@ -2870,20 +3099,20 b' msgstr ""'
 msgid "Compare fork"
 msgstr "comparar exibir"
 
-#: rhodecode/templates/changelog/changelog.html:44
+#: rhodecode/templates/changelog/changelog.html:46
 msgid "Show"
 msgstr "Mostrar"
 
-#: rhodecode/templates/changelog/changelog.html:70
-#: rhodecode/templates/summary/summary.html:360
+#: rhodecode/templates/changelog/changelog.html:72
+#: rhodecode/templates/summary/summary.html:364
 msgid "show more"
 msgstr "mostrar mais"
 
-#: rhodecode/templates/changelog/changelog.html:74
+#: rhodecode/templates/changelog/changelog.html:76
 msgid "Affected number of files, click to show more details"
 msgstr "Número de arquivos afetados, clique para mostrar mais detalhes"
 
-#: rhodecode/templates/changelog/changelog.html:87
+#: rhodecode/templates/changelog/changelog.html:89
 #: rhodecode/templates/changeset/changeset.html:38
 #: rhodecode/templates/changeset/changeset_file_comment.html:20
 #: rhodecode/templates/changeset/changeset_range.html:46
@@ -2891,26 +3120,26 b' msgstr "N\xc3\xbamero de arquivos afetados, clique para mostrar mais detalhes"'
 msgid "Changeset status"
 msgstr "Conjuntos de mudanças"
 
-#: rhodecode/templates/changelog/changelog.html:90
+#: rhodecode/templates/changelog/changelog.html:92
 msgid "Click to open associated pull request"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:100
+#: rhodecode/templates/changelog/changelog.html:102
 #: rhodecode/templates/changeset/changeset.html:78
 msgid "Parent"
 msgstr "Progenitor"
 
-#: rhodecode/templates/changelog/changelog.html:106
+#: rhodecode/templates/changelog/changelog.html:108
 #: rhodecode/templates/changeset/changeset.html:84
 msgid "No parents"
 msgstr "Sem progenitores"
 
-#: rhodecode/templates/changelog/changelog.html:111
+#: rhodecode/templates/changelog/changelog.html:113
 #: rhodecode/templates/changeset/changeset.html:88
 msgid "merge"
 msgstr "mesclar"
 
-#: rhodecode/templates/changelog/changelog.html:114
+#: rhodecode/templates/changelog/changelog.html:116
 #: rhodecode/templates/changeset/changeset.html:91
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_add.html:33
@@ -2919,20 +3148,20 b' msgstr "mesclar"'
 msgid "branch"
 msgstr "ramo"
 
-#: rhodecode/templates/changelog/changelog.html:120
+#: rhodecode/templates/changelog/changelog.html:122
 msgid "bookmark"
 msgstr "marcador"
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:128
 #: rhodecode/templates/changeset/changeset.html:96
 msgid "tag"
 msgstr "etiqueta"
 
-#: rhodecode/templates/changelog/changelog.html:162
+#: rhodecode/templates/changelog/changelog.html:164
 msgid "Show selected changes __S -> __E"
 msgstr "Mostrar alterações selecionadas __S -> __E"
 
-#: rhodecode/templates/changelog/changelog.html:253
+#: rhodecode/templates/changelog/changelog.html:255
 msgid "There are no changes yet"
 msgstr "Ainda não há alteações"
 
@@ -3073,7 +3302,7 b' msgstr "Exibir Compara\xc3\xa7\xc3\xa3o"'
 
 #: rhodecode/templates/changeset/changeset_range.html:54
 #: rhodecode/templates/compare/compare_diff.html:41
-#: rhodecode/templates/pullrequests/pullrequest_show.html:50
+#: rhodecode/templates/pullrequests/pullrequest_show.html:69
 msgid "Files affected"
 msgstr "Arquivos afetados"
 
@@ -3153,12 +3382,13 b' msgid "File diff"'
 msgstr "Diff do arquivo"
 
 #: rhodecode/templates/files/files.html:4
+#: rhodecode/templates/files/files.html:72
 #, fuzzy, python-format
-msgid "%s Files"
+msgid "%s files"
 msgstr "arquivos"
 
 #: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:336
+#: rhodecode/templates/summary/summary.html:340
 msgid "files"
 msgstr "arquivos"
 
@@ -3485,18 +3715,18 b' msgid "Detailed compare view"'
 msgstr "comparar exibir"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:63
+#: rhodecode/templates/pullrequests/pullrequest_show.html:82
 msgid "Pull request reviewers"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:75
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
 #, fuzzy
 msgid "owner"
 msgstr "Dono"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:89
+#: rhodecode/templates/pullrequests/pullrequest_show.html:109
 msgid "Add reviewer to this pull request."
 msgstr ""
 
@@ -3526,21 +3756,37 b' msgstr ""'
 msgid "Closed %s"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:28
+#: rhodecode/templates/pullrequests/pullrequest_show.html:31
+#, fuzzy
+msgid "Status"
+msgstr "Conjuntos de mudanças"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Pull request status"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+#: rhodecode/templates/pullrequests/pullrequest_show.html:44
+msgid "Still not reviewed by"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:47
+#, python-format
+msgid "%d reviewer"
+msgid_plural "%d reviewers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:54
 #, fuzzy
 msgid "Created on"
 msgstr "criar um agora"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:61
 #, fuzzy
 msgid "Compare view"
 msgstr "comparar exibir"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:46
+#: rhodecode/templates/pullrequests/pullrequest_show.html:65
 #, fuzzy
 msgid "Incoming changesets"
 msgstr "Nenhum conjunto de alterações ainda."
@@ -3601,7 +3847,7 b' msgstr "mensagem de commit"'
 msgid "File names"
 msgstr "Nomes dos arquivos"
 
-#: rhodecode/templates/search/search_commit.html:34
+#: rhodecode/templates/search/search_commit.html:35
 #: rhodecode/templates/search/search_content.html:21
 #: rhodecode/templates/search/search_path.html:15
 msgid "Permission denied"
@@ -3678,116 +3924,116 b' msgstr "p\xc3\xbablico"'
 msgid "remote clone"
 msgstr "clone remoto"
 
-#: rhodecode/templates/summary/summary.html:112
+#: rhodecode/templates/summary/summary.html:116
 msgid "Contact"
 msgstr "Contato"
 
-#: rhodecode/templates/summary/summary.html:126
+#: rhodecode/templates/summary/summary.html:130
 msgid "Clone url"
 msgstr "URL de clonagem"
 
-#: rhodecode/templates/summary/summary.html:129
+#: rhodecode/templates/summary/summary.html:133
 msgid "Show by Name"
 msgstr "Mostrar por Nome"
 
-#: rhodecode/templates/summary/summary.html:130
+#: rhodecode/templates/summary/summary.html:134
 msgid "Show by ID"
 msgstr "Mostrar por ID"
 
-#: rhodecode/templates/summary/summary.html:138
+#: rhodecode/templates/summary/summary.html:142
 msgid "Trending files"
 msgstr "Tendências em arquivos"
 
-#: rhodecode/templates/summary/summary.html:146
-#: rhodecode/templates/summary/summary.html:162
-#: rhodecode/templates/summary/summary.html:190
+#: rhodecode/templates/summary/summary.html:150
+#: rhodecode/templates/summary/summary.html:166
+#: rhodecode/templates/summary/summary.html:194
 msgid "enable"
 msgstr "habilitar"
 
-#: rhodecode/templates/summary/summary.html:154
+#: rhodecode/templates/summary/summary.html:158
 msgid "Download"
 msgstr "Download"
 
-#: rhodecode/templates/summary/summary.html:158
+#: rhodecode/templates/summary/summary.html:162
 msgid "There are no downloads yet"
 msgstr "Ainda não há downloads"
 
-#: rhodecode/templates/summary/summary.html:160
+#: rhodecode/templates/summary/summary.html:164
 msgid "Downloads are disabled for this repository"
 msgstr "Downloads estão desabilitados para este repositório"
 
-#: rhodecode/templates/summary/summary.html:166
+#: rhodecode/templates/summary/summary.html:170
 #, fuzzy
 msgid "Download as zip"
 msgstr "descarregar como bruto"
 
-#: rhodecode/templates/summary/summary.html:169
+#: rhodecode/templates/summary/summary.html:173
 msgid "Check this to download archive with subrepos"
 msgstr "Marque isto para descarregar arquivo com subrepositórios"
 
-#: rhodecode/templates/summary/summary.html:169
+#: rhodecode/templates/summary/summary.html:173
 msgid "with subrepos"
 msgstr "com subrepositórios"
 
-#: rhodecode/templates/summary/summary.html:182
+#: rhodecode/templates/summary/summary.html:186
 msgid "Commit activity by day / author"
 msgstr "Atividade de commit por dia / autor"
 
-#: rhodecode/templates/summary/summary.html:193
+#: rhodecode/templates/summary/summary.html:197
 msgid "Stats gathered: "
 msgstr "Estatísticas coletadas:"
 
-#: rhodecode/templates/summary/summary.html:214
+#: rhodecode/templates/summary/summary.html:218
 msgid "Shortlog"
 msgstr "Log resumido"
 
-#: rhodecode/templates/summary/summary.html:216
+#: rhodecode/templates/summary/summary.html:220
 msgid "Quick start"
 msgstr "Início rápido"
 
-#: rhodecode/templates/summary/summary.html:229
+#: rhodecode/templates/summary/summary.html:233
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:232
+#: rhodecode/templates/summary/summary.html:236
 msgid "Permalink to this readme"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:289
+#: rhodecode/templates/summary/summary.html:293
 #, python-format
 msgid "Download %s as %s"
 msgstr "Descarregar %s como %s"
 
-#: rhodecode/templates/summary/summary.html:646
+#: rhodecode/templates/summary/summary.html:650
 msgid "commits"
 msgstr "commits"
 
-#: rhodecode/templates/summary/summary.html:647
+#: rhodecode/templates/summary/summary.html:651
 msgid "files added"
 msgstr "arquivos adicionados"
 
-#: rhodecode/templates/summary/summary.html:648
+#: rhodecode/templates/summary/summary.html:652
 msgid "files changed"
 msgstr "arquivos alterados"
 
-#: rhodecode/templates/summary/summary.html:649
+#: rhodecode/templates/summary/summary.html:653
 msgid "files removed"
 msgstr "arquivos removidos"
 
-#: rhodecode/templates/summary/summary.html:652
+#: rhodecode/templates/summary/summary.html:656
 msgid "commit"
 msgstr "commit"
 
-#: rhodecode/templates/summary/summary.html:653
+#: rhodecode/templates/summary/summary.html:657
 msgid "file added"
 msgstr "arquivo adicionado"
 
-#: rhodecode/templates/summary/summary.html:654
+#: rhodecode/templates/summary/summary.html:658
 msgid "file changed"
 msgstr "arquivo alterado"
 
-#: rhodecode/templates/summary/summary.html:655
+#: rhodecode/templates/summary/summary.html:659
 msgid "file removed"
 msgstr "arquivo removido"
 

rhodecode/i18n/rhodecode.pot

@@ -8,7 +8,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode 1.4.0b\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-07-26 23:35+0200\n"
+"POT-Creation-Date: 2012-09-02 20:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -21,24 +21,30 b' msgstr ""'
 msgid "All Branches"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:81
+#: rhodecode/controllers/changeset.py:83
 msgid "show white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95
+#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
 msgid "ignore white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:155
+#: rhodecode/controllers/changeset.py:157
 #, python-format
 msgid "%s line context"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:331 rhodecode/controllers/changeset.py:346
-#: rhodecode/lib/diffs.py:69
+#: rhodecode/controllers/changeset.py:333 rhodecode/controllers/changeset.py:348
+#: rhodecode/lib/diffs.py:70
 msgid "binary file"
 msgstr ""
 
+#: rhodecode/controllers/changeset.py:408
+msgid ""
+"Changing status on a changeset associated witha closed pull request is not "
+"allowed"
+msgstr ""
+
 #: rhodecode/controllers/compare.py:69
 msgid "There are no changesets yet"
 msgstr ""
@@ -84,8 +90,7 b' msgid "commited on"'
 msgstr ""
 
 #: rhodecode/controllers/files.py:84
-#: rhodecode/templates/admin/repos/repo_add.html:13
-msgid "add new"
+msgid "click here to add new file"
 msgstr ""
 
 #: rhodecode/controllers/files.py:85
@@ -93,90 +98,95 b' msgstr ""'
 msgid "There are no files yet %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:254
+#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299
+#, python-format
+msgid "This repository is has been locked by %s on %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:266
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:259
+#: rhodecode/controllers/files.py:271
 msgid "No changes"
 msgstr ""
 
-#: rhodecode/controllers/files.py:270 rhodecode/controllers/files.py:324
+#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346
 #, python-format
 msgid "Successfully committed to %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:275 rhodecode/controllers/files.py:330
+#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/controllers/files.py:296
+#: rhodecode/controllers/files.py:318
 #, python-format
 msgid "Added %s via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:310
+#: rhodecode/controllers/files.py:332
 msgid "No content"
 msgstr ""
 
-#: rhodecode/controllers/files.py:314
+#: rhodecode/controllers/files.py:336
 msgid "No filename"
 msgstr ""
 
-#: rhodecode/controllers/files.py:356
+#: rhodecode/controllers/files.py:378
 msgid "downloads disabled"
 msgstr ""
 
-#: rhodecode/controllers/files.py:367
+#: rhodecode/controllers/files.py:389
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:369
+#: rhodecode/controllers/files.py:391
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/controllers/files.py:371
+#: rhodecode/controllers/files.py:393
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/controllers/files.py:472
+#: rhodecode/controllers/files.py:494
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70
-#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534
+#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72
+#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545
+#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76
+#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90
+#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from the "
 "filesystem please run the application again in order to rescan repositories"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72
+#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72
 #, python-format
 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 ""
 
-#: rhodecode/controllers/forks.py:164
+#: rhodecode/controllers/forks.py:167
 #, python-format
 msgid "forked %s repository as %s"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:178
+#: rhodecode/controllers/forks.py:181
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
@@ -186,34 +196,46 b' msgid "public journal"'
 msgstr ""
 
 #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243
-#: rhodecode/templates/base/base.html:218
+#: rhodecode/templates/base/base.html:220
 msgid "journal"
 msgstr ""
 
-#: rhodecode/controllers/login.py:130
+#: rhodecode/controllers/login.py:143
 msgid "You have successfully registered into rhodecode"
 msgstr ""
 
-#: rhodecode/controllers/login.py:151
+#: rhodecode/controllers/login.py:164
 msgid "Your password reset link was sent"
 msgstr ""
 
-#: rhodecode/controllers/login.py:171
+#: rhodecode/controllers/login.py:184
 msgid "Your password reset was successful, new password has been sent to your email"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540
+#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549
 msgid "Bookmarks"
 msgstr ""
 
+#: rhodecode/controllers/pullrequests.py:158
+msgid "Pull request requires a title with min. 3 chars"
+msgstr ""
+
 #: rhodecode/controllers/pullrequests.py:160
+msgid "error during creation of pull request"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:181
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:163
+#: rhodecode/controllers/pullrequests.py:184
 msgid "Error occurred during sending pull request"
 msgstr ""
 
+#: rhodecode/controllers/pullrequests.py:217
+msgid "Successfully deleted pull request"
+msgstr ""
+
 #: rhodecode/controllers/search.py:131
 msgid "Invalid search query. Try quoting it."
 msgstr ""
@@ -226,30 +248,30 b' msgstr ""'
 msgid "An error occurred during this search operation"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:107 rhodecode/controllers/admin/repos.py:264
+#: rhodecode/controllers/settings.py:107 rhodecode/controllers/admin/repos.py:266
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:125 rhodecode/controllers/admin/repos.py:282
+#: rhodecode/controllers/settings.py:125 rhodecode/controllers/admin/repos.py:284
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:143 rhodecode/controllers/admin/repos.py:300
+#: rhodecode/controllers/settings.py:143 rhodecode/controllers/admin/repos.py:302
 #, python-format
 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 ""
 
-#: rhodecode/controllers/settings.py:155 rhodecode/controllers/admin/repos.py:312
+#: rhodecode/controllers/settings.py:155 rhodecode/controllers/admin/repos.py:314
 #, python-format
 msgid "deleted repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:159 rhodecode/controllers/admin/repos.py:322
-#: rhodecode/controllers/admin/repos.py:328
+#: rhodecode/controllers/settings.py:159 rhodecode/controllers/admin/repos.py:324
+#: rhodecode/controllers/admin/repos.py:330
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
@@ -259,7 +281,7 b' msgid "No data loaded yet"'
 msgstr ""
 
 #: rhodecode/controllers/summary.py:142
-#: rhodecode/templates/summary/summary.html:144
+#: rhodecode/templates/summary/summary.html:148
 msgid "Statistics are disabled for this repository"
 msgstr ""
 
@@ -349,8 +371,8 b' msgstr ""'
 #: 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:335
-#: rhodecode/templates/base/base.html:337 rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:197 rhodecode/templates/base/base.html:337
+#: rhodecode/templates/base/base.html:339 rhodecode/templates/base/base.html:341
 msgid "Admin"
 msgstr ""
 
@@ -367,18 +389,20 b' msgid "allowed with automatic account ac'
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/controllers/admin/permissions.py:74
 msgid "Disabled"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:72
+#: rhodecode/controllers/admin/permissions.py:75
 msgid "Enabled"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:106
+#: rhodecode/controllers/admin/permissions.py:116
 msgid "Default permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:123
+#: rhodecode/controllers/admin/permissions.py:130
 msgid "error occurred during update of permissions"
 msgstr ""
 
@@ -386,120 +410,124 b' msgstr ""'
 msgid "--REMOVE FORK--"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:191
+#: rhodecode/controllers/admin/repos.py:192
 #, python-format
 msgid "created repository %s from %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:195
+#: rhodecode/controllers/admin/repos.py:196
 #, python-format
 msgid "created repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:226
+#: rhodecode/controllers/admin/repos.py:227
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:317
+#: rhodecode/controllers/admin/repos.py:319
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:346
+#: rhodecode/controllers/admin/repos.py:348
 msgid "An error occurred during deletion of repository user"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:365
+#: rhodecode/controllers/admin/repos.py:367
 msgid "An error occurred during deletion of repository users groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:382
+#: rhodecode/controllers/admin/repos.py:385
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:398
+#: rhodecode/controllers/admin/repos.py:402
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:418
-msgid "Updated repository visibility in public journal"
-msgstr ""
-
 #: rhodecode/controllers/admin/repos.py:422
-msgid "An error occurred during setting this repository in public journal"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269
-msgid "Token mismatch"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:440
-msgid "Pulled from remote location"
+msgid "An error occurred during unlocking"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:442
-msgid "An error occurred during pull from remote location"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:458
-msgid "Nothing"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:460
-#, python-format
-msgid "Marked repo %s as fork of %s"
+msgid "Updated repository visibility in public journal"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:446
+msgid "An error occurred during setting this repository in public journal"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299
+msgid "Token mismatch"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:464
+msgid "Pulled from remote location"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:466
+msgid "An error occurred during pull from remote location"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:482
+msgid "Nothing"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:484
+#, python-format
+msgid "Marked repo %s as fork of %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:488
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:119
+#: rhodecode/controllers/admin/repos_groups.py:116
 #, python-format
 msgid "created repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:132
+#: rhodecode/controllers/admin/repos_groups.py:129
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:166
+#: rhodecode/controllers/admin/repos_groups.py:163
 #, python-format
 msgid "updated repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:179
+#: rhodecode/controllers/admin/repos_groups.py:176
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:197
+#: rhodecode/controllers/admin/repos_groups.py:194
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:205
+#: rhodecode/controllers/admin/repos_groups.py:202
 #, python-format
 msgid "removed repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:210
+#: rhodecode/controllers/admin/repos_groups.py:208
 msgid "Cannot delete this group it still contains subgroups"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:215
-#: rhodecode/controllers/admin/repos_groups.py:220
+#: rhodecode/controllers/admin/repos_groups.py:213
+#: rhodecode/controllers/admin/repos_groups.py:218
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:240
+#: rhodecode/controllers/admin/repos_groups.py:238
 msgid "An error occurred during deletion of group user"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:260
+#: rhodecode/controllers/admin/repos_groups.py:258
 msgid "An error occurred during deletion of group users groups"
 msgstr ""
 
@@ -517,90 +545,109 b' msgid "Updated application settings"'
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:164
-#: rhodecode/controllers/admin/settings.py:230
+#: rhodecode/controllers/admin/settings.py:275
 msgid "error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:226
-msgid "Updated mercurial settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:240
+#: rhodecode/controllers/admin/settings.py:200
+msgid "Updated visualisation settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:205
+msgid "error occurred during updating visualisation settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:271
+msgid "Updated VCS settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:285
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:252
+#: rhodecode/controllers/admin/settings.py:297
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:256
+#: rhodecode/controllers/admin/settings.py:301
 msgid "error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:275
+#: rhodecode/controllers/admin/settings.py:320
 msgid "Email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:330
+#: rhodecode/controllers/admin/settings.py:375
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:361
+#: rhodecode/controllers/admin/settings.py:406
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:376
-#: rhodecode/controllers/admin/users.py:186
+#: rhodecode/controllers/admin/settings.py:421
+#: rhodecode/controllers/admin/users.py:191
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:127
+#: rhodecode/controllers/admin/users.py:130
 #, python-format
 msgid "created user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:139
+#: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:168
+#: rhodecode/controllers/admin/users.py:171
 msgid "User updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:202
-msgid "successfully deleted user"
-msgstr ""
-
 #: rhodecode/controllers/admin/users.py:207
+msgid "successfully deleted user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:212
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:221
+#: rhodecode/controllers/admin/users.py:226
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:253
-#: rhodecode/controllers/admin/users_groups.py:219
+#: rhodecode/controllers/admin/users.py:266
 msgid "Granted 'repository create' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:262
-#: rhodecode/controllers/admin/users_groups.py:229
+#: rhodecode/controllers/admin/users.py:271
 msgid "Revoked 'repository create' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:278
+#: rhodecode/controllers/admin/users.py:277
+msgid "Granted 'repository fork' permission to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:282
+msgid "Revoked 'repository fork' permission to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:288
+#: rhodecode/controllers/admin/users_groups.py:255
+msgid "An error occurred during permissions saving"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:303
 #, python-format
 msgid "Added email %s to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:284
+#: rhodecode/controllers/admin/users.py:309
 msgid "An error occurred during email saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users.py:319
 msgid "Removed email from user"
 msgstr ""
 
@@ -619,167 +666,183 b' msgstr ""'
 msgid "updated users group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:152
+#: rhodecode/controllers/admin/users_groups.py:157
 #, python-format
 msgid "error occurred during update of users group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:169
-msgid "successfully deleted users group"
-msgstr ""
-
 #: rhodecode/controllers/admin/users_groups.py:174
+msgid "successfully deleted users group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:179
 msgid "An error occurred during deletion of users group"
 msgstr ""
 
-#: rhodecode/lib/auth.py:497
+#: rhodecode/controllers/admin/users_groups.py:233
+msgid "Granted 'repository create' permission to users group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:238
+msgid "Revoked 'repository create' permission to users group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:244
+msgid "Granted 'repository fork' permission to users group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:249
+msgid "Revoked 'repository fork' permission to users group"
+msgstr ""
+
+#: rhodecode/lib/auth.py:499
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: rhodecode/lib/auth.py:538
+#: rhodecode/lib/auth.py:540
 msgid "You need to be a signed in to view this page"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:85
+#: rhodecode/lib/diffs.py:86
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:95
+#: rhodecode/lib/diffs.py:96
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:369
+#: rhodecode/lib/helpers.py:372
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:442
+#: rhodecode/lib/helpers.py:484
 msgid "True"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:446
+#: rhodecode/lib/helpers.py:488
 msgid "False"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:490
+#: rhodecode/lib/helpers.py:532
 msgid "Changeset not found"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:513
+#: rhodecode/lib/helpers.py:555
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:519
+#: rhodecode/lib/helpers.py:561
 msgid "compare view"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:539
+#: rhodecode/lib/helpers.py:581
 msgid "and"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:540
+#: rhodecode/lib/helpers.py:582
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46
+#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48
 msgid "revisions"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:564
+#: rhodecode/lib/helpers.py:606
 msgid "fork name "
 msgstr ""
 
-#: rhodecode/lib/helpers.py:578
+#: rhodecode/lib/helpers.py:620
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #: rhodecode/templates/pullrequests/pullrequest_show.html:12
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:584
+#: rhodecode/lib/helpers.py:626
 msgid "[deleted] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596
+#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638
 msgid "[created] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:588
+#: rhodecode/lib/helpers.py:630
 msgid "[created] repository as fork"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598
+#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640
 msgid "[forked] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600
+#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642
 msgid "[updated] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:594
+#: rhodecode/lib/helpers.py:636
 msgid "[delete] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:602
+#: rhodecode/lib/helpers.py:644
 msgid "[created] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:604
+#: rhodecode/lib/helpers.py:646
 msgid "[updated] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:606
+#: rhodecode/lib/helpers.py:648
 msgid "[created] users group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:608
+#: rhodecode/lib/helpers.py:650
 msgid "[updated] users group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:610
+#: rhodecode/lib/helpers.py:652
 msgid "[commented] on revision in repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:612
+#: rhodecode/lib/helpers.py:654
 msgid "[commented] on pull request for"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:614
+#: rhodecode/lib/helpers.py:656
 msgid "[closed] pull request for"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:616
+#: rhodecode/lib/helpers.py:658
 msgid "[pushed] into"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:618
+#: rhodecode/lib/helpers.py:660
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:620
+#: rhodecode/lib/helpers.py:662
 msgid "[pulled from remote] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:622
+#: rhodecode/lib/helpers.py:664
 msgid "[pulled] from"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:624
+#: rhodecode/lib/helpers.py:666
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:626
+#: rhodecode/lib/helpers.py:668
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:790
+#: rhodecode/lib/helpers.py:840
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:794
+#: rhodecode/lib/helpers.py:844
 msgid "No Files"
 msgstr ""
 
@@ -852,75 +915,83 b' msgstr ""'
 msgid "[Mention]"
 msgstr ""
 
-#: rhodecode/model/db.py:1063
+#: rhodecode/model/db.py:1140
 msgid "Repository no access"
 msgstr ""
 
-#: rhodecode/model/db.py:1064
+#: rhodecode/model/db.py:1141
 msgid "Repository read access"
 msgstr ""
 
-#: rhodecode/model/db.py:1065
+#: rhodecode/model/db.py:1142
 msgid "Repository write access"
 msgstr ""
 
-#: rhodecode/model/db.py:1066
+#: rhodecode/model/db.py:1143
 msgid "Repository admin access"
 msgstr ""
 
-#: rhodecode/model/db.py:1068
+#: rhodecode/model/db.py:1145
 msgid "Repositories Group no access"
 msgstr ""
 
-#: rhodecode/model/db.py:1069
+#: rhodecode/model/db.py:1146
 msgid "Repositories Group read access"
 msgstr ""
 
-#: rhodecode/model/db.py:1070
+#: rhodecode/model/db.py:1147
 msgid "Repositories Group write access"
 msgstr ""
 
-#: rhodecode/model/db.py:1071
+#: rhodecode/model/db.py:1148
 msgid "Repositories Group admin access"
 msgstr ""
 
-#: rhodecode/model/db.py:1073
+#: rhodecode/model/db.py:1150
 msgid "RhodeCode Administrator"
 msgstr ""
 
-#: rhodecode/model/db.py:1074
+#: rhodecode/model/db.py:1151
 msgid "Repository creation disabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1075
+#: rhodecode/model/db.py:1152
 msgid "Repository creation enabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1076
+#: rhodecode/model/db.py:1153
+msgid "Repository forking disabled"
+msgstr ""
+
+#: rhodecode/model/db.py:1154
+msgid "Repository forking enabled"
+msgstr ""
+
+#: rhodecode/model/db.py:1155
 msgid "Register disabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1077
+#: rhodecode/model/db.py:1156
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1080
+#: rhodecode/model/db.py:1159
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1481
+#: rhodecode/model/db.py:1579
 msgid "Not Reviewed"
 msgstr ""
 
-#: rhodecode/model/db.py:1482
+#: rhodecode/model/db.py:1580
 msgid "Approved"
 msgstr ""
 
-#: rhodecode/model/db.py:1483
+#: rhodecode/model/db.py:1581
 msgid "Rejected"
 msgstr ""
 
-#: rhodecode/model/db.py:1484
+#: rhodecode/model/db.py:1582
 msgid "Under Review"
 msgstr ""
 
@@ -971,155 +1042,164 b' msgstr ""'
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:526
+#: rhodecode/model/scm.py:535
 msgid "latest tip"
 msgstr ""
 
-#: rhodecode/model/user.py:240
+#: rhodecode/model/user.py:230
 msgid "new user registration"
 msgstr ""
 
-#: rhodecode/model/user.py:265 rhodecode/model/user.py:287
-#: rhodecode/model/user.py:309
+#: rhodecode/model/user.py:255 rhodecode/model/user.py:277
+#: rhodecode/model/user.py:299
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:333
+#: rhodecode/model/user.py:323
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:339
+#: rhodecode/model/user.py:329
 #, 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:52
+#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36
+msgid "Value cannot be an empty list"
+msgstr ""
+
+#: rhodecode/model/validators.py:82
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:54
-#, python-format
-msgid "Username \"%(username)s\" is forbidden"
-msgstr ""
-
-#: rhodecode/model/validators.py:56
-msgid ""
-"Username may only contain alphanumeric characters underscores, periods or "
-"dashes and must begin with alphanumeric character"
-msgstr ""
-
 #: rhodecode/model/validators.py:84
 #, python-format
+msgid "Username \"%(username)s\" is forbidden"
+msgstr ""
+
+#: rhodecode/model/validators.py:86
+msgid ""
+"Username may only contain alphanumeric characters underscores, periods or "
+"dashes and must begin with alphanumeric character"
+msgstr ""
+
+#: rhodecode/model/validators.py:114
+#, python-format
 msgid "Username %(username)s is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:103
+#: rhodecode/model/validators.py:133
 msgid "Invalid users group name"
 msgstr ""
 
-#: rhodecode/model/validators.py:104
+#: rhodecode/model/validators.py:134
 #, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:106
+#: rhodecode/model/validators.py:136
 msgid ""
 "users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 
-#: rhodecode/model/validators.py:144
+#: rhodecode/model/validators.py:174
 msgid "Cannot assign this group as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:145
+#: rhodecode/model/validators.py:175
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:147
+#: rhodecode/model/validators.py:177
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:205
+#: rhodecode/model/validators.py:235
 msgid "Invalid characters (non-ascii) in password"
 msgstr ""
 
-#: rhodecode/model/validators.py:220
+#: rhodecode/model/validators.py:250
 msgid "Passwords do not match"
 msgstr ""
 
-#: rhodecode/model/validators.py:237
+#: rhodecode/model/validators.py:267
 msgid "invalid password"
 msgstr ""
 
-#: rhodecode/model/validators.py:238
+#: rhodecode/model/validators.py:268
 msgid "invalid user name"
 msgstr ""
 
-#: rhodecode/model/validators.py:239
+#: rhodecode/model/validators.py:269
 msgid "Your account is disabled"
 msgstr ""
 
-#: rhodecode/model/validators.py:283
+#: rhodecode/model/validators.py:313
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr ""
 
-#: rhodecode/model/validators.py:285
+#: rhodecode/model/validators.py:315
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:286
+#: rhodecode/model/validators.py:316
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:288
+#: rhodecode/model/validators.py:318
 #, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:386
+#: rhodecode/model/validators.py:431
 msgid "invalid clone url"
 msgstr ""
 
-#: rhodecode/model/validators.py:387
-msgid "Invalid clone url, provide a valid clone http\\s url"
-msgstr ""
-
-#: rhodecode/model/validators.py:418
+#: rhodecode/model/validators.py:432
+msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
+msgstr ""
+
+#: rhodecode/model/validators.py:457
 msgid "Fork have to be the same type as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:439
+#: rhodecode/model/validators.py:478
 msgid "This username or users group name is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:509
+#: rhodecode/model/validators.py:562
 msgid "This is not a valid path"
 msgstr ""
 
-#: rhodecode/model/validators.py:524
+#: rhodecode/model/validators.py:577
 msgid "This e-mail address is already taken"
 msgstr ""
 
-#: rhodecode/model/validators.py:544
+#: rhodecode/model/validators.py:597
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
-#: rhodecode/model/validators.py:581
+#: rhodecode/model/validators.py:634
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name of "
 "the attribute that is equivalent to \"username\""
 msgstr ""
 
+#: rhodecode/model/validators.py:653
+#, python-format
+msgid "Revisions %(revs)s are already part of pull request or have set status"
+msgstr ""
+
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr ""
@@ -1138,7 +1218,7 b' msgstr ""'
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:219
+#: rhodecode/templates/base/base.html:221
 msgid "repositories"
 msgstr ""
 
@@ -1156,8 +1236,8 b' msgstr ""'
 msgid "Group name"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:30 rhodecode/templates/index_base.html:67
-#: rhodecode/templates/index_base.html:132 rhodecode/templates/index_base.html:158
+#: rhodecode/templates/index_base.html:30 rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:142 rhodecode/templates/index_base.html:168
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:72
@@ -1175,14 +1255,14 b' msgstr ""'
 msgid "Repositories group"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:66 rhodecode/templates/index_base.html:156
+#: rhodecode/templates/index_base.html:70 rhodecode/templates/index_base.html:166
 #: 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:172
+#: rhodecode/templates/admin/users/user_edit.html:192
 #: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:154
-#: rhodecode/templates/admin/users/user_edit_my_account.html:190
+#: rhodecode/templates/admin/users/user_edit_my_account.html:157
+#: rhodecode/templates/admin/users/user_edit_my_account.html:193
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
@@ -1193,55 +1273,55 b' msgstr ""'
 #: rhodecode/templates/journal/journal.html:186
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:119
+#: rhodecode/templates/summary/summary.html:123
 #: rhodecode/templates/tags/tags.html:36 rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:68
+#: rhodecode/templates/index_base.html:72
 msgid "Last change"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:69 rhodecode/templates/index_base.html:161
-#: rhodecode/templates/admin/users/user_edit_my_account.html:156
+#: rhodecode/templates/index_base.html:73 rhodecode/templates/index_base.html:171
+#: rhodecode/templates/admin/users/user_edit_my_account.html:159
 #: rhodecode/templates/journal/journal.html:188
 msgid "Tip"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:70 rhodecode/templates/index_base.html:163
-#: rhodecode/templates/admin/repos/repo_edit.html:112
+#: rhodecode/templates/index_base.html:74 rhodecode/templates/index_base.html:173
+#: rhodecode/templates/admin/repos/repo_edit.html:121
 #: rhodecode/templates/admin/repos/repos.html:73
 msgid "Owner"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:75
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/index_base.html:76
 msgid "Atom"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:102 rhodecode/templates/index_base.html:104
+#: rhodecode/templates/index_base.html:110 rhodecode/templates/index_base.html:112
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:109 rhodecode/templates/index_base.html:111
+#: rhodecode/templates/index_base.html:117 rhodecode/templates/index_base.html:119
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:130
+#: rhodecode/templates/index_base.html:140
 msgid "Group Name"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:148 rhodecode/templates/index_base.html:188
+#: rhodecode/templates/index_base.html:158 rhodecode/templates/index_base.html:198
 #: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:176
-#: rhodecode/templates/admin/users/users.html:105
+#: rhodecode/templates/admin/users/user_edit_my_account.html:179
+#: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
 #: rhodecode/templates/branches/branches.html:77
 #: rhodecode/templates/journal/journal.html:211
@@ -1249,10 +1329,10 b' msgstr ""'
 msgid "Click to sort ascending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:149 rhodecode/templates/index_base.html:189
+#: rhodecode/templates/index_base.html:159 rhodecode/templates/index_base.html:199
 #: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:177
-#: rhodecode/templates/admin/users/users.html:106
+#: rhodecode/templates/admin/users/user_edit_my_account.html:180
+#: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:78
 #: rhodecode/templates/journal/journal.html:212
@@ -1260,14 +1340,14 b' msgstr ""'
 msgid "Click to sort descending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:159
+#: rhodecode/templates/index_base.html:169
 msgid "Last Change"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:190
+#: rhodecode/templates/index_base.html:200
 #: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:178
-#: rhodecode/templates/admin/users/users.html:107
+#: rhodecode/templates/admin/users/user_edit_my_account.html:181
+#: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
 #: rhodecode/templates/branches/branches.html:79
 #: rhodecode/templates/journal/journal.html:213
@@ -1275,10 +1355,10 b' msgstr ""'
 msgid "No records found."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:191
+#: rhodecode/templates/index_base.html:201
 #: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:179
-#: rhodecode/templates/admin/users/users.html:108
+#: rhodecode/templates/admin/users/user_edit_my_account.html:182
+#: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:80
 #: rhodecode/templates/journal/journal.html:214
@@ -1286,10 +1366,10 b' msgstr ""'
 msgid "Data error."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:192
+#: rhodecode/templates/index_base.html:202
 #: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:180
-#: rhodecode/templates/admin/users/users.html:109
+#: rhodecode/templates/admin/users/user_edit_my_account.html:183
+#: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:81
 #: rhodecode/templates/journal/journal.html:215
@@ -1311,7 +1391,7 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_edit.html:50
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
 #: rhodecode/templates/base/base.html:83
-#: rhodecode/templates/summary/summary.html:118
+#: rhodecode/templates/summary/summary.html:122
 msgid "Username"
 msgstr ""
 
@@ -1384,7 +1464,7 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_add.html:77
 #: rhodecode/templates/admin/users/user_edit.html:104
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:120
+#: rhodecode/templates/summary/summary.html:124
 msgid "Email"
 msgstr ""
 
@@ -1544,13 +1624,13 b' msgid "E-mail Attribute"'
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/repos/repo_edit.html:132
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
 #: rhodecode/templates/admin/settings/hooks.html:73
 #: rhodecode/templates/admin/users/user_edit.html:129
-#: rhodecode/templates/admin/users/user_edit.html:154
+#: rhodecode/templates/admin/users/user_edit.html:174
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:115
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:93
 msgid "Save"
 msgstr ""
@@ -1569,7 +1649,7 b' msgid "Comments"'
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:252 rhodecode/templates/base/base.html:254
+#: rhodecode/templates/base/base.html:254 rhodecode/templates/base/base.html:256
 msgid "Pull requests"
 msgstr ""
 
@@ -1595,7 +1675,7 b' msgid "Permissions administration"'
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:125
+#: 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:139
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
@@ -1635,7 +1715,11 b' msgid "Repository creation"'
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:71
-#: rhodecode/templates/admin/repos/repo_edit.html:227
+msgid "Repository forking"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:78
+#: rhodecode/templates/admin/repos/repo_edit.html:241
 msgid "set"
 msgstr ""
 
@@ -1650,6 +1734,10 b' msgstr ""'
 msgid "Repositories"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_add.html:13
+msgid "add new"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
 #: rhodecode/templates/summary/summary.html:95
 #: rhodecode/templates/summary/summary.html:96
@@ -1728,8 +1816,8 b' msgstr ""'
 
 #: rhodecode/templates/admin/repos/repo_edit.html:13
 #: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:204
-#: rhodecode/templates/admin/users/user_edit.html:206
+#: rhodecode/templates/admin/users/user_edit.html:224
+#: rhodecode/templates/admin/users/user_edit.html:226
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
 #: rhodecode/templates/files/files_source.html:44
@@ -1763,19 +1851,29 b' msgstr ""'
 msgid "Enable download menu on summary page."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:117
+#: rhodecode/templates/admin/repos/repo_edit.html:112
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+msgid "Enable locking"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:116
+msgid "Enable lock-by-pulling on repository."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:126
 msgid "Change owner of this repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:133
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67
+#: 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:180
+#: rhodecode/templates/admin/settings/settings.html:168
+#: rhodecode/templates/admin/settings/settings.html:258
 #: rhodecode/templates/admin/users/user_edit.html:130
-#: rhodecode/templates/admin/users/user_edit.html:155
-#: rhodecode/templates/admin/users/user_edit.html:258
+#: rhodecode/templates/admin/users/user_edit.html:175
+#: rhodecode/templates/admin/users/user_edit.html:278
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:116
+#: 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
@@ -1783,89 +1881,125 b' msgstr ""'
 msgid "Reset"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:143
+#: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:146
+#: rhodecode/templates/admin/repos/repo_edit.html:155
 msgid "Statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:150
+#: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Reset current statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:150
+#: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Confirm to remove current statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:153
-msgid "Fetched to rev"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:154
-msgid "Stats gathered"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:162
+msgid "Fetched to rev"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:163
+msgid "Stats gathered"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:171
 msgid "Remote"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:166
+#: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Pull changes from remote location"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:166
+#: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Confirm to pull changes from remote side"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:177
-msgid "Cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:181
-msgid "Invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:181
-msgid "Confirm to invalidate repository cache"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:186
-#: rhodecode/templates/base/base.html:316 rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:320
+msgid "Cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:190
+msgid "Invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:190
+msgid "Confirm to invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:195
+#: rhodecode/templates/base/base.html:318 rhodecode/templates/base/base.html:320
+#: rhodecode/templates/base/base.html:322
 msgid "Public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:192
+#: rhodecode/templates/admin/repos/repo_edit.html:201
 msgid "Remove from public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:194
+#: rhodecode/templates/admin/repos/repo_edit.html:203
 msgid "Add to public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:199
+#: rhodecode/templates/admin/repos/repo_edit.html:208
 msgid ""
 "All actions made on this repository will be accessible to everyone in public "
 "journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:206
+#: rhodecode/templates/admin/repos/repo_edit.html:215
+msgid "Locking"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:220
+msgid "Unlock locked repo"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:220
+msgid "Confirm to unlock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:223
+msgid "lock repo"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:223
+msgid "Confirm to lock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:224
+msgid "Repository is not locked"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:229
+msgid "Force locking on repository. Works only when anonymous access is disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:236
+msgid "Set as fork of"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:245
+msgid "Manually set this repository as a fork of another from the list"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:251
 #: rhodecode/templates/changeset/changeset_file_comment.html:26
 msgid "Delete"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:210
+#: rhodecode/templates/admin/repos/repo_edit.html:255
 msgid "Remove this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:210
+#: rhodecode/templates/admin/repos/repo_edit.html:255
 #: rhodecode/templates/journal/journal.html:84
 msgid "Confirm to delete this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:214
+#: rhodecode/templates/admin/repos/repo_edit.html:259
 msgid ""
 "This repository will be renamed in a special way in order to be unaccesible "
 "for RhodeCode and VCS systems.\n"
@@ -1873,14 +2007,6 b' msgid ""'
 "do it manually"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:222
-msgid "Set as fork of"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:231
-msgid "Manually set this repository as a fork of another from the list"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
 msgid "none"
@@ -1898,8 +2024,8 b' 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:83
-#: rhodecode/templates/base/base.html:215
+#: rhodecode/templates/admin/users/users.html:85
+#: rhodecode/templates/base/base.html:217
 msgid "admin"
 msgstr ""
 
@@ -1928,18 +2054,18 b' msgstr ""'
 msgid "revoke"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:80
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:83
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67
 msgid "Add another member"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:94
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:97
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
 msgid "Failed to remove user"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:109
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:112
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96
 msgid "Failed to remove users group"
 msgstr ""
 
@@ -1977,7 +2103,7 b' 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:93
+#: rhodecode/templates/pullrequests/pullrequest_show.html:113
 msgid "save"
 msgstr ""
 
@@ -1989,6 +2115,12 b' msgstr ""'
 msgid "edit repos group"
 msgstr ""
 
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other "
+"groups and repositories inside"
+msgstr ""
+
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
 msgid "Repositories groups administration"
 msgstr ""
@@ -2002,13 +2134,13 b' msgid "Number of toplevel repositories"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
-#: rhodecode/templates/admin/users/users.html:85
+#: rhodecode/templates/admin/users/users.html:87
 #: rhodecode/templates/admin/users_groups/users_groups.html:35
 msgid "action"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
-#: rhodecode/templates/admin/users/user_edit.html:235
+#: rhodecode/templates/admin/users/user_edit.html:255
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 #: rhodecode/templates/data_table/_dt_elements.html:7
 #: rhodecode/templates/data_table/_dt_elements.html:103
@@ -2113,90 +2245,133 b' msgid "GA code"'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:112
-#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:167
+#: rhodecode/templates/admin/settings/settings.html:257
 msgid "Save settings"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:119
-msgid "VCS settings"
+msgid "Visualisation settings"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:128
-msgid "Web"
+msgid "Icons"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:133
+msgid "Show public repo icon on repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:137
+msgid "Show private repo icon on repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:144
+msgid "Meta-Tagging"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:149
+msgid "Stylify recognised metatags:"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:176
+msgid "VCS settings"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:185
+msgid "Web"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:190
 msgid "require ssl for vcs operations"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:135
+#: rhodecode/templates/admin/settings/settings.html:192
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it will "
 "return HTTP Error 406: Not Acceptable"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:141
+#: rhodecode/templates/admin/settings/settings.html:198
 msgid "Hooks"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:146
+#: rhodecode/templates/admin/settings/settings.html:203
 msgid "Update repository after push (hg update)"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:150
+#: rhodecode/templates/admin/settings/settings.html:207
 msgid "Show repository size after push"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:154
+#: rhodecode/templates/admin/settings/settings.html:211
 msgid "Log user push commands"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:158
+#: rhodecode/templates/admin/settings/settings.html:215
 msgid "Log user pull commands"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:162
+#: rhodecode/templates/admin/settings/settings.html:219
 msgid "advanced setup"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:167
+#: rhodecode/templates/admin/settings/settings.html:224
+msgid "Mercurial Extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:229
+msgid "largefiles extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:233
+msgid "hgsubversion extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:235
+msgid ""
+"Requires hgsubversion library installed. Allows clonning from svn remote "
+"locations"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:245
 msgid "Repositories location"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:172
+#: rhodecode/templates/admin/settings/settings.html:250
 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 ""
 
-#: rhodecode/templates/admin/settings/settings.html:173
+#: rhodecode/templates/admin/settings/settings.html:251
 msgid "unlock"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:174
+#: rhodecode/templates/admin/settings/settings.html:252
 msgid ""
 "Location where repositories are stored. After changing this value a restart, "
 "and rescan is required"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:194
+#: rhodecode/templates/admin/settings/settings.html:272
 msgid "Test Email"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:202
+#: rhodecode/templates/admin/settings/settings.html:280
 msgid "Email to"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:210
+#: rhodecode/templates/admin/settings/settings.html:288
 msgid "Send"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:216
+#: rhodecode/templates/admin/settings/settings.html:294
 msgid "System Info and Packages"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:219
+#: rhodecode/templates/admin/settings/settings.html:297
 msgid "show"
 msgstr ""
 
@@ -2259,37 +2434,57 b' msgstr ""'
 
 #: rhodecode/templates/admin/users/user_edit.html:147
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
+msgid "Inherit default permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:152
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:113
+#, python-format
+msgid ""
+"Select to inherit permissions from %s settings. With this selected below "
+"options does not have any action"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:158
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:166
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:127
+msgid "Fork repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:186
+#: 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:173
+#: rhodecode/templates/admin/users/user_edit.html:193
 #: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:191
+#: rhodecode/templates/admin/users/user_edit_my_account.html:194
 msgid "Permission"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:174
+#: rhodecode/templates/admin/users/user_edit.html:194
 msgid "Edit Permission"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:223
+#: rhodecode/templates/admin/users/user_edit.html:243
 msgid "Email addresses"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:236
+#: rhodecode/templates/admin/users/user_edit.html:256
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:250
+#: rhodecode/templates/admin/users/user_edit.html:270
 msgid "New email address"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:257
+#: rhodecode/templates/admin/users/user_edit.html:277
 msgid "Add"
 msgstr ""
 
@@ -2323,16 +2518,20 b' msgstr ""'
 msgid "Opened by me"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10
 #, python-format
 msgid "Pull request #%s opened on %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
+msgid "Confirm to delete this pull request"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26
 msgid "I participate in"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
@@ -2373,7 +2572,7 b' msgid "Users administration"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:221
+#: rhodecode/templates/base/base.html:223
 msgid "users"
 msgstr ""
 
@@ -2381,29 +2580,29 b' msgstr ""'
 msgid "ADD NEW USER"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:76
+#: rhodecode/templates/admin/users/users.html:77
 msgid "username"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:79
-msgid "firstname"
-msgstr ""
-
 #: rhodecode/templates/admin/users/users.html:80
-msgid "lastname"
+msgid "firstname"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:81
-msgid "last login"
+msgid "lastname"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:82
-#: rhodecode/templates/admin/users_groups/users_groups.html:34
-msgid "active"
+msgid "last login"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/base/base.html:224
+#: rhodecode/templates/admin/users_groups/users_groups.html:34
+msgid "active"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:86
+#: rhodecode/templates/base/base.html:226
 msgid "ldap"
 msgstr ""
 
@@ -2448,7 +2647,7 b' msgstr ""'
 msgid "Add all elements"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:126
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:146
 msgid "Group members"
 msgstr ""
 
@@ -2494,8 +2693,8 b' msgstr ""'
 msgid "Inbox"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:122 rhodecode/templates/base/base.html:298
-#: rhodecode/templates/base/base.html:300 rhodecode/templates/base/base.html:302
+#: rhodecode/templates/base/base.html:122 rhodecode/templates/base/base.html:300
+#: rhodecode/templates/base/base.html:302 rhodecode/templates/base/base.html:304
 #: rhodecode/templates/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
@@ -2517,8 +2716,8 b' msgstr ""'
 msgid "Home"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:123 rhodecode/templates/base/base.html:307
-#: rhodecode/templates/base/base.html:309 rhodecode/templates/base/base.html:311
+#: rhodecode/templates/base/base.html:123 rhodecode/templates/base/base.html:309
+#: rhodecode/templates/base/base.html:311 rhodecode/templates/base/base.html:313
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
@@ -2568,7 +2767,6 b' msgstr ""'
 #: 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/files/files.html:40
 msgid "Files"
 msgstr ""
 
@@ -2577,7 +2775,7 b' msgid "Options"'
 msgstr ""
 
 #: rhodecode/templates/base/base.html:204 rhodecode/templates/base/base.html:206
-#: rhodecode/templates/base/base.html:225
+#: rhodecode/templates/base/base.html:227
 msgid "settings"
 msgstr ""
 
@@ -2587,37 +2785,37 b' msgstr ""'
 msgid "fork"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/changelog/changelog.html:39
+#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/changelog/changelog.html:40
 msgid "Open new pull request"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/base/base.html:213
 msgid "search"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:220
-msgid "repositories groups"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:222
+msgid "repositories groups"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:224
 msgid "users groups"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:223
+#: rhodecode/templates/base/base.html:225
 msgid "permissions"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:236 rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:238 rhodecode/templates/base/base.html:240
 msgid "Followers"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:244 rhodecode/templates/base/base.html:246
+#: rhodecode/templates/base/base.html:246 rhodecode/templates/base/base.html:248
 msgid "Forks"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:325 rhodecode/templates/base/base.html:327
-#: rhodecode/templates/base/base.html:329 rhodecode/templates/search/search.html:52
+#: rhodecode/templates/base/base.html:327 rhodecode/templates/base/base.html:329
+#: rhodecode/templates/base/base.html:331 rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr ""
 
@@ -2720,46 +2918,46 b' msgstr ""'
 msgid "Compare fork"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:44
+#: rhodecode/templates/changelog/changelog.html:46
 msgid "Show"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:70
-#: rhodecode/templates/summary/summary.html:360
+#: rhodecode/templates/changelog/changelog.html:72
+#: rhodecode/templates/summary/summary.html:364
 msgid "show more"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:74
+#: rhodecode/templates/changelog/changelog.html:76
 msgid "Affected number of files, click to show more details"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:87
+#: rhodecode/templates/changelog/changelog.html:89
 #: rhodecode/templates/changeset/changeset.html:38
 #: rhodecode/templates/changeset/changeset_file_comment.html:20
 #: rhodecode/templates/changeset/changeset_range.html:46
 msgid "Changeset status"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:90
+#: rhodecode/templates/changelog/changelog.html:92
 msgid "Click to open associated pull request"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:100
+#: rhodecode/templates/changelog/changelog.html:102
 #: rhodecode/templates/changeset/changeset.html:78
 msgid "Parent"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:106
+#: rhodecode/templates/changelog/changelog.html:108
 #: rhodecode/templates/changeset/changeset.html:84
 msgid "No parents"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:111
+#: rhodecode/templates/changelog/changelog.html:113
 #: rhodecode/templates/changeset/changeset.html:88
 msgid "merge"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:114
+#: rhodecode/templates/changelog/changelog.html:116
 #: rhodecode/templates/changeset/changeset.html:91
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_add.html:33
@@ -2768,20 +2966,20 b' msgstr ""'
 msgid "branch"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:120
+#: rhodecode/templates/changelog/changelog.html:122
 msgid "bookmark"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:128
 #: rhodecode/templates/changeset/changeset.html:96
 msgid "tag"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:162
+#: rhodecode/templates/changelog/changelog.html:164
 msgid "Show selected changes __S -> __E"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:253
+#: rhodecode/templates/changelog/changelog.html:255
 msgid "There are no changes yet"
 msgstr ""
 
@@ -2919,7 +3117,7 b' msgstr ""'
 
 #: rhodecode/templates/changeset/changeset_range.html:54
 #: rhodecode/templates/compare/compare_diff.html:41
-#: rhodecode/templates/pullrequests/pullrequest_show.html:50
+#: rhodecode/templates/pullrequests/pullrequest_show.html:69
 msgid "Files affected"
 msgstr ""
 
@@ -2996,13 +3194,13 b' msgstr ""'
 msgid "File diff"
 msgstr ""
 
-#: rhodecode/templates/files/files.html:4
+#: rhodecode/templates/files/files.html:4 rhodecode/templates/files/files.html:72
 #, python-format
-msgid "%s Files"
+msgid "%s files"
 msgstr ""
 
 #: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:336
+#: rhodecode/templates/summary/summary.html:340
 msgid "files"
 msgstr ""
 
@@ -3320,17 +3518,17 b' msgid "Detailed compare view"'
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:63
+#: rhodecode/templates/pullrequests/pullrequest_show.html:82
 msgid "Pull request reviewers"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:75
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
 msgid "owner"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:89
+#: rhodecode/templates/pullrequests/pullrequest_show.html:109
 msgid "Add reviewer to this pull request."
 msgstr ""
 
@@ -3357,19 +3555,34 b' msgstr ""'
 msgid "Closed %s"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:28
+#: rhodecode/templates/pullrequests/pullrequest_show.html:31
+msgid "Status"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Pull request status"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+#: rhodecode/templates/pullrequests/pullrequest_show.html:44
+msgid "Still not reviewed by"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:47
+#, python-format
+msgid "%d reviewer"
+msgid_plural "%d reviewers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:54
 msgid "Created on"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:61
 msgid "Compare view"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:46
+#: rhodecode/templates/pullrequests/pullrequest_show.html:65
 msgid "Incoming changesets"
 msgstr ""
 
@@ -3426,7 +3639,7 b' msgstr ""'
 msgid "File names"
 msgstr ""
 
-#: rhodecode/templates/search/search_commit.html:34
+#: rhodecode/templates/search/search_commit.html:35
 #: rhodecode/templates/search/search_content.html:21
 #: rhodecode/templates/search/search_path.html:15
 msgid "Permission denied"
@@ -3503,115 +3716,115 b' msgstr ""'
 msgid "remote clone"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:112
+#: rhodecode/templates/summary/summary.html:116
 msgid "Contact"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:126
-msgid "Clone url"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:129
-msgid "Show by Name"
-msgstr ""
-
 #: rhodecode/templates/summary/summary.html:130
+msgid "Clone url"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:133
+msgid "Show by Name"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:134
 msgid "Show by ID"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:138
+#: rhodecode/templates/summary/summary.html:142
 msgid "Trending files"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:146
-#: rhodecode/templates/summary/summary.html:162
-#: rhodecode/templates/summary/summary.html:190
+#: rhodecode/templates/summary/summary.html:150
+#: rhodecode/templates/summary/summary.html:166
+#: rhodecode/templates/summary/summary.html:194
 msgid "enable"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:154
-msgid "Download"
-msgstr ""
-
 #: rhodecode/templates/summary/summary.html:158
+msgid "Download"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:162
 msgid "There are no downloads yet"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:160
+#: rhodecode/templates/summary/summary.html:164
 msgid "Downloads are disabled for this repository"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:166
+#: rhodecode/templates/summary/summary.html:170
 msgid "Download as zip"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:169
+#: rhodecode/templates/summary/summary.html:173
 msgid "Check this to download archive with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:169
+#: rhodecode/templates/summary/summary.html:173
 msgid "with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:182
+#: rhodecode/templates/summary/summary.html:186
 msgid "Commit activity by day / author"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:193
+#: rhodecode/templates/summary/summary.html:197
 msgid "Stats gathered: "
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:214
+#: rhodecode/templates/summary/summary.html:218
 msgid "Shortlog"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:216
+#: rhodecode/templates/summary/summary.html:220
 msgid "Quick start"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:229
+#: rhodecode/templates/summary/summary.html:233
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:232
+#: rhodecode/templates/summary/summary.html:236
 msgid "Permalink to this readme"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:289
+#: rhodecode/templates/summary/summary.html:293
 #, python-format
 msgid "Download %s as %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:646
+#: rhodecode/templates/summary/summary.html:650
 msgid "commits"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:647
+#: rhodecode/templates/summary/summary.html:651
 msgid "files added"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:648
-msgid "files changed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:649
-msgid "files removed"
-msgstr ""
-
 #: rhodecode/templates/summary/summary.html:652
-msgid "commit"
+msgid "files changed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:653
+msgid "files removed"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:656
+msgid "commit"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:657
 msgid "file added"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:654
+#: rhodecode/templates/summary/summary.html:658
 msgid "file changed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:655
+#: rhodecode/templates/summary/summary.html:659
 msgid "file removed"
 msgstr ""
 

rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode 1.2.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-07-26 23:35+0200\n"
+"POT-Creation-Date: 2012-09-02 20:30+0200\n"
 "PO-Revision-Date: 2012-04-05 17:37+0800\n"
 "Last-Translator: mikespook <[e-mail]>\n"
 "Language-Team: mikespook\n"
@@ -22,24 +22,30 b' msgstr ""'
 msgid "All Branches"
 msgstr "分支"
 
-#: rhodecode/controllers/changeset.py:81
+#: rhodecode/controllers/changeset.py:83
 msgid "show white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95
+#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
 msgid "ignore white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:155
+#: rhodecode/controllers/changeset.py:157
 #, fuzzy, python-format
 msgid "%s line context"
 msgstr "文件内容"
 
-#: rhodecode/controllers/changeset.py:331
-#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69
+#: rhodecode/controllers/changeset.py:333
+#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70
 msgid "binary file"
 msgstr "二进制文件"
 
+#: rhodecode/controllers/changeset.py:408
+msgid ""
+"Changing status on a changeset associated witha closed pull request is "
+"not allowed"
+msgstr ""
+
 #: rhodecode/controllers/compare.py:69
 #, fuzzy
 msgid "There are no changesets yet"
@@ -87,82 +93,87 b' msgid "commited on"'
 msgstr "提交"
 
 #: rhodecode/controllers/files.py:84
-#: rhodecode/templates/admin/repos/repo_add.html:13
-msgid "add new"
-msgstr "新增"
+#, fuzzy
+msgid "click here to add new file"
+msgstr "添加新用户"
 
 #: rhodecode/controllers/files.py:85
 #, fuzzy, python-format
 msgid "There are no files yet %s"
 msgstr "尚无文件"
 
-#: rhodecode/controllers/files.py:254
+#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299
+#, python-format
+msgid "This repository is has been locked by %s on %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:266
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr "通过 RhodeCode 修改了 %s"
 
-#: rhodecode/controllers/files.py:259
+#: rhodecode/controllers/files.py:271
 msgid "No changes"
 msgstr "无变更"
 
-#: rhodecode/controllers/files.py:270 rhodecode/controllers/files.py:324
+#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "成功提交到 %s"
 
-#: rhodecode/controllers/files.py:275 rhodecode/controllers/files.py:330
+#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352
 msgid "Error occurred during commit"
 msgstr "提交时发生错误"
 
-#: rhodecode/controllers/files.py:296
+#: rhodecode/controllers/files.py:318
 #, fuzzy, python-format
 msgid "Added %s via RhodeCode"
 msgstr "通过 RhodeCode 修改了 %s"
 
-#: rhodecode/controllers/files.py:310
+#: rhodecode/controllers/files.py:332
 #, fuzzy
 msgid "No content"
 msgstr "文件内容"
 
-#: rhodecode/controllers/files.py:314
+#: rhodecode/controllers/files.py:336
 #, fuzzy
 msgid "No filename"
 msgstr "文件名"
 
-#: rhodecode/controllers/files.py:356
+#: rhodecode/controllers/files.py:378
 msgid "downloads disabled"
 msgstr "禁止下载"
 
-#: rhodecode/controllers/files.py:367
+#: rhodecode/controllers/files.py:389
 #, python-format
 msgid "Unknown revision %s"
 msgstr "未知版本 %s"
 
-#: rhodecode/controllers/files.py:369
+#: rhodecode/controllers/files.py:391
 msgid "Empty repository"
 msgstr "空版本库"
 
-#: rhodecode/controllers/files.py:371
+#: rhodecode/controllers/files.py:393
 msgid "Unknown archive type"
 msgstr "未知包类型"
 
-#: rhodecode/controllers/files.py:472
+#: rhodecode/controllers/files.py:494
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "变更集"
 
-#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70
-#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534
+#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72
+#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543
 msgid "Branches"
 msgstr "分支"
 
-#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545
+#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76
+#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554
 msgid "Tags"
 msgstr "标签"
 
-#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90
+#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -170,7 +181,7 b' msgid ""'
 "repositories"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72
+#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -178,12 +189,12 b' msgid ""'
 "repositories"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:164
+#: rhodecode/controllers/forks.py:167
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "版本库 %s 被分支到 %s"
 
-#: rhodecode/controllers/forks.py:178
+#: rhodecode/controllers/forks.py:181
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
@@ -194,38 +205,52 b' msgid "public journal"'
 msgstr "公共日志"
 
 #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243
-#: rhodecode/templates/base/base.html:218
+#: rhodecode/templates/base/base.html:220
 msgid "journal"
 msgstr "日志"
 
-#: rhodecode/controllers/login.py:130
+#: rhodecode/controllers/login.py:143
 msgid "You have successfully registered into rhodecode"
 msgstr "成功注册到 rhodecode"
 
-#: rhodecode/controllers/login.py:151
+#: rhodecode/controllers/login.py:164
 msgid "Your password reset link was sent"
 msgstr "密码重置链接已经发送"
 
-#: rhodecode/controllers/login.py:171
+#: rhodecode/controllers/login.py:184
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
 msgstr "密码已经成功重置，新密码已经发送到你的邮箱"
 
-#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540
+#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549
 msgid "Bookmarks"
 msgstr ""
 
+#: rhodecode/controllers/pullrequests.py:158
+msgid "Pull request requires a title with min. 3 chars"
+msgstr ""
+
 #: rhodecode/controllers/pullrequests.py:160
 #, fuzzy
+msgid "error during creation of pull request"
+msgstr "提交时发生错误"
+
+#: rhodecode/controllers/pullrequests.py:181
+#, fuzzy
 msgid "Successfully opened new pull request"
 msgstr "用户删除成功"
 
-#: rhodecode/controllers/pullrequests.py:163
+#: rhodecode/controllers/pullrequests.py:184
 #, fuzzy
 msgid "Error occurred during sending pull request"
 msgstr "提交时发生错误"
 
+#: rhodecode/controllers/pullrequests.py:217
+#, fuzzy
+msgid "Successfully deleted pull request"
+msgstr "用户删除成功"
+
 #: rhodecode/controllers/search.py:131
 msgid "Invalid search query. Try quoting it."
 msgstr "错误的搜索。请尝试用引号包含它。"
@@ -239,19 +264,19 b' msgid "An error occurred during this sea'
 msgstr "在搜索操作中发生异常"
 
 #: rhodecode/controllers/settings.py:107
-#: rhodecode/controllers/admin/repos.py:264
+#: rhodecode/controllers/admin/repos.py:266
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "版本库 %s 成功更新"
 
 #: rhodecode/controllers/settings.py:125
-#: rhodecode/controllers/admin/repos.py:282
+#: rhodecode/controllers/admin/repos.py:284
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr ""
 
 #: rhodecode/controllers/settings.py:143
-#: rhodecode/controllers/admin/repos.py:300
+#: rhodecode/controllers/admin/repos.py:302
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from "
@@ -260,14 +285,14 b' msgid ""'
 msgstr ""
 
 #: rhodecode/controllers/settings.py:155
-#: rhodecode/controllers/admin/repos.py:312
+#: rhodecode/controllers/admin/repos.py:314
 #, python-format
 msgid "deleted repository %s"
 msgstr "已经删除版本库 %s"
 
 #: rhodecode/controllers/settings.py:159
-#: rhodecode/controllers/admin/repos.py:322
-#: rhodecode/controllers/admin/repos.py:328
+#: rhodecode/controllers/admin/repos.py:324
+#: rhodecode/controllers/admin/repos.py:330
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
@@ -277,7 +302,7 b' msgid "No data loaded yet"'
 msgstr ""
 
 #: rhodecode/controllers/summary.py:142
-#: rhodecode/templates/summary/summary.html:144
+#: rhodecode/templates/summary/summary.html:148
 msgid "Statistics are disabled for this repository"
 msgstr "该版本库统计功能已经禁用"
 
@@ -368,9 +393,9 b' msgstr "\xe5\x86\x99"'
 #: 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:335
 #: rhodecode/templates/base/base.html:337
 #: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:341
 msgid "Admin"
 msgstr "管理"
 
@@ -387,18 +412,20 b' msgid "allowed with automatic account ac'
 msgstr "允许自动启用帐号"
 
 #: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/controllers/admin/permissions.py:74
 msgid "Disabled"
 msgstr "停用"
 
 #: rhodecode/controllers/admin/permissions.py:72
+#: rhodecode/controllers/admin/permissions.py:75
 msgid "Enabled"
 msgstr "启用"
 
-#: rhodecode/controllers/admin/permissions.py:106
+#: rhodecode/controllers/admin/permissions.py:116
 msgid "Default permissions updated successfully"
 msgstr "成功更新默认权限"
 
-#: rhodecode/controllers/admin/permissions.py:123
+#: rhodecode/controllers/admin/permissions.py:130
 msgid "error occurred during update of permissions"
 msgstr ""
 
@@ -406,122 +433,127 b' msgstr ""'
 msgid "--REMOVE FORK--"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:191
+#: rhodecode/controllers/admin/repos.py:192
 #, python-format
 msgid "created repository %s from %s"
 msgstr "新版本库 %s 基于 %s 建立。"
 
-#: rhodecode/controllers/admin/repos.py:195
+#: rhodecode/controllers/admin/repos.py:196
 #, python-format
 msgid "created repository %s"
 msgstr "建立版本库 %s"
 
-#: rhodecode/controllers/admin/repos.py:226
+#: rhodecode/controllers/admin/repos.py:227
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:317
+#: rhodecode/controllers/admin/repos.py:319
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:346
+#: rhodecode/controllers/admin/repos.py:348
 msgid "An error occurred during deletion of repository user"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:365
+#: rhodecode/controllers/admin/repos.py:367
 msgid "An error occurred during deletion of repository users groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:382
+#: rhodecode/controllers/admin/repos.py:385
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:398
+#: rhodecode/controllers/admin/repos.py:402
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:418
-msgid "Updated repository visibility in public journal"
-msgstr ""
-
 #: rhodecode/controllers/admin/repos.py:422
+#, fuzzy
+msgid "An error occurred during unlocking"
+msgstr "在搜索操作中发生异常"
+
+#: rhodecode/controllers/admin/repos.py:442
+msgid "Updated repository visibility in public journal"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:446
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269
+#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299
 msgid "Token mismatch"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:440
+#: rhodecode/controllers/admin/repos.py:464
 msgid "Pulled from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:442
+#: rhodecode/controllers/admin/repos.py:466
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:458
+#: rhodecode/controllers/admin/repos.py:482
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:460
+#: rhodecode/controllers/admin/repos.py:484
 #, fuzzy, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "新版本库 %s 基于 %s 建立。"
 
-#: rhodecode/controllers/admin/repos.py:464
+#: rhodecode/controllers/admin/repos.py:488
 #, fuzzy
 msgid "An error occurred during this operation"
 msgstr "在搜索操作中发生异常"
 
-#: rhodecode/controllers/admin/repos_groups.py:119
+#: rhodecode/controllers/admin/repos_groups.py:116
 #, python-format
 msgid "created repos group %s"
 msgstr "建立版本库组 %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:132
+#: rhodecode/controllers/admin/repos_groups.py:129
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:166
+#: rhodecode/controllers/admin/repos_groups.py:163
 #, python-format
 msgid "updated repos group %s"
 msgstr "更新版本库组 %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:179
+#: rhodecode/controllers/admin/repos_groups.py:176
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:197
+#: rhodecode/controllers/admin/repos_groups.py:194
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:205
+#: rhodecode/controllers/admin/repos_groups.py:202
 #, python-format
 msgid "removed repos group %s"
 msgstr "移除版本库组 %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:210
+#: rhodecode/controllers/admin/repos_groups.py:208
 msgid "Cannot delete this group it still contains subgroups"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:215
-#: rhodecode/controllers/admin/repos_groups.py:220
+#: rhodecode/controllers/admin/repos_groups.py:213
+#: rhodecode/controllers/admin/repos_groups.py:218
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:240
+#: rhodecode/controllers/admin/repos_groups.py:238
 #, fuzzy
 msgid "An error occurred during deletion of group user"
 msgstr "在搜索操作中发生异常"
 
-#: rhodecode/controllers/admin/repos_groups.py:260
+#: rhodecode/controllers/admin/repos_groups.py:258
 msgid "An error occurred during deletion of group users groups"
 msgstr ""
 
@@ -539,91 +571,116 b' msgid "Updated application settings"'
 msgstr "更新应用设置"
 
 #: rhodecode/controllers/admin/settings.py:164
-#: rhodecode/controllers/admin/settings.py:230
+#: rhodecode/controllers/admin/settings.py:275
 msgid "error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:226
-msgid "Updated mercurial settings"
+#: rhodecode/controllers/admin/settings.py:200
+#, fuzzy
+msgid "Updated visualisation settings"
+msgstr "更新应用设置"
+
+#: rhodecode/controllers/admin/settings.py:205
+#, fuzzy
+msgid "error occurred during updating visualisation settings"
+msgstr "提交时发生错误"
+
+#: rhodecode/controllers/admin/settings.py:271
+#, fuzzy
+msgid "Updated VCS settings"
 msgstr "更新 mercurial 设置"
 
-#: rhodecode/controllers/admin/settings.py:240
+#: rhodecode/controllers/admin/settings.py:285
 msgid "Added new hook"
 msgstr "新增钩子"
 
-#: rhodecode/controllers/admin/settings.py:252
+#: rhodecode/controllers/admin/settings.py:297
 msgid "Updated hooks"
 msgstr "更新钩子"
 
-#: rhodecode/controllers/admin/settings.py:256
+#: rhodecode/controllers/admin/settings.py:301
 msgid "error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:275
+#: rhodecode/controllers/admin/settings.py:320
 msgid "Email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:330
+#: rhodecode/controllers/admin/settings.py:375
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:361
+#: rhodecode/controllers/admin/settings.py:406
 msgid "Your account was updated successfully"
 msgstr "你的帐号已经更新完成"
 
-#: rhodecode/controllers/admin/settings.py:376
-#: rhodecode/controllers/admin/users.py:186
+#: rhodecode/controllers/admin/settings.py:421
+#: rhodecode/controllers/admin/users.py:191
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:127
+#: rhodecode/controllers/admin/users.py:130
 #, python-format
 msgid "created user %s"
 msgstr "创建用户 %s"
 
-#: rhodecode/controllers/admin/users.py:139
+#: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:168
+#: rhodecode/controllers/admin/users.py:171
 msgid "User updated successfully"
 msgstr "用户更新成功"
 
-#: rhodecode/controllers/admin/users.py:202
+#: rhodecode/controllers/admin/users.py:207
 msgid "successfully deleted user"
 msgstr "用户删除成功"
 
-#: rhodecode/controllers/admin/users.py:207
+#: rhodecode/controllers/admin/users.py:212
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:221
+#: rhodecode/controllers/admin/users.py:226
 msgid "You can't edit this user"
 msgstr "无法编辑该用户"
 
-#: rhodecode/controllers/admin/users.py:253
-#: rhodecode/controllers/admin/users_groups.py:219
+#: rhodecode/controllers/admin/users.py:266
 msgid "Granted 'repository create' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:262
-#: rhodecode/controllers/admin/users_groups.py:229
+#: rhodecode/controllers/admin/users.py:271
 msgid "Revoked 'repository create' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:278
+#: rhodecode/controllers/admin/users.py:277
+#, fuzzy
+msgid "Granted 'repository fork' permission to user"
+msgstr "版本库权限"
+
+#: rhodecode/controllers/admin/users.py:282
+#, fuzzy
+msgid "Revoked 'repository fork' permission to user"
+msgstr "版本库权限"
+
+#: rhodecode/controllers/admin/users.py:288
+#: rhodecode/controllers/admin/users_groups.py:255
+#, fuzzy
+msgid "An error occurred during permissions saving"
+msgstr "在搜索操作中发生异常"
+
+#: rhodecode/controllers/admin/users.py:303
 #, python-format
 msgid "Added email %s to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:284
+#: rhodecode/controllers/admin/users.py:309
 #, fuzzy
 msgid "An error occurred during email saving"
 msgstr "在搜索操作中发生异常"
 
-#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users.py:319
 #, fuzzy
 msgid "Removed email from user"
 msgstr "移除版本库组 %s"
@@ -643,175 +700,191 b' msgstr ""'
 msgid "updated users group %s"
 msgstr "更新用户组 %s"
 
-#: rhodecode/controllers/admin/users_groups.py:152
+#: rhodecode/controllers/admin/users_groups.py:157
 #, python-format
 msgid "error occurred during update of users group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:169
+#: rhodecode/controllers/admin/users_groups.py:174
 msgid "successfully deleted users group"
 msgstr "删除用户组成功"
 
-#: rhodecode/controllers/admin/users_groups.py:174
+#: rhodecode/controllers/admin/users_groups.py:179
 msgid "An error occurred during deletion of users group"
 msgstr ""
 
-#: rhodecode/lib/auth.py:497
+#: rhodecode/controllers/admin/users_groups.py:233
+msgid "Granted 'repository create' permission to users group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:238
+msgid "Revoked 'repository create' permission to users group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:244
+msgid "Granted 'repository fork' permission to users group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:249
+msgid "Revoked 'repository fork' permission to users group"
+msgstr ""
+
+#: rhodecode/lib/auth.py:499
 msgid "You need to be a registered user to perform this action"
 msgstr "必须是注册用户才能进行此操作"
 
-#: rhodecode/lib/auth.py:538
+#: rhodecode/lib/auth.py:540
 msgid "You need to be a signed in to view this page"
 msgstr "必须登录才能访问该页面"
 
-#: rhodecode/lib/diffs.py:85
+#: rhodecode/lib/diffs.py:86
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr "变更集因过大而被截断，可查看原始变更集作为替代"
 
-#: rhodecode/lib/diffs.py:95
+#: rhodecode/lib/diffs.py:96
 #, fuzzy
 msgid "No changes detected"
 msgstr "尚无修订"
 
-#: rhodecode/lib/helpers.py:369
+#: rhodecode/lib/helpers.py:372
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:442
+#: rhodecode/lib/helpers.py:484
 msgid "True"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:446
+#: rhodecode/lib/helpers.py:488
 msgid "False"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:490
+#: rhodecode/lib/helpers.py:532
 #, fuzzy
 msgid "Changeset not found"
 msgstr "修改"
 
-#: rhodecode/lib/helpers.py:513
+#: rhodecode/lib/helpers.py:555
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:519
+#: rhodecode/lib/helpers.py:561
 msgid "compare view"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:539
+#: rhodecode/lib/helpers.py:581
 msgid "and"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:540
+#: rhodecode/lib/helpers.py:582
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46
+#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48
 msgid "revisions"
 msgstr "修订"
 
-#: rhodecode/lib/helpers.py:564
+#: rhodecode/lib/helpers.py:606
 msgid "fork name "
 msgstr "分支名称"
 
-#: rhodecode/lib/helpers.py:578
+#: rhodecode/lib/helpers.py:620
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #: rhodecode/templates/pullrequests/pullrequest_show.html:12
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:584
+#: rhodecode/lib/helpers.py:626
 msgid "[deleted] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596
+#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638
 msgid "[created] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:588
+#: rhodecode/lib/helpers.py:630
 #, fuzzy
 msgid "[created] repository as fork"
 msgstr "建立版本库 %s"
 
-#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598
+#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640
 msgid "[forked] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600
+#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642
 msgid "[updated] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:594
+#: rhodecode/lib/helpers.py:636
 msgid "[delete] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:602
+#: rhodecode/lib/helpers.py:644
 #, fuzzy
 msgid "[created] user"
 msgstr "创建用户 %s"
 
-#: rhodecode/lib/helpers.py:604
+#: rhodecode/lib/helpers.py:646
 #, fuzzy
 msgid "[updated] user"
 msgstr "更新用户组 %s"
 
-#: rhodecode/lib/helpers.py:606
+#: rhodecode/lib/helpers.py:648
 #, fuzzy
 msgid "[created] users group"
 msgstr "建立用户组 %s"
 
-#: rhodecode/lib/helpers.py:608
+#: rhodecode/lib/helpers.py:650
 #, fuzzy
 msgid "[updated] users group"
 msgstr "更新用户组 %s"
 
-#: rhodecode/lib/helpers.py:610
+#: rhodecode/lib/helpers.py:652
 msgid "[commented] on revision in repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:612
+#: rhodecode/lib/helpers.py:654
 #, fuzzy
 msgid "[commented] on pull request for"
 msgstr "创建用户 %s"
 
-#: rhodecode/lib/helpers.py:614
+#: rhodecode/lib/helpers.py:656
 msgid "[closed] pull request for"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:616
+#: rhodecode/lib/helpers.py:658
 msgid "[pushed] into"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:618
+#: rhodecode/lib/helpers.py:660
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:620
+#: rhodecode/lib/helpers.py:662
 msgid "[pulled from remote] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:622
+#: rhodecode/lib/helpers.py:664
 msgid "[pulled] from"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:624
+#: rhodecode/lib/helpers.py:666
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:626
+#: rhodecode/lib/helpers.py:668
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:790
+#: rhodecode/lib/helpers.py:840
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:794
+#: rhodecode/lib/helpers.py:844
 msgid "No Files"
 msgstr "没有文件"
 
@@ -879,88 +952,98 b' msgstr ""'
 msgid "[Mention]"
 msgstr ""
 
-#: rhodecode/model/db.py:1063
+#: rhodecode/model/db.py:1140
 #, fuzzy
 msgid "Repository no access"
 msgstr "个版本库"
 
-#: rhodecode/model/db.py:1064
+#: rhodecode/model/db.py:1141
 #, fuzzy
 msgid "Repository read access"
 msgstr "这个版本库已经存在"
 
-#: rhodecode/model/db.py:1065
+#: rhodecode/model/db.py:1142
 #, fuzzy
 msgid "Repository write access"
 msgstr "个版本库"
 
-#: rhodecode/model/db.py:1066
+#: rhodecode/model/db.py:1143
 #, fuzzy
 msgid "Repository admin access"
 msgstr "个版本库"
 
-#: rhodecode/model/db.py:1068
+#: rhodecode/model/db.py:1145
 #, fuzzy
 msgid "Repositories Group no access"
 msgstr "版本库组"
 
-#: rhodecode/model/db.py:1069
+#: rhodecode/model/db.py:1146
 #, fuzzy
 msgid "Repositories Group read access"
 msgstr "版本库组"
 
-#: rhodecode/model/db.py:1070
+#: rhodecode/model/db.py:1147
 #, fuzzy
 msgid "Repositories Group write access"
 msgstr "版本库组"
 
-#: rhodecode/model/db.py:1071
+#: rhodecode/model/db.py:1148
 #, fuzzy
 msgid "Repositories Group admin access"
 msgstr "版本库组"
 
-#: rhodecode/model/db.py:1073
+#: rhodecode/model/db.py:1150
 #, fuzzy
 msgid "RhodeCode Administrator"
 msgstr "用户管理员"
 
-#: rhodecode/model/db.py:1074
+#: rhodecode/model/db.py:1151
 #, fuzzy
 msgid "Repository creation disabled"
 msgstr "建立版本库"
 
-#: rhodecode/model/db.py:1075
+#: rhodecode/model/db.py:1152
 #, fuzzy
 msgid "Repository creation enabled"
 msgstr "建立版本库"
 
-#: rhodecode/model/db.py:1076
+#: rhodecode/model/db.py:1153
+#, fuzzy
+msgid "Repository forking disabled"
+msgstr "建立版本库"
+
+#: rhodecode/model/db.py:1154
+#, fuzzy
+msgid "Repository forking enabled"
+msgstr "建立版本库"
+
+#: rhodecode/model/db.py:1155
 #, fuzzy
 msgid "Register disabled"
 msgstr "禁用"
 
-#: rhodecode/model/db.py:1077
+#: rhodecode/model/db.py:1156
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1080
+#: rhodecode/model/db.py:1159
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1481
+#: rhodecode/model/db.py:1579
 msgid "Not Reviewed"
 msgstr ""
 
-#: rhodecode/model/db.py:1482
+#: rhodecode/model/db.py:1580
 #, fuzzy
 msgid "Approved"
 msgstr "移除"
 
-#: rhodecode/model/db.py:1483
+#: rhodecode/model/db.py:1581
 msgid "Rejected"
 msgstr ""
 
-#: rhodecode/model/db.py:1484
+#: rhodecode/model/db.py:1582
 msgid "Under Review"
 msgstr ""
 
@@ -1013,160 +1096,169 b' msgstr ""'
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:526
+#: rhodecode/model/scm.py:535
 #, fuzzy
 msgid "latest tip"
 msgstr "最后登录"
 
-#: rhodecode/model/user.py:240
+#: rhodecode/model/user.py:230
 #, fuzzy
 msgid "new user registration"
 msgstr "[RhodeCode] 新用户注册"
 
-#: rhodecode/model/user.py:265 rhodecode/model/user.py:287
-#: rhodecode/model/user.py:309
+#: rhodecode/model/user.py:255 rhodecode/model/user.py:277
+#: rhodecode/model/user.py:299
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr "由于是系统帐号，无法编辑该用户"
 
-#: rhodecode/model/user.py:333
+#: rhodecode/model/user.py:323
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr "由于是系统帐号，无法删除该用户"
 
-#: rhodecode/model/user.py:339
+#: rhodecode/model/user.py:329
 #, fuzzy, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories. %s"
 msgstr "由于该用户拥有版本库 %s 因而无法删除，请变更版本库所有者或删除版本库"
 
-#: rhodecode/model/validators.py:52
+#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36
+msgid "Value cannot be an empty list"
+msgstr ""
+
+#: rhodecode/model/validators.py:82
 #, fuzzy, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "该用户名已经存在"
 
-#: rhodecode/model/validators.py:54
+#: rhodecode/model/validators.py:84
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr ""
 
-#: rhodecode/model/validators.py:56
+#: rhodecode/model/validators.py:86
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
 msgstr "只能使用字母、数字、下划线、小数点或减号作为用户名，且必须由数字或字母开头"
 
-#: rhodecode/model/validators.py:84
+#: rhodecode/model/validators.py:114
 #, fuzzy, python-format
 msgid "Username %(username)s is not valid"
 msgstr "用户或用户组名称无效"
 
-#: rhodecode/model/validators.py:103
+#: rhodecode/model/validators.py:133
 #, fuzzy
 msgid "Invalid users group name"
 msgstr "无效用户名"
 
-#: rhodecode/model/validators.py:104
+#: rhodecode/model/validators.py:134
 #, fuzzy, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr "该用户组名称已经存在"
 
-#: rhodecode/model/validators.py:106
+#: rhodecode/model/validators.py:136
 msgid ""
 "users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr "只能使用字母、数字、下划线、小数点或减号作为用户组名，且必须由数字或字母开头"
 
-#: rhodecode/model/validators.py:144
+#: rhodecode/model/validators.py:174
 msgid "Cannot assign this group as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:145
+#: rhodecode/model/validators.py:175
 #, fuzzy, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "该用户名已经存在"
 
-#: rhodecode/model/validators.py:147
+#: rhodecode/model/validators.py:177
 #, fuzzy, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "这个版本库已经存在"
 
-#: rhodecode/model/validators.py:205
+#: rhodecode/model/validators.py:235
 #, fuzzy
 msgid "Invalid characters (non-ascii) in password"
 msgstr "密码含有无效字符"
 
-#: rhodecode/model/validators.py:220
+#: rhodecode/model/validators.py:250
 msgid "Passwords do not match"
 msgstr "密码不符"
 
-#: rhodecode/model/validators.py:237
+#: rhodecode/model/validators.py:267
 msgid "invalid password"
 msgstr "无效密码"
 
-#: rhodecode/model/validators.py:238
+#: rhodecode/model/validators.py:268
 msgid "invalid user name"
 msgstr "无效用户名"
 
-#: rhodecode/model/validators.py:239
+#: rhodecode/model/validators.py:269
 msgid "Your account is disabled"
 msgstr "该帐号已被禁用"
 
-#: rhodecode/model/validators.py:283
+#: rhodecode/model/validators.py:313
 #, fuzzy, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "该版本库名称被禁用"
 
-#: rhodecode/model/validators.py:285
+#: rhodecode/model/validators.py:315
 #, fuzzy, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "这个版本库已经存在"
 
-#: rhodecode/model/validators.py:286
+#: rhodecode/model/validators.py:316
 #, fuzzy, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "组中已经存在该版本库"
 
-#: rhodecode/model/validators.py:288
+#: rhodecode/model/validators.py:318
 #, fuzzy, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr "这个版本库已经存在"
 
-#: rhodecode/model/validators.py:386
+#: rhodecode/model/validators.py:431
 msgid "invalid clone url"
 msgstr "无效的 clone 地址"
 
-#: rhodecode/model/validators.py:387
-msgid "Invalid clone url, provide a valid clone http\\s url"
+#: rhodecode/model/validators.py:432
+msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 
-#: rhodecode/model/validators.py:418
+#: rhodecode/model/validators.py:457
 #, fuzzy
 msgid "Fork have to be the same type as parent"
 msgstr "分支必须使用相同的版本库类型"
 
-#: rhodecode/model/validators.py:439
+#: rhodecode/model/validators.py:478
 msgid "This username or users group name is not valid"
 msgstr "用户或用户组名称无效"
 
-#: rhodecode/model/validators.py:509
+#: rhodecode/model/validators.py:562
 msgid "This is not a valid path"
 msgstr "不是一个合法的路径"
 
-#: rhodecode/model/validators.py:524
+#: rhodecode/model/validators.py:577
 msgid "This e-mail address is already taken"
 msgstr "该邮件地址已被使用"
 
-#: rhodecode/model/validators.py:544
+#: rhodecode/model/validators.py:597
 #, fuzzy, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "该邮件地址不存在"
 
-#: rhodecode/model/validators.py:581
+#: rhodecode/model/validators.py:634
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 
+#: rhodecode/model/validators.py:653
+#, python-format
+msgid "Revisions %(revs)s are already part of pull request or have set status"
+msgstr ""
+
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr ""
@@ -1185,7 +1277,7 b' msgstr "\xe5\xbf\xab\xe9\x80\x9f\xe8\xbf\x87\xe6\xbb\xa4..."'
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:219
+#: rhodecode/templates/base/base.html:221
 msgid "repositories"
 msgstr "个版本库"
 
@@ -1205,9 +1297,9 b' msgid "Group name"'
 msgstr "组名"
 
 #: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:67
-#: rhodecode/templates/index_base.html:132
-#: rhodecode/templates/index_base.html:158
+#: rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/index_base.html:168
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:72
@@ -1225,15 +1317,15 b' msgstr "\xe6\x8f\x8f\xe8\xbf\xb0"'
 msgid "Repositories group"
 msgstr "版本库组"
 
-#: rhodecode/templates/index_base.html:66
-#: rhodecode/templates/index_base.html:156
+#: rhodecode/templates/index_base.html:70
+#: rhodecode/templates/index_base.html:166
 #: 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:172
+#: rhodecode/templates/admin/users/user_edit.html:192
 #: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:154
-#: rhodecode/templates/admin/users/user_edit_my_account.html:190
+#: rhodecode/templates/admin/users/user_edit_my_account.html:157
+#: rhodecode/templates/admin/users/user_edit_my_account.html:193
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
@@ -1244,62 +1336,62 b' msgstr "\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93\xe7\xbb\x84"'
 #: rhodecode/templates/journal/journal.html:186
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:119
+#: rhodecode/templates/summary/summary.html:123
 #: rhodecode/templates/tags/tags.html:36
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr "名称"
 
-#: rhodecode/templates/index_base.html:68
+#: rhodecode/templates/index_base.html:72
 msgid "Last change"
 msgstr "最后修改"
 
-#: rhodecode/templates/index_base.html:69
-#: rhodecode/templates/index_base.html:161
-#: rhodecode/templates/admin/users/user_edit_my_account.html:156
+#: rhodecode/templates/index_base.html:73
+#: rhodecode/templates/index_base.html:171
+#: rhodecode/templates/admin/users/user_edit_my_account.html:159
 #: rhodecode/templates/journal/journal.html:188
 msgid "Tip"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:70
-#: rhodecode/templates/index_base.html:163
-#: rhodecode/templates/admin/repos/repo_edit.html:112
+#: rhodecode/templates/index_base.html:74
+#: rhodecode/templates/index_base.html:173
+#: rhodecode/templates/admin/repos/repo_edit.html:121
 #: rhodecode/templates/admin/repos/repos.html:73
 msgid "Owner"
 msgstr "所有者"
 
-#: rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:75
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/index_base.html:76
 msgid "Atom"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:102
-#: rhodecode/templates/index_base.html:104
+#: rhodecode/templates/index_base.html:110
+#: rhodecode/templates/index_base.html:112
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "订阅 rss %s"
 
-#: rhodecode/templates/index_base.html:109
-#: rhodecode/templates/index_base.html:111
+#: rhodecode/templates/index_base.html:117
+#: rhodecode/templates/index_base.html:119
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "订阅 atom %s"
 
-#: rhodecode/templates/index_base.html:130
+#: rhodecode/templates/index_base.html:140
 #, fuzzy
 msgid "Group Name"
 msgstr "组名"
 
-#: rhodecode/templates/index_base.html:148
-#: rhodecode/templates/index_base.html:188
+#: rhodecode/templates/index_base.html:158
+#: rhodecode/templates/index_base.html:198
 #: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:176
-#: rhodecode/templates/admin/users/users.html:105
+#: rhodecode/templates/admin/users/user_edit_my_account.html:179
+#: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
 #: rhodecode/templates/branches/branches.html:77
 #: rhodecode/templates/journal/journal.html:211
@@ -1307,11 +1399,11 b' msgstr "\xe7\xbb\x84\xe5\x90\x8d"'
 msgid "Click to sort ascending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:149
-#: rhodecode/templates/index_base.html:189
+#: rhodecode/templates/index_base.html:159
+#: rhodecode/templates/index_base.html:199
 #: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:177
-#: rhodecode/templates/admin/users/users.html:106
+#: rhodecode/templates/admin/users/user_edit_my_account.html:180
+#: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:78
 #: rhodecode/templates/journal/journal.html:212
@@ -1319,15 +1411,15 b' msgstr ""'
 msgid "Click to sort descending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:159
+#: rhodecode/templates/index_base.html:169
 #, fuzzy
 msgid "Last Change"
 msgstr "最后修改"
 
-#: rhodecode/templates/index_base.html:190
+#: rhodecode/templates/index_base.html:200
 #: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:178
-#: rhodecode/templates/admin/users/users.html:107
+#: rhodecode/templates/admin/users/user_edit_my_account.html:181
+#: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
 #: rhodecode/templates/branches/branches.html:79
 #: rhodecode/templates/journal/journal.html:213
@@ -1335,10 +1427,10 b' msgstr "\xe6\x9c\x80\xe5\x90\x8e\xe4\xbf\xae\xe6\x94\xb9"'
 msgid "No records found."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:191
+#: rhodecode/templates/index_base.html:201
 #: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:179
-#: rhodecode/templates/admin/users/users.html:108
+#: rhodecode/templates/admin/users/user_edit_my_account.html:182
+#: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:80
 #: rhodecode/templates/journal/journal.html:214
@@ -1346,10 +1438,10 b' msgstr ""'
 msgid "Data error."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:192
+#: rhodecode/templates/index_base.html:202
 #: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:180
-#: rhodecode/templates/admin/users/users.html:109
+#: rhodecode/templates/admin/users/user_edit_my_account.html:183
+#: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:81
 #: rhodecode/templates/journal/journal.html:215
@@ -1372,7 +1464,7 b' msgstr "\xe7\x99\xbb\xe5\xbd\x95\xe5\x88\xb0"'
 #: rhodecode/templates/admin/users/user_edit.html:50
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
 #: rhodecode/templates/base/base.html:83
-#: rhodecode/templates/summary/summary.html:118
+#: rhodecode/templates/summary/summary.html:122
 msgid "Username"
 msgstr "帐号"
 
@@ -1446,7 +1538,7 b' msgstr "\xe5\xa7\x93"'
 #: rhodecode/templates/admin/users/user_add.html:77
 #: rhodecode/templates/admin/users/user_edit.html:104
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:120
+#: rhodecode/templates/summary/summary.html:124
 msgid "Email"
 msgstr "电子邮件"
 
@@ -1609,13 +1701,13 b' msgid "E-mail Attribute"'
 msgstr "电子邮件属性"
 
 #: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/repos/repo_edit.html:132
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
 #: rhodecode/templates/admin/settings/hooks.html:73
 #: rhodecode/templates/admin/users/user_edit.html:129
-#: rhodecode/templates/admin/users/user_edit.html:154
+#: rhodecode/templates/admin/users/user_edit.html:174
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:115
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:93
 msgid "Save"
 msgstr "保存"
@@ -1635,8 +1727,8 b' msgid "Comments"'
 msgstr "提交"
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:252
 #: rhodecode/templates/base/base.html:254
+#: rhodecode/templates/base/base.html:256
 msgid "Pull requests"
 msgstr ""
 
@@ -1665,7 +1757,7 b' msgid "Permissions administration"'
 msgstr "权限管理"
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:125
+#: 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:139
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
@@ -1705,7 +1797,12 b' msgid "Repository creation"'
 msgstr "建立版本库"
 
 #: rhodecode/templates/admin/permissions/permissions.html:71
-#: rhodecode/templates/admin/repos/repo_edit.html:227
+#, fuzzy
+msgid "Repository forking"
+msgstr "建立版本库"
+
+#: rhodecode/templates/admin/permissions/permissions.html:78
+#: rhodecode/templates/admin/repos/repo_edit.html:241
 msgid "set"
 msgstr "设置"
 
@@ -1720,6 +1817,10 b' msgstr "\xe6\xb7\xbb\xe5\x8a\xa0\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93"'
 msgid "Repositories"
 msgstr "版本库"
 
+#: rhodecode/templates/admin/repos/repo_add.html:13
+msgid "add new"
+msgstr "新增"
+
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
 #: rhodecode/templates/summary/summary.html:95
 #: rhodecode/templates/summary/summary.html:96
@@ -1800,8 +1901,8 b' msgstr "\xe7\xbc\x96\xe8\xbe\x91\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93"'
 
 #: rhodecode/templates/admin/repos/repo_edit.html:13
 #: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:204
-#: rhodecode/templates/admin/users/user_edit.html:206
+#: rhodecode/templates/admin/users/user_edit.html:224
+#: rhodecode/templates/admin/users/user_edit.html:226
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
 #: rhodecode/templates/files/files_source.html:44
@@ -1835,20 +1936,31 b' msgstr "\xe5\x90\xaf\xe7\x94\xa8\xe4\xb8\x8b\xe8\xbd\xbd"'
 msgid "Enable download menu on summary page."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:117
+#: rhodecode/templates/admin/repos/repo_edit.html:112
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#, fuzzy
+msgid "Enable locking"
+msgstr "启用"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:116
+msgid "Enable lock-by-pulling on repository."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:126
 #, fuzzy
 msgid "Change owner of this repository."
 msgstr "%s 库的修改"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:133
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67
+#: 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:180
+#: rhodecode/templates/admin/settings/settings.html:168
+#: rhodecode/templates/admin/settings/settings.html:258
 #: rhodecode/templates/admin/users/user_edit.html:130
-#: rhodecode/templates/admin/users/user_edit.html:155
-#: rhodecode/templates/admin/users/user_edit.html:258
+#: rhodecode/templates/admin/users/user_edit.html:175
+#: rhodecode/templates/admin/users/user_edit.html:278
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:116
+#: 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
@@ -1856,90 +1968,130 b' msgstr "%s \xe5\xba\x93\xe7\x9a\x84\xe4\xbf\xae\xe6\x94\xb9"'
 msgid "Reset"
 msgstr "重置"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:143
+#: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr "管理"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:146
+#: rhodecode/templates/admin/repos/repo_edit.html:155
 msgid "Statistics"
 msgstr "统计"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:150
+#: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Reset current statistics"
 msgstr "重置统计"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:150
+#: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Confirm to remove current statistics"
 msgstr "确认移除当前统计"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:153
+#: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Fetched to rev"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:154
+#: rhodecode/templates/admin/repos/repo_edit.html:163
 msgid "Stats gathered"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:162
+#: rhodecode/templates/admin/repos/repo_edit.html:171
 msgid "Remote"
 msgstr "远程"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:166
+#: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Pull changes from remote location"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:166
+#: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Confirm to pull changes from remote side"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:177
+#: rhodecode/templates/admin/repos/repo_edit.html:186
 msgid "Cache"
 msgstr "缓存"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:181
+#: rhodecode/templates/admin/repos/repo_edit.html:190
 msgid "Invalidate repository cache"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:181
+#: rhodecode/templates/admin/repos/repo_edit.html:190
 msgid "Confirm to invalidate repository cache"
 msgstr "确认清除版本库缓存"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:186
-#: rhodecode/templates/base/base.html:316
+#: rhodecode/templates/admin/repos/repo_edit.html:195
 #: rhodecode/templates/base/base.html:318
 #: rhodecode/templates/base/base.html:320
+#: rhodecode/templates/base/base.html:322
 msgid "Public journal"
 msgstr "公共日志"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:192
+#: rhodecode/templates/admin/repos/repo_edit.html:201
 msgid "Remove from public journal"
 msgstr "从公共日志删除"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:194
+#: rhodecode/templates/admin/repos/repo_edit.html:203
 msgid "Add to public journal"
 msgstr "添加到公共日志"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:199
+#: rhodecode/templates/admin/repos/repo_edit.html:208
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:206
+#: rhodecode/templates/admin/repos/repo_edit.html:215
+#, fuzzy
+msgid "Locking"
+msgstr "解锁"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:220
+msgid "Unlock locked repo"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:220
+#, fuzzy
+msgid "Confirm to unlock repository"
+msgstr "确认删除版本库"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:223
+msgid "lock repo"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:223
+#, fuzzy
+msgid "Confirm to lock repository"
+msgstr "确认删除版本库"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:224
+#, fuzzy
+msgid "Repository is not locked"
+msgstr "个版本库"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:229
+msgid "Force locking on repository. Works only when anonymous access is disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:236
+msgid "Set as fork of"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:245
+msgid "Manually set this repository as a fork of another from the list"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:251
 #: rhodecode/templates/changeset/changeset_file_comment.html:26
 msgid "Delete"
 msgstr "删除"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:210
+#: rhodecode/templates/admin/repos/repo_edit.html:255
 msgid "Remove this repository"
 msgstr "删除版本库"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:210
+#: rhodecode/templates/admin/repos/repo_edit.html:255
 #: rhodecode/templates/journal/journal.html:84
 msgid "Confirm to delete this repository"
 msgstr "确认删除版本库"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:214
+#: rhodecode/templates/admin/repos/repo_edit.html:259
 msgid ""
 "This repository will be renamed in a special way in order to be "
 "unaccesible for RhodeCode and VCS systems.\n"
@@ -1947,14 +2099,6 b' msgid ""'
 "please do it manually"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:222
-msgid "Set as fork of"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:231
-msgid "Manually set this repository as a fork of another from the list"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
 msgid "none"
@@ -1972,8 +2116,8 b' msgstr "\xe5\x86\x99"'
 
 #: 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:83
-#: rhodecode/templates/base/base.html:215
+#: rhodecode/templates/admin/users/users.html:85
+#: rhodecode/templates/base/base.html:217
 msgid "admin"
 msgstr "管理员"
 
@@ -2003,18 +2147,18 b' msgstr "\xe5\x88\xa0\xe9\x99\xa4"'
 msgid "revoke"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:80
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:83
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67
 msgid "Add another member"
 msgstr "添加成员"
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:94
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:97
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
 msgid "Failed to remove user"
 msgstr "删除用户失败"
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:109
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:112
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96
 msgid "Failed to remove users group"
 msgstr "删除用户组失败"
 
@@ -2052,7 +2196,7 b' msgstr "\xe4\xb8\x8a\xe7\xba\xa7\xe7\xbb\x84"'
 #: 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:93
+#: rhodecode/templates/pullrequests/pullrequest_show.html:113
 msgid "save"
 msgstr "保存"
 
@@ -2064,6 +2208,12 b' msgstr "\xe7\xbc\x96\xe8\xbe\x91\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93\xe7\xbb\x84"'
 msgid "edit repos group"
 msgstr "编辑版本库组"
 
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other"
+" groups and repositories inside"
+msgstr ""
+
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
 msgid "Repositories groups administration"
 msgstr "版本库管理员"
@@ -2078,13 +2228,13 b' msgid "Number of toplevel repositories"'
 msgstr "版本库数量"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
-#: rhodecode/templates/admin/users/users.html:85
+#: rhodecode/templates/admin/users/users.html:87
 #: rhodecode/templates/admin/users_groups/users_groups.html:35
 msgid "action"
 msgstr "操作"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
-#: rhodecode/templates/admin/users/user_edit.html:235
+#: rhodecode/templates/admin/users/user_edit.html:255
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 #: rhodecode/templates/data_table/_dt_elements.html:7
 #: rhodecode/templates/data_table/_dt_elements.html:103
@@ -2189,94 +2339,142 b' msgid "GA code"'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:112
-#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:167
+#: rhodecode/templates/admin/settings/settings.html:257
 msgid "Save settings"
 msgstr "保存设置"
 
 #: rhodecode/templates/admin/settings/settings.html:119
 #, fuzzy
-msgid "VCS settings"
-msgstr "设置"
+msgid "Visualisation settings"
+msgstr "全局设置"
 
 #: rhodecode/templates/admin/settings/settings.html:128
+#, fuzzy
+msgid "Icons"
+msgstr "选项"
+
+#: rhodecode/templates/admin/settings/settings.html:133
+msgid "Show public repo icon on repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:137
+#, fuzzy
+msgid "Show private repo icon on repositories"
+msgstr "私有版本库"
+
+#: rhodecode/templates/admin/settings/settings.html:144
+#, fuzzy
+msgid "Meta-Tagging"
+msgstr "设置"
+
+#: rhodecode/templates/admin/settings/settings.html:149
+msgid "Stylify recognised metatags:"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:176
+#, fuzzy
+msgid "VCS settings"
+msgstr "设置"
+
+#: rhodecode/templates/admin/settings/settings.html:185
 msgid "Web"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:133
+#: rhodecode/templates/admin/settings/settings.html:190
 #, fuzzy
 msgid "require ssl for vcs operations"
 msgstr "使用 SSL 推送"
 
-#: rhodecode/templates/admin/settings/settings.html:135
+#: rhodecode/templates/admin/settings/settings.html:192
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
 "will return HTTP Error 406: Not Acceptable"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:141
+#: rhodecode/templates/admin/settings/settings.html:198
 msgid "Hooks"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:146
+#: rhodecode/templates/admin/settings/settings.html:203
 msgid "Update repository after push (hg update)"
 msgstr "推送后更新版本库（hg update）"
 
-#: rhodecode/templates/admin/settings/settings.html:150
+#: rhodecode/templates/admin/settings/settings.html:207
 msgid "Show repository size after push"
 msgstr "推送后显示版本库大小"
 
-#: rhodecode/templates/admin/settings/settings.html:154
+#: rhodecode/templates/admin/settings/settings.html:211
 msgid "Log user push commands"
 msgstr "记录用户推送命令"
 
-#: rhodecode/templates/admin/settings/settings.html:158
+#: rhodecode/templates/admin/settings/settings.html:215
 msgid "Log user pull commands"
 msgstr "记录用户拉取命令"
 
-#: rhodecode/templates/admin/settings/settings.html:162
+#: rhodecode/templates/admin/settings/settings.html:219
 msgid "advanced setup"
 msgstr "高级设置"
 
-#: rhodecode/templates/admin/settings/settings.html:167
+#: rhodecode/templates/admin/settings/settings.html:224
+#, fuzzy
+msgid "Mercurial Extensions"
+msgstr "Mercurial 版本库"
+
+#: rhodecode/templates/admin/settings/settings.html:229
+msgid "largefiles extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:233
+msgid "hgsubversion extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:235
+msgid ""
+"Requires hgsubversion library installed. Allows clonning from svn remote "
+"locations"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:245
 msgid "Repositories location"
 msgstr "版本库路径"
 
-#: rhodecode/templates/admin/settings/settings.html:172
+#: rhodecode/templates/admin/settings/settings.html:250
 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 "这是一个关键设置。如果确认修改该项设置，请重启服务以便设置生效。"
 
-#: rhodecode/templates/admin/settings/settings.html:173
+#: rhodecode/templates/admin/settings/settings.html:251
 msgid "unlock"
 msgstr "解锁"
 
-#: rhodecode/templates/admin/settings/settings.html:174
+#: rhodecode/templates/admin/settings/settings.html:252
 msgid ""
 "Location where repositories are stored. After changing this value a "
 "restart, and rescan is required"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:194
+#: rhodecode/templates/admin/settings/settings.html:272
 msgid "Test Email"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:202
+#: rhodecode/templates/admin/settings/settings.html:280
 #, fuzzy
 msgid "Email to"
 msgstr "电子邮件"
 
-#: rhodecode/templates/admin/settings/settings.html:210
+#: rhodecode/templates/admin/settings/settings.html:288
 #, fuzzy
 msgid "Send"
 msgstr "秒"
 
-#: rhodecode/templates/admin/settings/settings.html:216
+#: rhodecode/templates/admin/settings/settings.html:294
 msgid "System Info and Packages"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:219
+#: rhodecode/templates/admin/settings/settings.html:297
 #, fuzzy
 msgid "show"
 msgstr "显示"
@@ -2341,42 +2539,64 b' msgstr ""'
 
 #: rhodecode/templates/admin/users/user_edit.html:147
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
+#, fuzzy
+msgid "Inherit default permissions"
+msgstr "默认权限"
+
+#: rhodecode/templates/admin/users/user_edit.html:152
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:113
+#, python-format
+msgid ""
+"Select to inherit permissions from %s settings. With this selected below "
+"options does not have any action"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:158
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr "创建版本库"
 
 #: rhodecode/templates/admin/users/user_edit.html:166
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:127
+#, fuzzy
+msgid "Fork repositories"
+msgstr "个版本库"
+
+#: rhodecode/templates/admin/users/user_edit.html:186
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
 #, fuzzy
 msgid "Nothing here yet"
 msgstr "尚无操作"
 
-#: rhodecode/templates/admin/users/user_edit.html:173
+#: rhodecode/templates/admin/users/user_edit.html:193
 #: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:191
+#: rhodecode/templates/admin/users/user_edit_my_account.html:194
 #, fuzzy
 msgid "Permission"
 msgstr "权限"
 
-#: rhodecode/templates/admin/users/user_edit.html:174
+#: rhodecode/templates/admin/users/user_edit.html:194
 #, fuzzy
 msgid "Edit Permission"
 msgstr "版本库权限"
 
-#: rhodecode/templates/admin/users/user_edit.html:223
+#: rhodecode/templates/admin/users/user_edit.html:243
 #, fuzzy
 msgid "Email addresses"
 msgstr "邮件地址"
 
-#: rhodecode/templates/admin/users/user_edit.html:236
+#: rhodecode/templates/admin/users/user_edit.html:256
 #, fuzzy, python-format
 msgid "Confirm to delete this email: %s"
 msgstr "确认删除该用户"
 
-#: rhodecode/templates/admin/users/user_edit.html:250
+#: rhodecode/templates/admin/users/user_edit.html:270
 #, fuzzy
 msgid "New email address"
 msgstr "邮件地址"
 
-#: rhodecode/templates/admin/users/user_edit.html:257
+#: rhodecode/templates/admin/users/user_edit.html:277
 #, fuzzy
 msgid "Add"
 msgstr "新增"
@@ -2415,16 +2635,21 b' msgstr "\xe6\x96\xb0\xe5\xa2\x9e"'
 msgid "Opened by me"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10
 #, python-format
 msgid "Pull request #%s opened on %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
+#, fuzzy
+msgid "Confirm to delete this pull request"
+msgstr "确认删除版本库"
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26
 msgid "I participate in"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
@@ -2466,7 +2691,7 b' msgid "Users administration"'
 msgstr "用户管理员"
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:221
+#: rhodecode/templates/base/base.html:223
 msgid "users"
 msgstr "用户"
 
@@ -2474,30 +2699,30 b' msgstr "\xe7\x94\xa8\xe6\x88\xb7"'
 msgid "ADD NEW USER"
 msgstr "添加用户"
 
-#: rhodecode/templates/admin/users/users.html:76
+#: rhodecode/templates/admin/users/users.html:77
 msgid "username"
 msgstr "用户名"
 
-#: rhodecode/templates/admin/users/users.html:79
+#: rhodecode/templates/admin/users/users.html:80
 #, fuzzy
 msgid "firstname"
 msgstr "名"
 
-#: rhodecode/templates/admin/users/users.html:80
+#: rhodecode/templates/admin/users/users.html:81
 msgid "lastname"
 msgstr "姓"
 
-#: rhodecode/templates/admin/users/users.html:81
+#: rhodecode/templates/admin/users/users.html:82
 msgid "last login"
 msgstr "最后登录"
 
-#: rhodecode/templates/admin/users/users.html:82
+#: rhodecode/templates/admin/users/users.html:84
 #: rhodecode/templates/admin/users_groups/users_groups.html:34
 msgid "active"
 msgstr "启用"
 
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/base/base.html:224
+#: rhodecode/templates/admin/users/users.html:86
+#: rhodecode/templates/base/base.html:226
 msgid "ldap"
 msgstr ""
 
@@ -2542,7 +2767,7 b' msgstr "\xe5\x90\xaf\xe7\x94\xa8\xe6\x88\x90\xe5\x91\x98"'
 msgid "Add all elements"
 msgstr "添加全部项目"
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:126
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:146
 #, fuzzy
 msgid "Group members"
 msgstr "选择组成员"
@@ -2591,9 +2816,9 b' msgid "Inbox"'
 msgstr ""
 
 #: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:298
 #: rhodecode/templates/base/base.html:300
 #: rhodecode/templates/base/base.html:302
+#: rhodecode/templates/base/base.html:304
 #: rhodecode/templates/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
@@ -2617,9 +2842,9 b' msgid "Home"'
 msgstr "首页"
 
 #: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:307
 #: rhodecode/templates/base/base.html:309
 #: rhodecode/templates/base/base.html:311
+#: rhodecode/templates/base/base.html:313
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
@@ -2674,7 +2899,6 b' msgstr "\xe5\x88\x87\xe6\x8d\xa2\xe5\x88\xb0"'
 #: 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/files/files.html:40
 msgid "Files"
 msgstr "档案"
 
@@ -2685,7 +2909,7 b' msgstr "\xe9\x80\x89\xe9\xa1\xb9"'
 
 #: rhodecode/templates/base/base.html:204
 #: rhodecode/templates/base/base.html:206
-#: rhodecode/templates/base/base.html:225
+#: rhodecode/templates/base/base.html:227
 msgid "settings"
 msgstr "设置"
 
@@ -2695,40 +2919,40 b' msgstr "\xe8\xae\xbe\xe7\xbd\xae"'
 msgid "fork"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/changelog/changelog.html:39
+#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/changelog/changelog.html:40
 msgid "Open new pull request"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/base/base.html:213
 msgid "search"
 msgstr "搜索"
 
-#: rhodecode/templates/base/base.html:220
+#: rhodecode/templates/base/base.html:222
 msgid "repositories groups"
 msgstr "版本库组"
 
-#: rhodecode/templates/base/base.html:222
+#: rhodecode/templates/base/base.html:224
 msgid "users groups"
 msgstr "用户组"
 
-#: rhodecode/templates/base/base.html:223
+#: rhodecode/templates/base/base.html:225
 msgid "permissions"
 msgstr "权限"
 
-#: rhodecode/templates/base/base.html:236
 #: rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:240
 msgid "Followers"
 msgstr "跟随者"
 
-#: rhodecode/templates/base/base.html:244
 #: rhodecode/templates/base/base.html:246
+#: rhodecode/templates/base/base.html:248
 msgid "Forks"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:325
 #: rhodecode/templates/base/base.html:327
 #: rhodecode/templates/base/base.html:329
+#: rhodecode/templates/base/base.html:331
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "搜索"
@@ -2837,20 +3061,20 b' msgstr ""'
 msgid "Compare fork"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:44
+#: rhodecode/templates/changelog/changelog.html:46
 msgid "Show"
 msgstr "显示"
 
-#: rhodecode/templates/changelog/changelog.html:70
-#: rhodecode/templates/summary/summary.html:360
+#: rhodecode/templates/changelog/changelog.html:72
+#: rhodecode/templates/summary/summary.html:364
 msgid "show more"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:74
+#: rhodecode/templates/changelog/changelog.html:76
 msgid "Affected number of files, click to show more details"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:87
+#: rhodecode/templates/changelog/changelog.html:89
 #: rhodecode/templates/changeset/changeset.html:38
 #: rhodecode/templates/changeset/changeset_file_comment.html:20
 #: rhodecode/templates/changeset/changeset_range.html:46
@@ -2858,26 +3082,26 b' msgstr ""'
 msgid "Changeset status"
 msgstr "变更集"
 
-#: rhodecode/templates/changelog/changelog.html:90
+#: rhodecode/templates/changelog/changelog.html:92
 msgid "Click to open associated pull request"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:100
+#: rhodecode/templates/changelog/changelog.html:102
 #: rhodecode/templates/changeset/changeset.html:78
 msgid "Parent"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:106
+#: rhodecode/templates/changelog/changelog.html:108
 #: rhodecode/templates/changeset/changeset.html:84
 msgid "No parents"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:111
+#: rhodecode/templates/changelog/changelog.html:113
 #: rhodecode/templates/changeset/changeset.html:88
 msgid "merge"
 msgstr "合并"
 
-#: rhodecode/templates/changelog/changelog.html:114
+#: rhodecode/templates/changelog/changelog.html:116
 #: rhodecode/templates/changeset/changeset.html:91
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_add.html:33
@@ -2886,20 +3110,20 b' msgstr "\xe5\x90\x88\xe5\xb9\xb6"'
 msgid "branch"
 msgstr "分支"
 
-#: rhodecode/templates/changelog/changelog.html:120
+#: rhodecode/templates/changelog/changelog.html:122
 msgid "bookmark"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:128
 #: rhodecode/templates/changeset/changeset.html:96
 msgid "tag"
 msgstr "标签"
 
-#: rhodecode/templates/changelog/changelog.html:162
+#: rhodecode/templates/changelog/changelog.html:164
 msgid "Show selected changes __S -> __E"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:253
+#: rhodecode/templates/changelog/changelog.html:255
 msgid "There are no changes yet"
 msgstr "没有任何变更"
 
@@ -3038,7 +3262,7 b' msgstr "\xe6\xaf\x94\xe8\xbe\x83\xe6\x98\xbe\xe7\xa4\xba"'
 
 #: rhodecode/templates/changeset/changeset_range.html:54
 #: rhodecode/templates/compare/compare_diff.html:41
-#: rhodecode/templates/pullrequests/pullrequest_show.html:50
+#: rhodecode/templates/pullrequests/pullrequest_show.html:69
 msgid "Files affected"
 msgstr ""
 
@@ -3119,12 +3343,13 b' msgid "File diff"'
 msgstr "文件 diff"
 
 #: rhodecode/templates/files/files.html:4
+#: rhodecode/templates/files/files.html:72
 #, fuzzy, python-format
-msgid "%s Files"
+msgid "%s files"
 msgstr "文件"
 
 #: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:336
+#: rhodecode/templates/summary/summary.html:340
 msgid "files"
 msgstr "文件"
 
@@ -3464,18 +3689,18 b' msgid "Detailed compare view"'
 msgstr "比较显示"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:63
+#: rhodecode/templates/pullrequests/pullrequest_show.html:82
 msgid "Pull request reviewers"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:75
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
 #, fuzzy
 msgid "owner"
 msgstr "所有者"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:89
+#: rhodecode/templates/pullrequests/pullrequest_show.html:109
 msgid "Add reviewer to this pull request."
 msgstr ""
 
@@ -3505,21 +3730,36 b' msgstr ""'
 msgid "Closed %s"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:28
+#: rhodecode/templates/pullrequests/pullrequest_show.html:31
+#, fuzzy
+msgid "Status"
+msgstr "变更集"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Pull request status"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+#: rhodecode/templates/pullrequests/pullrequest_show.html:44
+msgid "Still not reviewed by"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:47
+#, python-format
+msgid "%d reviewer"
+msgid_plural "%d reviewers"
+msgstr[0] ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:54
 #, fuzzy
 msgid "Created on"
 msgstr "创建用户 %s"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:61
 #, fuzzy
 msgid "Compare view"
 msgstr "比较显示"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:46
+#: rhodecode/templates/pullrequests/pullrequest_show.html:65
 #, fuzzy
 msgid "Incoming changesets"
 msgstr "尚无修订"
@@ -3580,7 +3820,7 b' msgstr "\xe6\x8f\x90\xe4\xba\xa4\xe4\xbf\xa1\xe6\x81\xaf"'
 msgid "File names"
 msgstr "文件名"
 
-#: rhodecode/templates/search/search_commit.html:34
+#: rhodecode/templates/search/search_commit.html:35
 #: rhodecode/templates/search/search_content.html:21
 #: rhodecode/templates/search/search_path.html:15
 msgid "Permission denied"
@@ -3660,118 +3900,118 b' msgstr "\xe5\x85\xac\xe5\x85\xb1"'
 msgid "remote clone"
 msgstr "远程 clone"
 
-#: rhodecode/templates/summary/summary.html:112
+#: rhodecode/templates/summary/summary.html:116
 msgid "Contact"
 msgstr "联系方式"
 
-#: rhodecode/templates/summary/summary.html:126
+#: rhodecode/templates/summary/summary.html:130
 msgid "Clone url"
 msgstr "clone 地址"
 
-#: rhodecode/templates/summary/summary.html:129
+#: rhodecode/templates/summary/summary.html:133
 msgid "Show by Name"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:130
+#: rhodecode/templates/summary/summary.html:134
 msgid "Show by ID"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:138
+#: rhodecode/templates/summary/summary.html:142
 #, fuzzy
 msgid "Trending files"
 msgstr "编辑文件"
 
-#: rhodecode/templates/summary/summary.html:146
-#: rhodecode/templates/summary/summary.html:162
-#: rhodecode/templates/summary/summary.html:190
+#: rhodecode/templates/summary/summary.html:150
+#: rhodecode/templates/summary/summary.html:166
+#: rhodecode/templates/summary/summary.html:194
 msgid "enable"
 msgstr "启用"
 
-#: rhodecode/templates/summary/summary.html:154
+#: rhodecode/templates/summary/summary.html:158
 msgid "Download"
 msgstr "下载"
 
-#: rhodecode/templates/summary/summary.html:158
+#: rhodecode/templates/summary/summary.html:162
 msgid "There are no downloads yet"
 msgstr "尚无任何下载"
 
-#: rhodecode/templates/summary/summary.html:160
+#: rhodecode/templates/summary/summary.html:164
 msgid "Downloads are disabled for this repository"
 msgstr "这个版本库的下载已经禁用"
 
-#: rhodecode/templates/summary/summary.html:166
+#: rhodecode/templates/summary/summary.html:170
 #, fuzzy
 msgid "Download as zip"
 msgstr "下载原始文件"
 
-#: rhodecode/templates/summary/summary.html:169
+#: rhodecode/templates/summary/summary.html:173
 msgid "Check this to download archive with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:169
+#: rhodecode/templates/summary/summary.html:173
 msgid "with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:182
+#: rhodecode/templates/summary/summary.html:186
 msgid "Commit activity by day / author"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:193
+#: rhodecode/templates/summary/summary.html:197
 msgid "Stats gathered: "
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:214
+#: rhodecode/templates/summary/summary.html:218
 msgid "Shortlog"
 msgstr "简短日志"
 
-#: rhodecode/templates/summary/summary.html:216
+#: rhodecode/templates/summary/summary.html:220
 #, fuzzy
 msgid "Quick start"
 msgstr "快速过滤..."
 
-#: rhodecode/templates/summary/summary.html:229
+#: rhodecode/templates/summary/summary.html:233
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:232
+#: rhodecode/templates/summary/summary.html:236
 msgid "Permalink to this readme"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:289
+#: rhodecode/templates/summary/summary.html:293
 #, python-format
 msgid "Download %s as %s"
 msgstr "下载 %s 作为 %s"
 
-#: rhodecode/templates/summary/summary.html:646
+#: rhodecode/templates/summary/summary.html:650
 msgid "commits"
 msgstr "提交"
 
-#: rhodecode/templates/summary/summary.html:647
+#: rhodecode/templates/summary/summary.html:651
 msgid "files added"
 msgstr "文件已添加"
 
-#: rhodecode/templates/summary/summary.html:648
+#: rhodecode/templates/summary/summary.html:652
 msgid "files changed"
 msgstr "文件已更改"
 
-#: rhodecode/templates/summary/summary.html:649
+#: rhodecode/templates/summary/summary.html:653
 msgid "files removed"
 msgstr "文件已删除"
 
-#: rhodecode/templates/summary/summary.html:652
+#: rhodecode/templates/summary/summary.html:656
 msgid "commit"
 msgstr "提交"
 
-#: rhodecode/templates/summary/summary.html:653
+#: rhodecode/templates/summary/summary.html:657
 msgid "file added"
 msgstr "文件已添加"
 
-#: rhodecode/templates/summary/summary.html:654
+#: rhodecode/templates/summary/summary.html:658
 msgid "file changed"
 msgstr "文件已更改"
 
-#: rhodecode/templates/summary/summary.html:655
+#: rhodecode/templates/summary/summary.html:659
 msgid "file removed"
 msgstr "文件已删除"