i18n: Updated message catalog template

.release.cfg

@@ -11,6 +11,7 b' done = true'
 [task:changelog_updated]
 
 [task:generate_api_docs]
+done = true
 
 [task:updated_translation]
 

rhodecode/i18n/rhodecode.pot

@@ -6,9 +6,9 b''
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rhodecode-enterprise-ce 4.4.0\n"
+"Project-Id-Version: rhodecode-enterprise-ce 4.5.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2016-09-15 14:25+0000\n"
+"POT-Creation-Date: 2016-12-01 10:12+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -42,12 +42,12 b' msgid "Issue Tracker"'
 msgstr ""
 
 #: rhodecode/admin/navigation.py:80 rhodecode/integrations/types/email.py:232
-#: rhodecode/templates/register.html:76
+#: rhodecode/templates/register.html:75
 #: rhodecode/templates/admin/my_account/my_account_profile.html:48
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:94
 #: rhodecode/templates/admin/users/user_add.html:86
 #: rhodecode/templates/admin/users/user_edit_profile.html:65
-#: rhodecode/templates/admin/users/users.html:90
+#: rhodecode/templates/admin/users/users.html:92
 #: rhodecode/templates/email_templates/user_registration.mako:25
 #: rhodecode/templates/users/user_profile.html:51
 msgid "Email"
@@ -75,12 +75,12 b' msgstr ""'
 #: rhodecode/templates/admin/integrations/new.html:23
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:51
 #: rhodecode/templates/admin/repos/repo_edit.html:72
-#: rhodecode/templates/base/base.html:84
+#: rhodecode/templates/base/base.html:79
 msgid "Integrations"
 msgstr ""
 
 #: rhodecode/admin/navigation.py:85
-#: rhodecode/templates/admin/settings/settings_system.html:47
+#: rhodecode/templates/admin/settings/settings_system.html:9
 msgid "System Info"
 msgstr ""
 
@@ -92,11 +92,22 b' msgstr ""'
 msgid "Labs"
 msgstr ""
 
+#: rhodecode/admin/views.py:70
+msgid "Apache configuration for Subversion generated."
+msgstr ""
+
+#: rhodecode/admin/views.py:77
+msgid "Failed to generate the Apache configuration for Subversion."
+msgstr ""
+
 #: rhodecode/authentication/schema.py:35
 msgid "Enable or disable this authentication plugin."
 msgstr ""
 
 #: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32
+#: rhodecode/model/permission.py:100 rhodecode/model/permission.py:104
+#: rhodecode/model/permission.py:108 rhodecode/model/permission.py:112
+#: rhodecode/model/permission.py:116 rhodecode/model/permission.py:120
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:197
 #: rhodecode/templates/admin/integrations/list.html:101
 msgid "Enabled"
@@ -237,10 +248,10 b' msgid "Password to connect to LDAP"'
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:101
-#: rhodecode/templates/login.html:50 rhodecode/templates/register.html:48
+#: rhodecode/templates/login.html:49 rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/my_account/my_account.html:30
 #: rhodecode/templates/admin/users/user_add.html:44
-#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:310
 #: rhodecode/templates/debug_style/login.html:45
 msgid "Password"
 msgstr ""
@@ -353,8 +364,8 b' msgstr ""'
 msgid "Rhodecode Token Auth"
 msgstr ""
 
-#: rhodecode/controllers/changelog.py:90 rhodecode/controllers/compare.py:63
-#: rhodecode/controllers/pullrequests.py:280
+#: rhodecode/controllers/changelog.py:90 rhodecode/controllers/compare.py:64
+#: rhodecode/controllers/pullrequests.py:306
 msgid "There are no commits yet"
 msgstr ""
 
@@ -384,45 +395,45 b' msgstr ""'
 msgid "Increase context for all diffs"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:181 rhodecode/controllers/files.py:104
-#: rhodecode/controllers/files.py:125
+#: rhodecode/controllers/changeset.py:190 rhodecode/controllers/files.py:106
+#: rhodecode/controllers/files.py:127
 msgid "No such commit exists for this repository"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:335
-#: rhodecode/controllers/pullrequests.py:750
-#: rhodecode/model/pull_request.py:842
+#: rhodecode/controllers/changeset.py:334
+#: rhodecode/controllers/pullrequests.py:806
+#: rhodecode/model/pull_request.py:997
 #, python-format
 msgid "Status change %(transition_icon)s %(status)s"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:373
+#: rhodecode/controllers/changeset.py:372
 msgid "Changing the status of a commit associated with a closed pull request is not allowed"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:87
+#: rhodecode/controllers/compare.py:88
 msgid "Select commit"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:139
+#: rhodecode/controllers/compare.py:140
 #, python-format
 msgid "Could not find the original repo: %(repo)s"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:147
+#: rhodecode/controllers/compare.py:148
 #, python-format
 msgid "Could not find the other repo: %(repo)s"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:156
+#: rhodecode/controllers/compare.py:157
 msgid "The comparison of two different kinds of remote repos is not available"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:190
+#: rhodecode/controllers/compare.py:191
 msgid "Could not compare repos with different large file settings"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:226
+#: rhodecode/controllers/compare.py:227
 #, python-format
 msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s."
 msgstr ""
@@ -437,114 +448,114 b' msgstr ""'
 msgid "%s %s feed"
 msgstr ""
 
-#: rhodecode/controllers/files.py:96
+#: rhodecode/controllers/files.py:98
 msgid "Click here to add a new file."
 msgstr ""
 
-#: rhodecode/controllers/files.py:101
+#: rhodecode/controllers/files.py:103
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:381 rhodecode/controllers/files.py:434
-#: rhodecode/controllers/files.py:465 rhodecode/controllers/files.py:540
-#: rhodecode/controllers/files.py:585 rhodecode/controllers/files.py:676
+#: rhodecode/controllers/files.py:394 rhodecode/controllers/files.py:447
+#: rhodecode/controllers/files.py:478 rhodecode/controllers/files.py:553
+#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:689
 #, python-format
 msgid "This repository has been locked by %s on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:389 rhodecode/controllers/files.py:442
+#: rhodecode/controllers/files.py:402 rhodecode/controllers/files.py:455
 msgid "You can only delete files with revision being a valid branch "
 msgstr ""
 
-#: rhodecode/controllers/files.py:398 rhodecode/controllers/files.py:451
+#: rhodecode/controllers/files.py:411 rhodecode/controllers/files.py:464
 #, python-format
 msgid "Deleted file %s via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/controllers/files.py:418
+#: rhodecode/controllers/files.py:431
 #, python-format
 msgid "Successfully deleted file %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:421 rhodecode/controllers/files.py:527
-#: rhodecode/controllers/files.py:664
+#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:540
+#: rhodecode/controllers/files.py:677
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/controllers/files.py:473 rhodecode/controllers/files.py:548
+#: rhodecode/controllers/files.py:486 rhodecode/controllers/files.py:561
 msgid "You can only edit files with revision being a valid branch "
 msgstr ""
 
-#: rhodecode/controllers/files.py:485 rhodecode/controllers/files.py:560
+#: rhodecode/controllers/files.py:498 rhodecode/controllers/files.py:573
 #, python-format
 msgid "Edited file %s via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/controllers/files.py:502
+#: rhodecode/controllers/files.py:515
 msgid "No changes"
 msgstr ""
 
-#: rhodecode/controllers/files.py:524 rhodecode/controllers/files.py:653
+#: rhodecode/controllers/files.py:537 rhodecode/controllers/files.py:666
 #, python-format
 msgid "Successfully committed to %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:687
+#: rhodecode/controllers/files.py:611 rhodecode/controllers/files.py:700
 msgid "Added file via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/controllers/files.py:623
+#: rhodecode/controllers/files.py:636
 msgid "No filename"
 msgstr ""
 
-#: rhodecode/controllers/files.py:656
+#: rhodecode/controllers/files.py:669
 msgid "The location specified must be a relative path and must not contain .. in the path"
 msgstr ""
 
-#: rhodecode/controllers/files.py:710
+#: rhodecode/controllers/files.py:723
 msgid "Downloads disabled"
 msgstr ""
 
-#: rhodecode/controllers/files.py:716
+#: rhodecode/controllers/files.py:729
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:718
+#: rhodecode/controllers/files.py:731
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/controllers/files.py:720 rhodecode/controllers/files.py:754
+#: rhodecode/controllers/files.py:733 rhodecode/controllers/files.py:767
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/controllers/files.py:921
+#: rhodecode/controllers/files.py:934
 #, python-format
 msgid "Commit %(commit)s does not exist."
 msgstr ""
 
-#: rhodecode/controllers/files.py:938
+#: rhodecode/controllers/files.py:951
 #, python-format
 msgid "%(file_path)s has not changed between %(commit_1)s and %(commit_2)s."
 msgstr ""
 
-#: rhodecode/controllers/files.py:1005
+#: rhodecode/controllers/files.py:1018
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:1026 rhodecode/controllers/summary.py:259
-#: rhodecode/model/pull_request.py:1059 rhodecode/model/scm.py:780
-#: rhodecode/templates/base/vcs_settings.html:185
+#: rhodecode/controllers/files.py:1039 rhodecode/controllers/summary.py:269
+#: rhodecode/model/pull_request.py:1222 rhodecode/model/scm.py:782
+#: rhodecode/templates/base/vcs_settings.html:193
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:1030 rhodecode/model/scm.py:795
-#: rhodecode/templates/base/vcs_settings.html:210
+#: rhodecode/controllers/files.py:1043 rhodecode/model/scm.py:797
+#: rhodecode/templates/base/vcs_settings.html:218
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:191
+#: rhodecode/controllers/forks.py:190
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
@@ -554,12 +565,12 b' msgid "Groups"'
 msgstr ""
 
 #: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247
-#: rhodecode/controllers/pullrequests.py:383
+#: rhodecode/controllers/pullrequests.py:412
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:128
 #: rhodecode/templates/admin/repos/repo_add.html:15
 #: rhodecode/templates/admin/repos/repo_add.html:19
 #: rhodecode/templates/admin/users/user_edit_advanced.html:11
-#: rhodecode/templates/base/base.html:78 rhodecode/templates/base/base.html:150
+#: rhodecode/templates/base/base.html:73 rhodecode/templates/base/base.html:145
 #: rhodecode/templates/base/base.html:627
 msgid "Repositories"
 msgstr ""
@@ -577,76 +588,68 b' msgstr ""'
 msgid "journal"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:294
+#: rhodecode/controllers/pullrequests.py:320
 msgid "Commit does not exist"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:406
+#: rhodecode/controllers/pullrequests.py:437
 msgid "Pull request requires a title with min. 3 chars"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:408
+#: rhodecode/controllers/pullrequests.py:439
 msgid "Error creating pull request: {}"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:455
+#: rhodecode/controllers/pullrequests.py:487
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:458
+#: rhodecode/controllers/pullrequests.py:490
 msgid "Error occurred during sending pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:498
+#: rhodecode/controllers/pullrequests.py:533
 msgid "Cannot update closed pull requests."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:504
+#: rhodecode/controllers/pullrequests.py:539
 msgid "Pull request title & description updated."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:514
+#: rhodecode/controllers/pullrequests.py:547
 msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:524
-msgid "Nothing changed in pull request."
-msgstr ""
-
-#: rhodecode/controllers/pullrequests.py:527
-msgid "Skipping update of pull request due to reference type: {reference_type}"
-msgstr ""
-
-#: rhodecode/controllers/pullrequests.py:534
-msgid "Update failed due to missing commits."
-msgstr ""
-
-#: rhodecode/controllers/pullrequests.py:580
+#: rhodecode/controllers/pullrequests.py:562
+msgid "Reload page"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:634
 msgid "Pull request reviewer approval is pending."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:594
+#: rhodecode/controllers/pullrequests.py:648
 msgid "Pull request was successfully merged and closed."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:632
+#: rhodecode/controllers/pullrequests.py:685
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:668
+#: rhodecode/controllers/pullrequests.py:725
 msgid "Reviewer approval is pending."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:710
+#: rhodecode/controllers/pullrequests.py:766
 msgid "Close Pull Request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:754
-#: rhodecode/model/pull_request.py:846
+#: rhodecode/controllers/pullrequests.py:810
+#: rhodecode/model/pull_request.py:1001
 msgid "Closing with"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:804
+#: rhodecode/controllers/pullrequests.py:860
 #, python-format
 msgid "Closing pull request on other statuses than rejected or approved is forbidden. Calculated status from all reviewers is currently: %s"
 msgstr ""
@@ -663,7 +666,7 b' msgstr ""'
 msgid "Bookmark"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:260
+#: rhodecode/controllers/summary.py:270
 msgid "Closed branches"
 msgstr ""
 
@@ -675,165 +678,165 b' msgstr ""'
 msgid "Error occurred during update of default values"
 msgstr ""
 
+#: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/my_account.py:378
+#: rhodecode/controllers/admin/users.py:465
+msgid "forever"
+msgstr ""
+
 #: rhodecode/controllers/admin/gists.py:63
-#: rhodecode/controllers/admin/my_account.py:317
-#: rhodecode/controllers/admin/users.py:431
-msgid "forever"
+#: rhodecode/controllers/admin/my_account.py:379
+#: rhodecode/controllers/admin/users.py:466
+msgid "5 minutes"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:64
-#: rhodecode/controllers/admin/my_account.py:318
-#: rhodecode/controllers/admin/users.py:432
-msgid "5 minutes"
+#: rhodecode/controllers/admin/my_account.py:380
+#: rhodecode/controllers/admin/users.py:467
+msgid "1 hour"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:65
-#: rhodecode/controllers/admin/my_account.py:319
-#: rhodecode/controllers/admin/users.py:433
-msgid "1 hour"
+#: rhodecode/controllers/admin/my_account.py:381
+#: rhodecode/controllers/admin/users.py:468
+msgid "1 day"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:66
-#: rhodecode/controllers/admin/my_account.py:320
-#: rhodecode/controllers/admin/users.py:434
-msgid "1 day"
-msgstr ""
-
-#: rhodecode/controllers/admin/gists.py:67
-#: rhodecode/controllers/admin/my_account.py:321
-#: rhodecode/controllers/admin/users.py:435
+#: rhodecode/controllers/admin/my_account.py:382
+#: rhodecode/controllers/admin/users.py:469
 msgid "1 month"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:71
-#: rhodecode/controllers/admin/my_account.py:323
-#: rhodecode/controllers/admin/users.py:437
+#: rhodecode/controllers/admin/gists.py:70
+#: rhodecode/controllers/admin/my_account.py:384
+#: rhodecode/controllers/admin/users.py:471
 msgid "Lifetime"
 msgstr ""
 
+#: rhodecode/controllers/admin/gists.py:72
+msgid "Requires registered account"
+msgstr ""
+
 #: rhodecode/controllers/admin/gists.py:73
-msgid "Requires registered account"
-msgstr ""
-
-#: rhodecode/controllers/admin/gists.py:74
 msgid "Can be accessed by anonymous users"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:200
+#: rhodecode/controllers/admin/gists.py:199
 msgid "Error occurred during gist creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:231
+#: rhodecode/controllers/admin/gists.py:230
 #, python-format
 msgid "Deleted gist %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:308
+#: rhodecode/controllers/admin/gists.py:306
 msgid "Successfully updated gist content"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:313
+#: rhodecode/controllers/admin/gists.py:311
 msgid "Successfully updated gist data"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:316
+#: rhodecode/controllers/admin/gists.py:314
 msgid "Error occurred during update of gist {}: {}"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:320
+#: rhodecode/controllers/admin/gists.py:318
 #, python-format
 msgid "Error occurred during update of gist %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:343
+#: rhodecode/controllers/admin/gists.py:341
 #: rhodecode/templates/admin/gists/show.html:67
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:19
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:42
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:16
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:38
-#: rhodecode/templates/data_table/_dt_elements.html:255
+#: rhodecode/templates/data_table/_dt_elements.html:263
 msgid "never"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:348
+#: rhodecode/controllers/admin/gists.py:346
 #, python-format
 msgid "%(expiry)s - current value"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:74
+#: rhodecode/controllers/admin/my_account.py:75
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:132
+#: rhodecode/controllers/admin/my_account.py:133
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:147
-#: rhodecode/controllers/admin/users.py:218
+#: rhodecode/controllers/admin/my_account.py:148
+#: rhodecode/controllers/admin/users.py:231
 #, python-format
 msgid "Error occurred during update of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:213
-#: rhodecode/controllers/admin/my_account.py:219
+#: rhodecode/controllers/admin/my_account.py:214
+#: rhodecode/controllers/admin/my_account.py:220
 msgid "Error occurred during update of user password"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:226
+#: rhodecode/controllers/admin/my_account.py:227
 msgid "Successfully updated password"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:271
-#: rhodecode/controllers/admin/users.py:611
+#: rhodecode/controllers/admin/my_account.py:272
+#: rhodecode/controllers/admin/users.py:645
 #, python-format
 msgid "Added new email address `%s` for user account"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:278
-#: rhodecode/controllers/admin/users.py:618
+#: rhodecode/controllers/admin/my_account.py:279
+#: rhodecode/controllers/admin/users.py:652
 msgid "An error occurred during email saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:288
-#: rhodecode/controllers/admin/users.py:633
+#: rhodecode/controllers/admin/my_account.py:289
+#: rhodecode/controllers/admin/users.py:667
 msgid "Removed email address from user account"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:326
-#: rhodecode/controllers/admin/users.py:440
+#: rhodecode/controllers/admin/my_account.py:387
+#: rhodecode/controllers/admin/users.py:474
 msgid "Role"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:339
-#: rhodecode/controllers/admin/users.py:464
+#: rhodecode/controllers/admin/my_account.py:400
+#: rhodecode/controllers/admin/users.py:498
 msgid "Auth token successfully created"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:352
-#: rhodecode/controllers/admin/users.py:483
+#: rhodecode/controllers/admin/my_account.py:413
+#: rhodecode/controllers/admin/users.py:517
 msgid "Auth token successfully reset"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:356
-#: rhodecode/controllers/admin/users.py:487
+#: rhodecode/controllers/admin/my_account.py:417
+#: rhodecode/controllers/admin/users.py:521
 msgid "Auth token successfully deleted"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:111
+#: rhodecode/controllers/admin/permissions.py:112
 msgid "Application permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:126
-#: rhodecode/controllers/admin/permissions.py:175
-#: rhodecode/controllers/admin/permissions.py:229
+#: rhodecode/controllers/admin/permissions.py:127
+#: rhodecode/controllers/admin/permissions.py:176
+#: rhodecode/controllers/admin/permissions.py:230
 msgid "Error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:160
+#: rhodecode/controllers/admin/permissions.py:161
 msgid "Object permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:214
+#: rhodecode/controllers/admin/permissions.py:215
 msgid "Global permissions updated successfully"
 msgstr ""
 
@@ -882,7 +885,7 b' msgid "Error occurred during deletion of'
 msgstr ""
 
 #: rhodecode/controllers/admin/repo_groups.py:388
-#: rhodecode/controllers/admin/user_groups.py:325
+#: rhodecode/controllers/admin/user_groups.py:322
 msgid "Cannot change permission for yourself as admin"
 msgstr ""
 
@@ -900,377 +903,510 b' msgstr ""'
 msgid "Error creating repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:265
+#: rhodecode/controllers/admin/repos.py:264
 #, python-format
 msgid "Created repository %s from %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:274
+#: rhodecode/controllers/admin/repos.py:273
 #, python-format
 msgid "Forked repository %s as %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:277
+#: rhodecode/controllers/admin/repos.py:276
 #, python-format
 msgid "Created repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:319
+#: rhodecode/controllers/admin/repos.py:317
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:338
+#: rhodecode/controllers/admin/repos.py:336
 #, python-format
 msgid "Error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:366
+#: rhodecode/controllers/admin/repos.py:364
 #, python-format
 msgid "Detached %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:369
+#: rhodecode/controllers/admin/repos.py:367
 #, python-format
 msgid "Deleted %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:374
+#: rhodecode/controllers/admin/repos.py:372
 #, python-format
 msgid "Deleted repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:377
+#: rhodecode/controllers/admin/repos.py:375
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:382
+#: rhodecode/controllers/admin/repos.py:380
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:436
+#: rhodecode/controllers/admin/repos.py:433
 msgid "Repository permissions updated"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:467
+#: rhodecode/controllers/admin/repos.py:464
 msgid "An error occurred during creation of field"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:482
+#: rhodecode/controllers/admin/repos.py:479
 msgid "An error occurred during removal of field"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:521
+#: rhodecode/controllers/admin/repos.py:518
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:525
+#: rhodecode/controllers/admin/repos.py:522
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:549
+#: rhodecode/controllers/admin/repos.py:546
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:551
+#: rhodecode/controllers/admin/repos.py:548
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:558
+#: rhodecode/controllers/admin/repos.py:555
 msgid "An error occurred during this operation"
 msgstr ""
 
+#: rhodecode/controllers/admin/repos.py:573
+msgid "Locked repository"
+msgstr ""
+
 #: rhodecode/controllers/admin/repos.py:576
-msgid "Locked repository"
+msgid "Unlocked repository"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:579
-msgid "Unlocked repository"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:582
-#: rhodecode/controllers/admin/repos.py:611
+#: rhodecode/controllers/admin/repos.py:608
 msgid "An error occurred during unlocking"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:601
+#: rhodecode/controllers/admin/repos.py:598
 msgid "Unlocked"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:605
+#: rhodecode/controllers/admin/repos.py:602
 msgid "Locked"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:607
+#: rhodecode/controllers/admin/repos.py:604
 #, python-format
 msgid "Repository has been %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:622
+#: rhodecode/controllers/admin/repos.py:619
 msgid "Cache invalidation successful"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:626
+#: rhodecode/controllers/admin/repos.py:623
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
+#: rhodecode/controllers/admin/repos.py:643
+msgid "Pulled from remote location"
+msgstr ""
+
 #: rhodecode/controllers/admin/repos.py:646
-msgid "Pulled from remote location"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:649
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:671
+#: rhodecode/controllers/admin/repos.py:668
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
+#: rhodecode/controllers/admin/repos.py:715
+msgid "Error occurred during deleting issue tracker entry"
+msgstr ""
+
 #: rhodecode/controllers/admin/repos.py:718
-msgid "Error occurred during deleting issue tracker entry"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:721
-#: rhodecode/controllers/admin/settings.py:366
+#: rhodecode/controllers/admin/settings.py:383
 msgid "Removed issue tracker entry"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:751
-#: rhodecode/controllers/admin/settings.py:412
+#: rhodecode/controllers/admin/repos.py:748
+#: rhodecode/controllers/admin/settings.py:430
 msgid "Updated issue tracker entries"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:812
-#: rhodecode/controllers/admin/settings.py:143
-#: rhodecode/controllers/admin/settings.py:722
+#: rhodecode/controllers/admin/repos.py:809
+#: rhodecode/controllers/admin/settings.py:150
+#: rhodecode/controllers/admin/settings.py:768
 msgid "Some form inputs contain invalid data."
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:830
+#: rhodecode/controllers/admin/repos.py:827
 msgid "Error occurred during updating repository VCS settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:834
-#: rhodecode/controllers/admin/settings.py:171
+#: rhodecode/controllers/admin/repos.py:831
+#: rhodecode/controllers/admin/settings.py:178
 msgid "Updated VCS settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:167
-#: rhodecode/controllers/admin/settings.py:270
+#: rhodecode/controllers/admin/settings.py:174
+#: rhodecode/controllers/admin/settings.py:285
 msgid "Error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:214
+#: rhodecode/controllers/admin/settings.py:225
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:266
+#: rhodecode/controllers/admin/settings.py:281
 msgid "Updated application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:330
+#: rhodecode/controllers/admin/settings.py:347
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:333
+#: rhodecode/controllers/admin/settings.py:350
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:425
-msgid "Please enter email address"
-msgstr ""
-
 #: rhodecode/controllers/admin/settings.py:443
+msgid "Please enter email address"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:461
 msgid "Send email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:476
+#: rhodecode/controllers/admin/settings.py:494
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:491
+#: rhodecode/controllers/admin/settings.py:509
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:495
+#: rhodecode/controllers/admin/settings.py:513
 msgid "Error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:543
-#, python-format
-msgid "Critical: your disk space is very low <b>%s%%</b> usedpercent"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:547
-#, python-format
-msgid "Warning: your disk space is running low <b>%s%%</b> usedpercent"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:743
+#: rhodecode/controllers/admin/settings.py:573
+msgid "Update info"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:575
+msgid "Check for updates"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:576
+#, python-format
+msgid "Note: please make sure this server can access `%s` for the update link to work"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:580
+msgid "RhodeCode Version"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:581
+msgid "RhodeCode Server IP"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:582
+msgid "RhodeCode Server ID"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:583
+msgid "RhodeCode Configuration"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:587
+msgid "Database"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:588
+msgid "Database version"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:592
+msgid "Platform"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:593
+msgid "Platform UUID"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:594
+msgid "Python version"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:595
+msgid "Python path"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:599
+msgid "CPU"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:600
+msgid "Load"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:601
+msgid "Memory"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:602
+msgid "Uptime"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:606
+msgid "Storage location"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:607
+msgid "Storage info"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:608
+msgid "Storage inodes"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:610
+msgid "Gist storage location"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:611
+msgid "Gist storage info"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:613
+msgid "Archive cache storage location"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:614
+msgid "Archive cache info"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:616
+msgid "Temp storage location"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:617
+msgid "Temp storage info"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:619
+msgid "Search info"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:620
+msgid "Search location"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:624
+msgid "VCS Backends"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:625
+msgid "VCS Server"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:626
+msgid "GIT"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:627
+msgid "HG"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:628
+msgid "SVN"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:789
 msgid "Error occurred during updating labs settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:748
+#: rhodecode/controllers/admin/settings.py:794
 msgid "Updated Labs settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:168
+#: rhodecode/controllers/admin/user_groups.py:164
 #, python-format
 msgid "Created user group %(user_group_link)s"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:182
+#: rhodecode/controllers/admin/user_groups.py:178
 #, python-format
 msgid "Error occurred during creation of user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:223
+#: rhodecode/controllers/admin/user_groups.py:219
 #, python-format
 msgid "Updated user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:238
+#: rhodecode/controllers/admin/user_groups.py:235
 #, python-format
 msgid "Error occurred during update of user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:260
+#: rhodecode/controllers/admin/user_groups.py:257
 msgid "Successfully deleted user group"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:265
+#: rhodecode/controllers/admin/user_groups.py:262
 msgid "An error occurred during deletion of user group"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:333
+#: rhodecode/controllers/admin/user_groups.py:330
 msgid "Target group cannot be the same"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:339
+#: rhodecode/controllers/admin/user_groups.py:336
 msgid "User Group permissions updated"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:424
+#: rhodecode/controllers/admin/user_groups.py:421
 msgid "User Group global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:440
-#: rhodecode/controllers/admin/users.py:561
+#: rhodecode/controllers/admin/user_groups.py:437
+#: rhodecode/controllers/admin/users.py:595
 msgid "An error occurred during permissions saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:142
+#: rhodecode/controllers/admin/users.py:153
 #, python-format
 msgid "Created user %(user_link)s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:157
+#: rhodecode/controllers/admin/users.py:169
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:201
+#: rhodecode/controllers/admin/users.py:214
 msgid "User updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:252
-#, python-format
-msgid "Detached %s repositories"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:257
-#, python-format
-msgid "Deleted %s repositories"
-msgstr ""
-
 #: rhodecode/controllers/admin/users.py:265
 #, python-format
-msgid "Detached %s repository groups"
+msgid "Detached %s repositories"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:270
 #, python-format
-msgid "Deleted %s repository groups"
+msgid "Deleted %s repositories"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:278
 #, python-format
-msgid "Detached %s user groups"
+msgid "Detached %s repository groups"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:283
 #, python-format
+msgid "Deleted %s repository groups"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:291
+#, python-format
+msgid "Detached %s user groups"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:296
+#, python-format
 msgid "Deleted %s user groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users.py:307
 msgid "Successfully deleted user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:300
+#: rhodecode/controllers/admin/users.py:313
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:319
+#: rhodecode/controllers/admin/users.py:332
 msgid "Force password change disabled for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:321
+#: rhodecode/controllers/admin/users.py:334
 msgid "Force password change enabled for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:325
+#: rhodecode/controllers/admin/users.py:338
 msgid "An error occurred during password reset for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:351
+#: rhodecode/controllers/admin/users.py:371
+#, python-format
+msgid "Linked repository group `%s` as personal"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:377
 #, python-format
 msgid "Created repository group `%s`"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:355
+#: rhodecode/controllers/admin/users.py:381
+#, python-format
+msgid "Repository group `%s` is already taken"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:386
 msgid "An error occurred during repository group creation for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:374
-#: rhodecode/controllers/admin/users.py:395
-#: rhodecode/controllers/admin/users.py:425
-#: rhodecode/controllers/admin/users.py:456
-#: rhodecode/controllers/admin/users.py:473
-#: rhodecode/controllers/admin/users.py:496
-#: rhodecode/controllers/admin/users.py:570
-#: rhodecode/controllers/admin/users.py:583
-#: rhodecode/controllers/admin/users.py:641
+#: rhodecode/controllers/admin/users.py:406
+#: rhodecode/controllers/admin/users.py:427
+#: rhodecode/controllers/admin/users.py:459
+#: rhodecode/controllers/admin/users.py:490
+#: rhodecode/controllers/admin/users.py:507
+#: rhodecode/controllers/admin/users.py:530
+#: rhodecode/controllers/admin/users.py:604
+#: rhodecode/controllers/admin/users.py:617
+#: rhodecode/controllers/admin/users.py:675
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:409
+#: rhodecode/controllers/admin/users.py:443
 msgid "The user participates as reviewer in pull requests and cannot be deleted. You can set the user to \"inactive\" instead of deleting it."
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:545
+#: rhodecode/controllers/admin/users.py:579
 msgid "User global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:673
+#: rhodecode/controllers/admin/users.py:707
 #, python-format
 msgid "An error occurred during ip saving:%s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:688
+#: rhodecode/controllers/admin/users.py:722
 msgid "An error occurred during ip saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:692
+#: rhodecode/controllers/admin/users.py:726
 #, python-format
 msgid "Added ips %s to user whitelist"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:710
+#: rhodecode/controllers/admin/users.py:744
 msgid "Removed ip address from user whitelist"
 msgstr ""
 
@@ -1351,6 +1487,10 b' msgid "user pre create"'
 msgstr ""
 
 #: rhodecode/events/user.py:61
+msgid "user post create"
+msgstr ""
+
+#: rhodecode/events/user.py:74
 msgid "user pre update"
 msgstr ""
 
@@ -1359,7 +1499,7 b' msgstr ""'
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:84
 #: rhodecode/templates/admin/my_account/my_account_emails.html:65
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:104
-#: rhodecode/templates/admin/permissions/permissions_application.html:51
+#: rhodecode/templates/admin/permissions/permissions_application.html:60
 #: rhodecode/templates/admin/permissions/permissions_ips.html:61
 #: rhodecode/templates/admin/permissions/permissions_objects.html:57
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:136
@@ -1367,13 +1507,13 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:66
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:80
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:111
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:159
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:161
 #: rhodecode/templates/admin/repos/repo_edit_vcs.html:46
-#: rhodecode/templates/admin/settings/settings_global.html:110
+#: rhodecode/templates/admin/settings/settings_global.html:140
 #: rhodecode/templates/admin/settings/settings_issuetracker.html:16
 #: rhodecode/templates/admin/settings/settings_labs.html:49
 #: rhodecode/templates/admin/settings/settings_vcs.html:14
-#: rhodecode/templates/admin/settings/settings_visual.html:220
+#: rhodecode/templates/admin/settings/settings_visual.html:222
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:121
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:23
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:81
@@ -1388,7 +1528,6 b' msgstr ""'
 #: rhodecode/templates/admin/integrations/list.html:211
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:56
 #: rhodecode/templates/admin/my_account/my_account_emails.html:32
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:62
 #: rhodecode/templates/admin/permissions/permissions_ips.html:26
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:25
 #: rhodecode/templates/admin/settings/settings_hooks.html:46
@@ -1396,18 +1535,20 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_edit_emails.html:31
 #: rhodecode/templates/admin/users/user_edit_ips.html:34
 #: rhodecode/templates/base/issue_tracker_settings.html:70
-#: rhodecode/templates/base/vcs_settings.html:194
-#: rhodecode/templates/base/vcs_settings.html:219
-#: rhodecode/templates/changeset/changeset_file_comment.html:49
-#: rhodecode/templates/changeset/changeset_file_comment.html:99
-#: rhodecode/templates/data_table/_dt_elements.html:119
-#: rhodecode/templates/data_table/_dt_elements.html:176
-#: rhodecode/templates/data_table/_dt_elements.html:190
-#: rhodecode/templates/data_table/_dt_elements.html:202
+#: rhodecode/templates/base/vcs_settings.html:202
+#: rhodecode/templates/base/vcs_settings.html:227
+#: rhodecode/templates/changeset/changeset_file_comment.html:57
+#: rhodecode/templates/changeset/changeset_file_comment.html:97
+#: rhodecode/templates/data_table/_dt_elements.html:123
+#: rhodecode/templates/data_table/_dt_elements.html:184
+#: rhodecode/templates/data_table/_dt_elements.html:198
+#: rhodecode/templates/data_table/_dt_elements.html:210
 #: rhodecode/templates/debug_style/buttons.html:132
-#: rhodecode/templates/files/files_source.html:34
-#: rhodecode/templates/files/files_source.html:38
-#: rhodecode/templates/files/files_source.html:41
+#: rhodecode/templates/files/files_source.html:35
+#: rhodecode/templates/files/files_source.html:39
+#: rhodecode/templates/files/files_source.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:53
+#: rhodecode/templates/pullrequests/pullrequest_show.html:57
 msgid "Delete"
 msgstr ""
 
@@ -1543,16 +1684,17 b' msgstr ""'
 msgid "This can be setup at the <a href=\"https://my.slack.com/services/new/incoming-webhook/\">slack app manager</a>"
 msgstr ""
 
-#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.html:43
-#: rhodecode/templates/register.html:41
+#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.html:42
+#: rhodecode/templates/register.html:40
 #: rhodecode/templates/admin/admin_log.html:7
 #: rhodecode/templates/admin/my_account/my_account_profile.html:24
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:21
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:66
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:70
 #: rhodecode/templates/admin/users/user_add.html:35
 #: rhodecode/templates/admin/users/user_edit_profile.html:39
-#: rhodecode/templates/admin/users/users.html:88
-#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/admin/users/users.html:90
+#: rhodecode/templates/base/base.html:301
 #: rhodecode/templates/debug_style/login.html:36
 #: rhodecode/templates/email_templates/user_registration.mako:23
 #: rhodecode/templates/users/user_profile.html:27
@@ -1587,27 +1729,27 b' msgstr ""'
 msgid "Send events such as repo pushes and pull requests to your slack channel."
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:40
+#: rhodecode/integrations/types/webhook.py:152
 msgid "Webhook URL"
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:41
-msgid "URL of the webhook to receive POST event."
-msgstr ""
-
-#: rhodecode/integrations/types/webhook.py:51
+#: rhodecode/integrations/types/webhook.py:154
+msgid "URL of the webhook to receive POST event. Following variables are allowed to be used: {vars}. Some of the variables would trigger multiple calls, like ${{branch}} or ${{commit_id}}. Webhook will be called as many times as unique objects in data in such cases."
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:168
 msgid "Secret Token"
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:52
+#: rhodecode/integrations/types/webhook.py:169
 msgid "String used to validate received payloads."
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:65
+#: rhodecode/integrations/types/webhook.py:180
 msgid "Webhook"
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:66
+#: rhodecode/integrations/types/webhook.py:181
 msgid "Post json events to a webhook endpoint"
 msgstr ""
 
@@ -1734,25 +1876,25 b' msgstr ""'
 msgid "Commit not found"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1185
+#: rhodecode/lib/auth.py:1188
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1259
+#: rhodecode/lib/auth.py:1262
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1307
+#: rhodecode/lib/auth.py:1310
 #, python-format
 msgid "Action not supported for %s."
 msgstr ""
 
-#: rhodecode/lib/auth.py:1344
+#: rhodecode/lib/auth.py:1347
 msgid "You need to be signed in to view this page"
 msgstr ""
 
-#: rhodecode/lib/base.py:550
+#: rhodecode/lib/base.py:564
 #, python-format
 msgid "The repository at %(repo_name)s cannot be located."
 msgstr ""
@@ -1773,40 +1915,40 b' msgstr ""'
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:643
+#: rhodecode/lib/diffs.py:918
 msgid "Click to select line"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1489
+#: rhodecode/lib/helpers.py:1515
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1493
+#: rhodecode/lib/helpers.py:1519
 msgid "No Files"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1566
+#: rhodecode/lib/helpers.py:1592
 msgid "new file"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1569
+#: rhodecode/lib/helpers.py:1595
 msgid "mod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1572
+#: rhodecode/lib/helpers.py:1598
 msgid "del"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1575
+#: rhodecode/lib/helpers.py:1601
 msgid "rename"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1580
+#: rhodecode/lib/helpers.py:1606
 msgid "chmod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1827
+#: rhodecode/lib/helpers.py:1853
 msgid ""
 "Example filter terms:\n"
 "     repository:vcs\n"
@@ -1825,7 +1967,7 b' msgid ""'
 "     \"username:test AND repository:test*\"\n"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1847
+#: rhodecode/lib/helpers.py:1873
 #, 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 ""
@@ -1907,8 +2049,10 b' msgstr ""'
 msgid "in %s and %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:514 rhodecode/public/js/scripts.js:25035
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
+#: rhodecode/lib/utils2.py:514
+#: rhodecode/public/js/rhodecode-components.js:33194
+#: rhodecode/public/js/scripts.js:25042
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174
 msgid "just now"
 msgstr ""
@@ -1938,7 +2082,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 rhodecode/model/db.py:2287
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 rhodecode/model/db.py:2292
 msgid "Repository no access"
 msgstr ""
 
@@ -1967,7 +2113,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 rhodecode/model/db.py:2288
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 rhodecode/model/db.py:2293
 msgid "Repository read access"
 msgstr ""
 
@@ -1996,7 +2144,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 rhodecode/model/db.py:2289
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 rhodecode/model/db.py:2294
 msgid "Repository write access"
 msgstr ""
 
@@ -2025,7 +2175,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 rhodecode/model/db.py:2290
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 rhodecode/model/db.py:2295
 msgid "Repository admin access"
 msgstr ""
 
@@ -2094,7 +2246,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 rhodecode/model/db.py:2308
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 rhodecode/model/db.py:2313
 msgid "Repository creation disabled"
 msgstr ""
 
@@ -2123,7 +2277,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2307
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 rhodecode/model/db.py:2309
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 rhodecode/model/db.py:2314
 msgid "Repository creation enabled"
 msgstr ""
 
@@ -2152,7 +2308,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2311
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 rhodecode/model/db.py:2313
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 rhodecode/model/db.py:2318
 msgid "Repository forking disabled"
 msgstr ""
 
@@ -2181,7 +2339,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 rhodecode/model/db.py:2314
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 rhodecode/model/db.py:2319
 msgid "Repository forking enabled"
 msgstr ""
 
@@ -2231,7 +2391,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2946
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 rhodecode/model/db.py:2948
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 rhodecode/model/db.py:2962
 msgid "Not Reviewed"
 msgstr ""
 
@@ -2260,7 +2422,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2947
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 rhodecode/model/db.py:2949
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 rhodecode/model/db.py:2963
 msgid "Approved"
 msgstr ""
 
@@ -2289,7 +2453,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2948
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 rhodecode/model/db.py:2950
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 rhodecode/model/db.py:2964
 msgid "Rejected"
 msgstr ""
 
@@ -2318,7 +2484,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2949
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 rhodecode/model/db.py:2951
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 rhodecode/model/db.py:2965
 msgid "Under Review"
 msgstr ""
 
@@ -2344,7 +2512,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 rhodecode/model/db.py:2292
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 rhodecode/model/db.py:2297
 msgid "Repository group no access"
 msgstr ""
 
@@ -2370,7 +2540,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 rhodecode/model/db.py:2293
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 rhodecode/model/db.py:2298
 msgid "Repository group read access"
 msgstr ""
 
@@ -2396,7 +2568,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 rhodecode/model/db.py:2294
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 rhodecode/model/db.py:2299
 msgid "Repository group write access"
 msgstr ""
 
@@ -2422,7 +2596,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 rhodecode/model/db.py:2295
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 rhodecode/model/db.py:2300
 msgid "Repository group admin access"
 msgstr ""
 
@@ -2447,7 +2623,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 rhodecode/model/db.py:2297
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 rhodecode/model/db.py:2302
 msgid "User group no access"
 msgstr ""
 
@@ -2472,7 +2650,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 rhodecode/model/db.py:2298
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 rhodecode/model/db.py:2303
 msgid "User group read access"
 msgstr ""
 
@@ -2497,7 +2677,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 rhodecode/model/db.py:2299
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 rhodecode/model/db.py:2304
 msgid "User group write access"
 msgstr ""
 
@@ -2522,7 +2704,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 rhodecode/model/db.py:2300
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 rhodecode/model/db.py:2305
 msgid "User group admin access"
 msgstr ""
 
@@ -2547,7 +2731,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 rhodecode/model/db.py:2302
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 rhodecode/model/db.py:2307
 msgid "Repository Group creation disabled"
 msgstr ""
 
@@ -2572,7 +2758,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 rhodecode/model/db.py:2303
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 rhodecode/model/db.py:2308
 msgid "Repository Group creation enabled"
 msgstr ""
 
@@ -2597,7 +2785,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 rhodecode/model/db.py:2305
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 rhodecode/model/db.py:2310
 msgid "User Group creation disabled"
 msgstr ""
 
@@ -2622,7 +2812,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 rhodecode/model/db.py:2306
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 rhodecode/model/db.py:2311
 msgid "User Group creation enabled"
 msgstr ""
 
@@ -2647,7 +2839,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2314
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 rhodecode/model/db.py:2316
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 rhodecode/model/db.py:2321
 msgid "Registration disabled"
 msgstr ""
 
@@ -2672,7 +2866,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 rhodecode/model/db.py:2317
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 rhodecode/model/db.py:2322
 msgid "User Registration with manual account activation"
 msgstr ""
 
@@ -2697,7 +2893,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 rhodecode/model/db.py:2318
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 rhodecode/model/db.py:2323
 msgid "User Registration with automatic account activation"
 msgstr ""
 
@@ -2722,7 +2920,10 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2318
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 rhodecode/model/db.py:2320
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 rhodecode/model/db.py:2329
+#: rhodecode/model/permission.py:95
 msgid "Manual activation of external account"
 msgstr ""
 
@@ -2747,7 +2948,10 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2319
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 rhodecode/model/db.py:2321
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 rhodecode/model/db.py:2330
+#: rhodecode/model/permission.py:96
 msgid "Automatic activation of external account"
 msgstr ""
 
@@ -2766,7 +2970,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 rhodecode/model/db.py:2310
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 rhodecode/model/db.py:2315
 msgid "Repository creation enabled with write permission to a repository group"
 msgstr ""
 
@@ -2785,7 +2991,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 rhodecode/model/db.py:2311
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 rhodecode/model/db.py:2316
 msgid "Repository creation disabled with write permission to a repository group"
 msgstr ""
 
@@ -2801,7 +3009,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 rhodecode/model/db.py:2285
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 rhodecode/model/db.py:2290
 msgid "RhodeCode Super Administrator"
 msgstr ""
 
@@ -2815,7 +3025,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2321
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 rhodecode/model/db.py:2323
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 rhodecode/model/db.py:2332
 msgid "Inherit object permissions from default user disabled"
 msgstr ""
 
@@ -2829,43 +3041,57 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2322
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 rhodecode/model/db.py:2324
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 rhodecode/model/db.py:2333
 msgid "Inherit object permissions from default user enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 rhodecode/model/db.py:910
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 rhodecode/model/db.py:907
 msgid "all"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 rhodecode/model/db.py:911
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 rhodecode/model/db.py:908
 msgid "http/web interface"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 rhodecode/model/db.py:912
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 rhodecode/model/db.py:909
 msgid "vcs (git/hg/svn protocol)"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 rhodecode/model/db.py:913
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 rhodecode/model/db.py:910
 msgid "api calls"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 rhodecode/model/db.py:914
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 rhodecode/model/db.py:911
 msgid "feed access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2061
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 rhodecode/model/db.py:2063
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 rhodecode/model/db.py:2061
 msgid "No parent"
 msgstr ""
 
@@ -2901,19 +3127,23 b' msgstr ""'
 msgid "Commit index"
 msgstr ""
 
-#: rhodecode/login/views.py:237 rhodecode/login/views.py:296
-msgid "bad captcha"
-msgstr ""
-
-#: rhodecode/login/views.py:246
+#: rhodecode/login/views.py:246 rhodecode/login/views.py:308
+msgid "Bad captcha"
+msgstr ""
+
+#: rhodecode/login/views.py:255
 msgid "You have successfully registered with RhodeCode"
 msgstr ""
 
-#: rhodecode/login/views.py:312
+#: rhodecode/login/views.py:297
+msgid "Password reset has been disabled."
+msgstr ""
+
+#: rhodecode/login/views.py:324
 msgid "Your password reset link was sent"
 msgstr ""
 
-#: rhodecode/login/views.py:336
+#: rhodecode/login/views.py:348
 msgid "Your password reset was successful, a new password has been sent to your email"
 msgstr ""
 
@@ -2925,6 +3155,18 b' msgstr ""'
 msgid "Show it now"
 msgstr ""
 
+#: rhodecode/model/db.py:2325
+msgid "Password reset enabled"
+msgstr ""
+
+#: rhodecode/model/db.py:2326
+msgid "Password reset hidden"
+msgstr ""
+
+#: rhodecode/model/db.py:2327
+msgid "Password reset disabled"
+msgstr ""
+
 #: rhodecode/model/forms.py:85
 msgid "Please enter a login"
 msgstr ""
@@ -3003,43 +3245,166 b' msgstr ""'
 msgid "%(user)s commented on pull request at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:69
+#: rhodecode/model/permission.py:67 rhodecode/model/permission.py:73
+#: rhodecode/model/permission.py:79
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:11
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:126
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:12
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:11
+msgid "None"
+msgstr ""
+
+#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74
+#: rhodecode/model/permission.py:80
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:12
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:13
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:12
+msgid "Read"
+msgstr ""
+
+#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75
+#: rhodecode/model/permission.py:81
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:13
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:14
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:13
+msgid "Write"
+msgstr ""
+
+#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76
+#: rhodecode/model/permission.py:82
+#: rhodecode/templates/admin/auth/auth_settings.html:12
+#: rhodecode/templates/admin/auth/plugin_settings.html:12
+#: rhodecode/templates/admin/defaults/defaults.html:12
+#: rhodecode/templates/admin/integrations/base.html:21
+#: rhodecode/templates/admin/integrations/form.html:15
+#: rhodecode/templates/admin/integrations/form.html:28
+#: rhodecode/templates/admin/integrations/list.html:8
+#: rhodecode/templates/admin/integrations/list.html:14
+#: rhodecode/templates/admin/integrations/new.html:11
+#: rhodecode/templates/admin/integrations/new.html:19
+#: rhodecode/templates/admin/permissions/permissions.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:14
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:17
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:15
+#: rhodecode/templates/admin/repos/repos.html:13
+#: rhodecode/templates/admin/settings/settings.html:12
+#: rhodecode/templates/admin/user_groups/user_group_add.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:12
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:14
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+#: rhodecode/templates/admin/users/user_add.html:11
+#: rhodecode/templates/admin/users/user_edit.html:12
+#: rhodecode/templates/admin/users/users.html:13
+#: rhodecode/templates/admin/users/users.html:103
+#: rhodecode/templates/base/base.html:406
+#: rhodecode/templates/base/base.html:413
+msgid "Admin"
+msgstr ""
+
+#: rhodecode/model/permission.py:85 rhodecode/model/permission.py:99
+#: rhodecode/model/permission.py:103 rhodecode/model/permission.py:107
+#: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115
+#: rhodecode/model/permission.py:119
+msgid "Disabled"
+msgstr ""
+
+#: rhodecode/model/permission.py:86
+msgid "Allowed with manual account activation"
+msgstr ""
+
+#: rhodecode/model/permission.py:87
+msgid "Allowed with automatic account activation"
+msgstr ""
+
+#: rhodecode/model/permission.py:90
+msgid "Allow password recovery"
+msgstr ""
+
+#: rhodecode/model/permission.py:91
+msgid "Hide password recovery link"
+msgstr ""
+
+#: rhodecode/model/permission.py:92
+msgid "Disable password recovery"
+msgstr ""
+
+#: rhodecode/model/pull_request.py:77
 msgid "This pull request can be automatically merged."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:71
-msgid "This pull request cannot be merged because of an unhandled exception."
-msgstr ""
-
-#: rhodecode/model/pull_request.py:74
-msgid "This pull request cannot be merged because of conflicts."
-msgstr ""
-
-#: rhodecode/model/pull_request.py:76
-msgid "This pull request could not be merged because push to target failed."
-msgstr ""
-
 #: rhodecode/model/pull_request.py:79
-msgid "This pull request cannot be merged because the target is not a head."
+msgid "This pull request cannot be merged because of an unhandled exception."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:82
+msgid "This pull request cannot be merged because of conflicts."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:84
+msgid "This pull request could not be merged because push to target failed."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:87
+msgid "This pull request cannot be merged because the target is not a head."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:90
 msgid "This pull request cannot be merged because the source contains more branches than the target."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:85
+#: rhodecode/model/pull_request.py:93
 msgid "This pull request cannot be merged because the target has multiple heads."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:88
+#: rhodecode/model/pull_request.py:96
 msgid "This pull request cannot be merged because the target repository is locked."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:91
+#: rhodecode/model/pull_request.py:99
 msgid "This pull request cannot be merged because the target or the source reference is missing."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:416
+#: rhodecode/model/pull_request.py:102
+msgid "This pull request cannot be merged because the target reference is missing."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:105
+msgid "This pull request cannot be merged because the source reference is missing."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:108
+msgid "This pull request cannot be merged because of conflicts related to sub repositories."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:114
+msgid "Pull request update successful."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:116
+msgid "Pull request update failed because of an unknown error."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:118
+msgid "No update needed because the source reference is already up to date."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:121
+msgid "Pull request cannot be updated because the reference type is not supported for an update."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:124
+msgid "This pull request cannot be updated because the target reference is missing."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:127
+msgid "This pull request cannot be updated because the source reference is missing."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:523
 #, python-format
 msgid ""
 "Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n"
@@ -3047,70 +3412,70 b' msgid ""'
 " %(pr_title)s"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:448
+#: rhodecode/model/pull_request.py:555
 msgid "Pull request merged and closed"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:874
+#: rhodecode/model/pull_request.py:1029
 msgid "Server-side pull request merging is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:876
+#: rhodecode/model/pull_request.py:1031
 msgid "This pull request is closed."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:887
+#: rhodecode/model/pull_request.py:1043
 msgid "Pull request merging is not supported."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:905
+#: rhodecode/model/pull_request.py:1061
 msgid "Target repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:908
+#: rhodecode/model/pull_request.py:1064
 msgid "Source repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1058 rhodecode/model/scm.py:788
+#: rhodecode/model/pull_request.py:1221 rhodecode/model/scm.py:790
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1063
+#: rhodecode/model/pull_request.py:1226
 msgid "Commit IDs"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1066
+#: rhodecode/model/pull_request.py:1229
 msgid "Closed Branches"
 msgstr ""
 
-#: rhodecode/model/scm.py:770
+#: rhodecode/model/scm.py:768
 msgid "latest tip"
 msgstr ""
 
-#: rhodecode/model/user.py:124
+#: rhodecode/model/user.py:125
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:284
+#: rhodecode/model/user.py:291
 #, python-format
 msgid "You can't edit this user (`%(username)s`) since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:458
+#: rhodecode/model/user.py:464
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:466
+#: rhodecode/model/user.py:472
 #, python-format
 msgid "user \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories:%s"
 msgstr ""
 
-#: rhodecode/model/user.py:475
+#: rhodecode/model/user.py:481
 #, python-format
 msgid "user \"%s\" still owns %s repository groups and cannot be removed. Switch owners or remove those repository groups:%s"
 msgstr ""
 
-#: rhodecode/model/user.py:484
+#: rhodecode/model/user.py:490
 #, python-format
 msgid "user \"%s\" still owns %s user groups and cannot be removed. Switch owners or remove those user groups:%s"
 msgstr ""
@@ -3258,6 +3623,7 b' msgid "You do not have the permission to'
 msgstr ""
 
 #: rhodecode/model/validators.py:668
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:102
 msgid "You do not have the permission to store repositories in the root location."
 msgstr ""
 
@@ -3284,7 +3650,8 b' msgid "Revisions %(revs)s are already pa'
 msgstr ""
 
 #: rhodecode/model/validators.py:933
-#: rhodecode/model/validation_schema/validators.py:14
+#: rhodecode/model/validation_schema/validators.py:16
+#: rhodecode/model/validation_schema/validators.py:29
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
@@ -3317,6 +3684,14 b' msgstr ""'
 msgid "No plugin available with ID \"%(plugin_id)s\""
 msgstr ""
 
+#: rhodecode/model/validation_schema/validators.py:37
+msgid "Invalid glob pattern"
+msgstr ""
+
+#: rhodecode/model/validation_schema/validators.py:46
+msgid "Name must start with a letter or number. Got `{}`"
+msgstr ""
+
 #: rhodecode/model/validation_schema/schemas/gist_schema.py:89
 msgid "Gist with name {} already exists"
 msgstr ""
@@ -3369,6 +3744,46 b' msgstr ""'
 msgid "{integration_type} settings"
 msgstr ""
 
+#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:46
+#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:50
+msgid "Parent repository group `{}` does not exist"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52
+msgid "You do not have the permission to store repository groups in the root location."
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:112
+msgid "Repo group owner with id `{}` does not exists"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:130
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:181
+msgid "Repository with name `{}` already exists"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:135
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:186
+msgid "Repository group with name `{}` already exists"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:48
+msgid "Repo owner with id `{}` does not exists"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:68
+msgid "Fork with id `{}` does not exists"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:71
+msgid "Cannot set fork of parameter of this repository to itself"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:96
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:100
+msgid "Repository group `{}` does not exist"
+msgstr ""
+
 #: rhodecode/model/validation_schema/schemas/user_schema.py:36
 msgid "Password is incorrect"
 msgstr ""
@@ -3377,357 +3792,450 b' msgstr ""'
 msgid "New password must be different to old password"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:23039
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
+#: rhodecode/public/js/rhodecode-components.js:31198
+#: rhodecode/public/js/scripts.js:23046
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20
 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87
 msgid "No results"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:24970
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
+#: rhodecode/public/js/rhodecode-components.js:33129
+#: rhodecode/public/js/scripts.js:24977
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109
 msgid "{0} year"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:24971
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62
+#: rhodecode/public/js/rhodecode-components.js:33130
+#: rhodecode/public/js/scripts.js:24978
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110
 msgid "{0} month"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:24972
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57
+#: rhodecode/public/js/rhodecode-components.js:33131
+#: rhodecode/public/js/scripts.js:24979
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111
 msgid "{0} day"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:24973
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
+#: rhodecode/public/js/rhodecode-components.js:33132
+#: rhodecode/public/js/scripts.js:24980
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112
 msgid "{0} hour"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:24974
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61
+#: rhodecode/public/js/rhodecode-components.js:33133
+#: rhodecode/public/js/scripts.js:24981
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113
 msgid "{0} min"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:24975
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
+#: rhodecode/public/js/rhodecode-components.js:33134
+#: rhodecode/public/js/scripts.js:24982
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114
 msgid "{0} sec"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:24995
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
+#: rhodecode/public/js/rhodecode-components.js:33154
+#: rhodecode/public/js/scripts.js:25002
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134
 msgid "in {0}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25003
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
+#: rhodecode/public/js/rhodecode-components.js:33162
+#: rhodecode/public/js/scripts.js:25010
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142
 msgid "{0} ago"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25015
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68
+#: rhodecode/public/js/rhodecode-components.js:33174
+#: rhodecode/public/js/scripts.js:25022
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154
 msgid "{0}, {1} ago"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25017
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
+#: rhodecode/public/js/rhodecode-components.js:33176
+#: rhodecode/public/js/scripts.js:25024
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156
 msgid "in {0}, {1}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25021
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55
+#: rhodecode/public/js/rhodecode-components.js:33180
+#: rhodecode/public/js/scripts.js:25028
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160
 msgid "{0} and {1}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25023
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56
+#: rhodecode/public/js/rhodecode-components.js:33182
+#: rhodecode/public/js/scripts.js:25030
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162
 msgid "{0} and {1} ago"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:25025
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47
+#: rhodecode/public/js/rhodecode-components.js:33184
+#: rhodecode/public/js/scripts.js:25032
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164
 msgid "in {0} and {1}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39304
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7
+#: rhodecode/public/js/rhodecode-components.js:47027
+#: rhodecode/public/js/scripts.js:38875
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4
 msgid "Loading more results..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39307
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27
+#: rhodecode/public/js/rhodecode-components.js:47030
+#: rhodecode/public/js/scripts.js:38878
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7
 msgid "Searching..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39310
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
+#: rhodecode/public/js/rhodecode-components.js:47033
+#: rhodecode/public/js/scripts.js:38881
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10
 msgid "No matches found"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39313
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
+#: rhodecode/public/js/rhodecode-components.js:47036
+#: rhodecode/public/js/scripts.js:38884
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13
 msgid "Loading failed"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39317
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20
+#: rhodecode/public/js/rhodecode-components.js:47040
+#: rhodecode/public/js/scripts.js:38888
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17
 msgid "One result is available, press enter to select it."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39319
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64
+#: rhodecode/public/js/rhodecode-components.js:47042
+#: rhodecode/public/js/scripts.js:38890
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19
 msgid "{0} results are available, use up and down arrow keys to navigate."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39324
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
+#: rhodecode/public/js/rhodecode-components.js:47047
+#: rhodecode/public/js/scripts.js:38895
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24
 msgid "Please enter {0} or more character"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39326
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26
+#: rhodecode/public/js/rhodecode-components.js:47049
+#: rhodecode/public/js/scripts.js:38897
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26
 msgid "Please enter {0} or more characters"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39331
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23
+#: rhodecode/public/js/rhodecode-components.js:47054
+#: rhodecode/public/js/scripts.js:38902
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31
 msgid "Please delete {0} character"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39333
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
+#: rhodecode/public/js/rhodecode-components.js:47056
+#: rhodecode/public/js/scripts.js:38904
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33
 msgid "Please delete {0} characters"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39337
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40
+#: rhodecode/public/js/rhodecode-components.js:47060
+#: rhodecode/public/js/scripts.js:38908
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37
 msgid "You can only select {0} item"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39339
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41
+#: rhodecode/public/js/rhodecode-components.js:47062
+#: rhodecode/public/js/scripts.js:38910
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39
 msgid "You can only select {0} items"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40911
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29
+#: rhodecode/public/js/rhodecode-components.js:48315
+#: rhodecode/public/js/scripts.js:40163
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
 #: rhodecode/public/js/src/rhodecode/codemirror.js:369
 msgid "Set status to Approved"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40929
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30
+#: rhodecode/public/js/rhodecode-components.js:48333
+#: rhodecode/public/js/scripts.js:40181
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
 #: rhodecode/public/js/src/rhodecode/codemirror.js:387
 msgid "Set status to Rejected"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41308
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:2
+#: rhodecode/public/js/rhodecode-components.js:48713
+#: rhodecode/public/js/scripts.js:40561
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:3
 #: rhodecode/public/js/src/rhodecode/comments.js:236
+#: rhodecode/templates/codeblocks/diffs.html:399
 msgid "Add another comment"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41526
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
+#: rhodecode/public/js/rhodecode-components.js:48947
+#: rhodecode/public/js/scripts.js:40795
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40
 #: rhodecode/public/js/src/rhodecode/comments.js:470
 msgid "Status Review"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41540
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:3
+#: rhodecode/public/js/rhodecode-components.js:48961
+#: rhodecode/public/js/scripts.js:40809
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
 #: rhodecode/public/js/src/rhodecode/comments.js:484
 msgid "Comment text will be set automatically based on currently selected status ({0}) ..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41653
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37
+#: rhodecode/public/js/rhodecode-components.js:49074
+#: rhodecode/public/js/scripts.js:40922
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42
 #: rhodecode/public/js/src/rhodecode/comments.js:597
 msgid "Submitting..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41703
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
+#: rhodecode/public/js/rhodecode-components.js:49124
+#: rhodecode/public/js/scripts.js:40972
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9
 #: rhodecode/public/js/src/rhodecode/comments.js:647
-#: rhodecode/templates/files/files_browser_tree.html:47
+#: rhodecode/templates/files/files_browser_tree.html:51
 msgid "Loading ..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41903
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
+#: rhodecode/public/js/rhodecode-components.js:49197
+#: rhodecode/public/js/scripts.js:41045
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
+#: rhodecode/public/js/src/rhodecode/comments.js:720
+msgid "Delete this comment?"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode-components.js:49546
+#: rhodecode/public/js/scripts.js:41394
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60
 #: rhodecode/public/js/src/rhodecode/files.js:150
 msgid "truncated result"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41905
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
+#: rhodecode/public/js/rhodecode-components.js:49548
+#: rhodecode/public/js/scripts.js:41396
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61
 #: rhodecode/public/js/src/rhodecode/files.js:152
 msgid "truncated results"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41914
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
+#: rhodecode/public/js/rhodecode-components.js:49557
+#: rhodecode/public/js/scripts.js:41405
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
 #: rhodecode/public/js/src/rhodecode/files.js:161
 msgid "No matching files"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42049
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28
+#: rhodecode/public/js/rhodecode-components.js:49692
+#: rhodecode/public/js/scripts.js:41540
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32
 #: rhodecode/public/js/src/rhodecode/files.js:296
 msgid "Selection link"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42089
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36
+#: rhodecode/public/js/rhodecode-components.js:49732
+#: rhodecode/public/js/scripts.js:41580
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41
 #: rhodecode/public/js/src/rhodecode/followers.js:26
 msgid "Stop following this repository"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42090
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38
+#: rhodecode/public/js/rhodecode-components.js:49733
+#: rhodecode/public/js/scripts.js:41581
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
 #: rhodecode/public/js/src/rhodecode/followers.js:27
 msgid "Unfollow"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42099
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
+#: rhodecode/public/js/rhodecode-components.js:49742
+#: rhodecode/public/js/scripts.js:41590
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39
 #: rhodecode/public/js/src/rhodecode/followers.js:36
 msgid "Start following this repository"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42100
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:4
+#: rhodecode/public/js/rhodecode-components.js:49743
+#: rhodecode/public/js/scripts.js:41591
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7
 #: rhodecode/public/js/src/rhodecode/followers.js:37
 msgid "Follow"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43049
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
+#: rhodecode/public/js/rhodecode-components.js:50199
+#: rhodecode/public/js/scripts.js:42047
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:212
+msgid "added manually by \"{0}\""
+msgstr ""
+
+#: rhodecode/public/js/rhodecode-components.js:50648
+#: rhodecode/public/js/scripts.js:42496
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
 #: rhodecode/public/js/src/rhodecode.js:142
 msgid "file"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:43069
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31
+#: rhodecode/public/js/rhodecode-components.js:50668
+#: rhodecode/public/js/scripts.js:42516
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36
 #: rhodecode/public/js/src/rhodecode.js:162
 msgid "Show more"
 msgstr ""
 
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:2
+msgid "(from usergroup {0})"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:4
+#: rhodecode/public/js/src/i18n_messages.js:5
+#: rhodecode/templates/pullrequests/pullrequest_show.html:214
+msgid "Close"
+msgstr ""
+
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
+#: rhodecode/public/js/src/i18n_messages.js:4
+msgid "Invite reviewers to this discussion"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
 msgid "No bookmarks available yet."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9
-msgid "No branches available yet."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10
-msgid "No gists available yet."
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
-msgid "No pull requests available yet."
+msgid "No branches available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:14
-msgid "No repositories available yet."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15
-msgid "No repository groups available yet."
+msgid "No gists available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
-msgid "No tags available yet."
+msgid "No pull requests available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:18
-msgid "No user groups available yet."
+msgid "No repositories available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:19
-msgid "No users available yet."
+msgid "No repository groups available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
-#: rhodecode/templates/changelog/changelog.html:62
-msgid "Open new pull request"
+msgid "No tags available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:22
+msgid "No user groups available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23
+msgid "No users available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
+#: rhodecode/templates/changelog/changelog.html:62
+msgid "Open new pull request"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26
 msgid "Open new pull request for selected commit"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32
-msgid "Show selected commit __S"
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:33
+#: rhodecode/public/js/src/i18n_messages.js:6
+#: rhodecode/templates/admin/settings/settings_email.html:48
+msgid "Send"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37
+msgid "Show selected commit __S"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38
 msgid "Show selected commits __S ... __E"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39
-msgid "Updating..."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42
-#: rhodecode/templates/admin/auth/auth_settings.html:71
-msgid "disabled"
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:43
-#: rhodecode/templates/admin/auth/auth_settings.html:71
-msgid "enabled"
+#: rhodecode/public/js/src/i18n_messages.js:7
+msgid "Switch to chat"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
+#: rhodecode/public/js/src/i18n_messages.js:8
+msgid "Switch to comment"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
+msgid "There are currently no open pull requests requiring your participation."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47
+msgid "Updating..."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
+#: rhodecode/templates/admin/auth/auth_settings.html:71
+msgid "disabled"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
+#: rhodecode/templates/admin/auth/auth_settings.html:71
+msgid "enabled"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
 msgid "files"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
 msgid "specify commit"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62
 msgid "{0} active out of {1} users"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58
-msgid "{0} days"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60
-msgid "{0} hours"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
-msgid "{0} months"
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67
+msgid "{0} days"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69
+msgid "{0} hours"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72
+msgid "{0} months"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
 msgid "{0} years"
 msgstr ""
 
@@ -3747,6 +4255,10 b' msgstr ""'
 msgid "FocusEvent"
 msgstr ""
 
+#: rhodecode/svn_support/events.py:30
+msgid "Configuration for Apaache mad_dav_svn changed."
+msgstr ""
+
 #: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr ""
@@ -3796,6 +4308,7 b' msgstr ""'
 #: rhodecode/templates/index_base.html:122
 #: rhodecode/templates/admin/gists/index.html:112
 #: rhodecode/templates/admin/integrations/list.html:102
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:39
 #: rhodecode/templates/admin/my_account/my_account_repos.html:31
 #: rhodecode/templates/admin/my_account/my_account_watched.html:31
 #: rhodecode/templates/admin/repo_groups/repo_groups.html:53
@@ -3821,7 +4334,7 b' msgstr ""'
 #: rhodecode/templates/admin/repo_groups/repo_groups.html:56
 #: rhodecode/templates/admin/repos/repo_add_base.html:32
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:29
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:96
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:98
 #: rhodecode/templates/admin/repos/repos.html:57
 #: rhodecode/templates/admin/user_groups/user_group_add.html:43
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:42
@@ -3829,7 +4342,7 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:74
 #: rhodecode/templates/base/issue_tracker_settings.html:10
 #: rhodecode/templates/changeset/changeset.html:53
-#: rhodecode/templates/compare/compare_commits.html:24
+#: rhodecode/templates/compare/compare_commits.html:25
 #: rhodecode/templates/email_templates/commit_comment.mako:82
 #: rhodecode/templates/email_templates/pull_request_review.mako:41
 #: rhodecode/templates/email_templates/pull_request_review.mako:75
@@ -3838,7 +4351,7 b' msgstr ""'
 #: rhodecode/templates/forks/fork.html:48
 #: rhodecode/templates/forks/forks_data.html:9
 #: rhodecode/templates/pullrequests/pullrequest.html:47
-#: rhodecode/templates/pullrequests/pullrequest_show.html:122
+#: rhodecode/templates/pullrequests/pullrequest_show.html:151
 #: rhodecode/templates/summary/components.html:73
 msgid "Description"
 msgstr ""
@@ -3849,7 +4362,7 b' msgstr ""'
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:24
 #: rhodecode/templates/admin/repo_groups/repo_groups.html:60
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:5
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:78
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:80
 #: rhodecode/templates/admin/repos/repos.html:65
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:5
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:24
@@ -3873,7 +4386,7 b' msgstr ""'
 #: rhodecode/templates/changelog/changelog.html:104
 #: rhodecode/templates/changelog/changelog_summary_data.html:8
 #: rhodecode/templates/changeset/changeset.html:36
-#: rhodecode/templates/compare/compare_commits.html:22
+#: rhodecode/templates/compare/compare_commits.html:23
 #: rhodecode/templates/email_templates/commit_comment.mako:45
 #: rhodecode/templates/email_templates/commit_comment.mako:81
 #: rhodecode/templates/search/search_commit.html:6
@@ -3890,17 +4403,17 b' msgstr ""'
 msgid "Home"
 msgstr ""
 
-#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:35
-#: rhodecode/templates/login.html:64 rhodecode/templates/base/base.html:329
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:34
+#: rhodecode/templates/login.html:75 rhodecode/templates/base/base.html:326
 #: rhodecode/templates/debug_style/login.html:60
 msgid "Sign In"
 msgstr ""
 
-#: rhodecode/templates/login.html:37
+#: rhodecode/templates/login.html:36
 msgid "Go to the registration page to create a new account."
 msgstr ""
 
-#: rhodecode/templates/login.html:58
+#: rhodecode/templates/login.html:57
 msgid "Remember me"
 msgstr ""
 
@@ -3908,79 +4421,102 b' msgstr ""'
 msgid "Forgot your password?"
 msgstr ""
 
+#: rhodecode/templates/login.html:65 rhodecode/templates/password_reset.html:34
+msgid "Password reset is disabled. Please contact "
+msgstr ""
+
+#: rhodecode/templates/login.html:67 rhodecode/templates/password_reset.html:36
+#: rhodecode/templates/base/base.html:43
+#: rhodecode/templates/errors/error_document.html:62
+msgid "Support"
+msgstr ""
+
+#: rhodecode/templates/login.html:68 rhodecode/templates/password_reset.html:37
+#: rhodecode/templates/files/files_add.html:54
+#: rhodecode/templates/files/files_add.html:65
+msgid "or"
+msgstr ""
+
+#: rhodecode/templates/login.html:70 rhodecode/templates/password_reset.html:39
+msgid "an administrator if you need help."
+msgstr ""
+
 #: rhodecode/templates/password_reset.html:5
-#: rhodecode/templates/register.html:5
-msgid "Create an Account"
-msgstr ""
-
-#: rhodecode/templates/password_reset.html:35
+msgid "Reset Password"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:46
 msgid "Reset your Password"
 msgstr ""
 
-#: rhodecode/templates/password_reset.html:36
+#: rhodecode/templates/password_reset.html:47
 msgid "Go to the login page to sign in."
 msgstr ""
 
-#: rhodecode/templates/password_reset.html:40
+#: rhodecode/templates/password_reset.html:51
 msgid "Email Address"
 msgstr ""
 
-#: rhodecode/templates/password_reset.html:49
-#: rhodecode/templates/register.html:85
-msgid "Captcha"
-msgstr ""
-
-#: rhodecode/templates/password_reset.html:59
-msgid "Send password reset email"
-msgstr ""
-
 #: rhodecode/templates/password_reset.html:60
+#: rhodecode/templates/register.html:84
+msgid "Captcha"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:70
+msgid "Send password reset email"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:71
 msgid "Password reset link will be sent to matching email address"
 msgstr ""
 
+#: rhodecode/templates/register.html:5
+msgid "Create an Account"
+msgstr ""
+
+#: rhodecode/templates/register.html:34
+msgid "Create an account"
+msgstr ""
+
 #: rhodecode/templates/register.html:35
-msgid "Create an account"
-msgstr ""
-
-#: rhodecode/templates/register.html:36
 msgid "Go to the login page to sign in with an existing account."
 msgstr ""
 
-#: rhodecode/templates/register.html:55
+#: rhodecode/templates/register.html:54
 msgid "Re-enter password"
 msgstr ""
 
-#: rhodecode/templates/register.html:62
+#: rhodecode/templates/register.html:61
 #: rhodecode/templates/admin/my_account/my_account_profile.html:32
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:30
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:76
 #: rhodecode/templates/admin/users/user_add.html:68
 #: rhodecode/templates/admin/users/user_edit_profile.html:47
-#: rhodecode/templates/admin/users/users.html:92
+#: rhodecode/templates/admin/users/users.html:94
 msgid "First Name"
 msgstr ""
 
-#: rhodecode/templates/register.html:69
+#: rhodecode/templates/register.html:68
 #: rhodecode/templates/admin/my_account/my_account_profile.html:40
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:39
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:85
 #: rhodecode/templates/admin/users/user_add.html:77
 #: rhodecode/templates/admin/users/user_edit_profile.html:56
-#: rhodecode/templates/admin/users/users.html:94
+#: rhodecode/templates/admin/users/users.html:96
 msgid "Last Name"
 msgstr ""
 
-#: rhodecode/templates/register.html:97
+#: rhodecode/templates/register.html:96
 msgid "Account activation requires admin approval."
 msgstr ""
 
-#: rhodecode/templates/register.html:104
+#: rhodecode/templates/register.html:103
 msgid "Create Account"
 msgstr ""
 
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:15
-#: rhodecode/templates/base/base.html:77
+#: rhodecode/templates/base/base.html:72
 msgid "Admin journal"
 msgstr ""
 
@@ -4010,8 +4546,9 b' msgstr ""'
 #: rhodecode/templates/admin/repo_groups/repo_groups.html:62
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:13
 #: rhodecode/templates/admin/repos/repos.html:69
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:71
 #: rhodecode/templates/admin/user_groups/user_groups.html:66
-#: rhodecode/templates/admin/users/users.html:105
+#: rhodecode/templates/admin/users/users.html:107
 msgid "Action"
 msgstr ""
 
@@ -4043,39 +4580,6 b' msgstr ""'
 msgid "Authentication Settings"
 msgstr ""
 
-#: rhodecode/templates/admin/auth/auth_settings.html:12
-#: rhodecode/templates/admin/auth/plugin_settings.html:12
-#: rhodecode/templates/admin/defaults/defaults.html:12
-#: rhodecode/templates/admin/integrations/base.html:21
-#: rhodecode/templates/admin/integrations/form.html:15
-#: rhodecode/templates/admin/integrations/form.html:28
-#: rhodecode/templates/admin/integrations/list.html:8
-#: rhodecode/templates/admin/integrations/list.html:14
-#: rhodecode/templates/admin/integrations/new.html:11
-#: rhodecode/templates/admin/integrations/new.html:19
-#: rhodecode/templates/admin/permissions/permissions.html:12
-#: rhodecode/templates/admin/repo_groups/repo_group_add.html:12
-#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:14
-#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
-#: rhodecode/templates/admin/repos/repo_add.html:13
-#: rhodecode/templates/admin/repos/repo_add.html:17
-#: rhodecode/templates/admin/repos/repo_edit_permissions.html:15
-#: rhodecode/templates/admin/repos/repos.html:13
-#: rhodecode/templates/admin/settings/settings.html:12
-#: rhodecode/templates/admin/user_groups/user_group_add.html:11
-#: rhodecode/templates/admin/user_groups/user_group_edit.html:12
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:14
-#: rhodecode/templates/admin/user_groups/user_groups.html:13
-#: rhodecode/templates/admin/users/user_add.html:11
-#: rhodecode/templates/admin/users/user_edit.html:12
-#: rhodecode/templates/admin/users/users.html:13
-#: rhodecode/templates/admin/users/users.html:101
-#: rhodecode/templates/base/base.html:406
-#: rhodecode/templates/base/base.html:413
-msgid "Admin"
-msgstr ""
-
 #: rhodecode/templates/admin/auth/auth_settings.html:14
 #: rhodecode/templates/admin/auth/plugin_settings.html:14
 msgid "Authentication Plugins"
@@ -4101,21 +4605,21 b' msgstr ""'
 #: rhodecode/templates/admin/auth/plugin_settings.html:87
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:63
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:103
-#: rhodecode/templates/admin/permissions/permissions_application.html:50
+#: rhodecode/templates/admin/permissions/permissions_application.html:59
 #: rhodecode/templates/admin/permissions/permissions_objects.html:56
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:72
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:135
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:67
-#: rhodecode/templates/admin/repos/repo_add_base.html:88
+#: rhodecode/templates/admin/repos/repo_add_base.html:90
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:79
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:110
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:158
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:160
 #: rhodecode/templates/admin/settings/settings_hooks.html:63
 #: rhodecode/templates/admin/settings/settings_issuetracker.html:15
 #: rhodecode/templates/admin/user_groups/user_group_add.html:60
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:120
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:89
-#: rhodecode/templates/admin/users/user_add.html:125
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:102
+#: rhodecode/templates/admin/users/user_add.html:128
 #: rhodecode/templates/admin/users/user_edit_profile.html:134
 #: rhodecode/templates/base/default_perms_box.html:88
 msgid "Save"
@@ -4137,20 +4641,20 b' msgstr ""'
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:14
 #: rhodecode/templates/admin/gists/index.html:110
 #: rhodecode/templates/admin/integrations/list.html:103
-#: rhodecode/templates/admin/repos/repo_add_base.html:62
+#: rhodecode/templates/admin/repos/repo_add_base.html:64
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:12
 msgid "Type"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:23
-#: rhodecode/templates/admin/repos/repo_add_base.html:80
+#: rhodecode/templates/admin/repos/repo_add_base.html:82
 msgid "Private Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:27
-#: rhodecode/templates/admin/repos/repo_add_base.html:84
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:110
-#: rhodecode/templates/forks/fork.html:85
+#: rhodecode/templates/admin/repos/repo_add_base.html:86
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:112
+#: rhodecode/templates/forks/fork.html:87
 msgid "Private repositories are only visible to people explicitly added as collaborators."
 msgstr ""
 
@@ -4183,46 +4687,48 b' msgstr ""'
 msgid "Edit Gist"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.html:29
-#, python-format
-msgid "Gist was updated since you started editing. Copy your changes and click %(here)s to reload the new version."
-msgstr ""
-
-#: rhodecode/templates/admin/gists/edit.html:39
+#: rhodecode/templates/admin/gists/edit.html:33
 #: rhodecode/templates/admin/gists/new.html:30
 msgid "Gist description ..."
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.html:44
+#: rhodecode/templates/admin/gists/edit.html:38
 #: rhodecode/templates/admin/gists/new.html:38
 msgid "Gist lifetime"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.html:47
+#: rhodecode/templates/admin/gists/edit.html:41
 #: rhodecode/templates/admin/gists/new.html:41
 msgid "Gist access level"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.html:62
+#: rhodecode/templates/admin/gists/edit.html:56
 #: rhodecode/templates/admin/gists/new.html:50
 #: rhodecode/templates/files/files_add.html:74
 #: rhodecode/templates/files/files_edit.html:78
 msgid "plain"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.html:107
+#: rhodecode/templates/admin/gists/edit.html:101
 msgid "Update Gist"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.html:108
+#: rhodecode/templates/admin/gists/edit.html:102
 #: rhodecode/templates/base/issue_tracker_settings.html:74
-#: rhodecode/templates/changeset/changeset_file_comment.html:139
+#: rhodecode/templates/changeset/changeset_file_comment.html:137
+#: rhodecode/templates/codeblocks/diffs.html:84
+#: rhodecode/templates/codeblocks/diffs.html:98
 #: rhodecode/templates/files/files_add.html:102
 #: rhodecode/templates/files/files_delete.html:69
 #: rhodecode/templates/files/files_edit.html:105
 msgid "Cancel"
 msgstr ""
 
+#: rhodecode/templates/admin/gists/edit.html:122
+#, python-format
+msgid "Gist was updated since you started editing. Copy your changes and click %(here)s to reload the new version."
+msgstr ""
+
 #: rhodecode/templates/admin/gists/index.html:6
 #: rhodecode/templates/admin/gists/index.html:20
 #, python-format
@@ -4274,16 +4780,15 b' msgid "My public"'
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:108
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:24
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:88
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:41
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:62
 #: rhodecode/templates/changelog/changelog.html:110
 #: rhodecode/templates/changelog/changelog_summary_data.html:11
-#: rhodecode/templates/changeset/changeset.html:164
-#: rhodecode/templates/compare/compare_commits.html:21
+#: rhodecode/templates/changeset/changeset.html:163
+#: rhodecode/templates/compare/compare_commits.html:22
 #: rhodecode/templates/files/files_browser_tree.html:9
-#: rhodecode/templates/pullrequests/pullrequest_show.html:169
+#: rhodecode/templates/pullrequests/pullrequest_show.html:198
 #: rhodecode/templates/pullrequests/pullrequests.html:102
 #: rhodecode/templates/search/search_commit.html:16
 #: rhodecode/templates/tags/tags.html:63
@@ -4341,19 +4846,20 b' msgstr ""'
 #: rhodecode/templates/admin/integrations/list.html:204
 #: rhodecode/templates/admin/my_account/my_account_profile.html:5
 #: rhodecode/templates/base/issue_tracker_settings.html:61
-#: rhodecode/templates/changeset/changeset_file_comment.html:145
-#: rhodecode/templates/changeset/changeset_file_comment.html:292
-#: rhodecode/templates/data_table/_dt_elements.html:114
-#: rhodecode/templates/data_table/_dt_elements.html:172
-#: rhodecode/templates/data_table/_dt_elements.html:185
-#: rhodecode/templates/data_table/_dt_elements.html:198
+#: rhodecode/templates/changeset/changeset_file_comment.html:143
+#: rhodecode/templates/changeset/changeset_file_comment.html:267
+#: rhodecode/templates/codeblocks/diffs.html:79
+#: rhodecode/templates/data_table/_dt_elements.html:118
+#: rhodecode/templates/data_table/_dt_elements.html:180
+#: rhodecode/templates/data_table/_dt_elements.html:193
+#: rhodecode/templates/data_table/_dt_elements.html:206
 #: rhodecode/templates/debug_style/buttons.html:128
 #: rhodecode/templates/files/files_add.html:204
 #: rhodecode/templates/files/files_edit.html:165
-#: rhodecode/templates/files/files_source.html:37
-#: rhodecode/templates/files/files_source.html:40
-#: rhodecode/templates/pullrequests/pullrequest_show.html:50
-#: rhodecode/templates/pullrequests/pullrequest_show.html:184
+#: rhodecode/templates/files/files_source.html:38
+#: rhodecode/templates/files/files_source.html:41
+#: rhodecode/templates/pullrequests/pullrequest_show.html:60
+#: rhodecode/templates/pullrequests/pullrequest_show.html:213
 #: rhodecode/templates/users/user_profile.html:7
 msgid "Edit"
 msgstr ""
@@ -4372,7 +4878,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/gists/show.html:91
 #: rhodecode/templates/files/files_delete.html:50
-#: rhodecode/templates/files/files_source.html:62
+#: rhodecode/templates/files/files_source.html:73
 msgid "Show as raw"
 msgstr ""
 
@@ -4397,7 +4903,7 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repo_edit.html:43
 #: rhodecode/templates/admin/settings/settings.html:14
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:33
-#: rhodecode/templates/base/base.html:86 rhodecode/templates/base/base.html:251
+#: rhodecode/templates/base/base.html:81 rhodecode/templates/base/base.html:246
 msgid "Settings"
 msgstr ""
 
@@ -4497,7 +5003,7 b' msgid "No description available"'
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.html:5
-#: rhodecode/templates/base/base.html:343
+#: rhodecode/templates/base/base.html:340
 msgid "My account"
 msgstr ""
 
@@ -4533,7 +5039,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/my_account/my_account.html:40
 #: rhodecode/templates/admin/notifications/notifications.html:33
-#: rhodecode/templates/base/base.html:243
+#: rhodecode/templates/base/base.html:238
 msgid "Pull Requests"
 msgstr ""
 
@@ -4676,16 +5182,14 b' msgid "Show Closed Pull Requests"'
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:15
-msgid "Pull Requests You Opened"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:23
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:87
+msgid "Pull Requests You Participate In"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:37
 msgid "Target Repo"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:26
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:90
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:43
 #: rhodecode/templates/admin/settings/settings_global.html:9
 #: rhodecode/templates/email_templates/pull_request_review.mako:39
 #: rhodecode/templates/email_templates/pull_request_review.mako:72
@@ -4694,45 +5198,11 b' msgstr ""'
 msgid "Title"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:27
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:91
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:47
 #: rhodecode/templates/pullrequests/pullrequests.html:108
 msgid "Last Update"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:43
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:106
-#: rhodecode/templates/changelog/changelog.html:153
-#: rhodecode/templates/compare/compare_commits.html:49
-#: rhodecode/templates/search/search_commit.html:36
-msgid "Expand commit message"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:52
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:115
-#: rhodecode/templates/changeset/changeset_file_comment.html:284
-#: rhodecode/templates/pullrequests/pullrequest_show.html:14
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
-#: rhodecode/templates/pullrequests/pullrequests.html:52
-msgid "Closed"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:63
-msgid "Confirm to delete this pull request"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:70
-msgid "You currently have no open pull requests."
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:78
-msgid "Pull Requests You Participate In"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:127
-msgid "There are currently no open pull requests requiring your participation."
-msgstr ""
-
 #: rhodecode/templates/admin/my_account/my_account_repos.html:3
 msgid "Repositories You Own"
 msgstr ""
@@ -4748,7 +5218,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/notifications/notifications.html:32
 #: rhodecode/templates/changeset/changeset.html:140
-#: rhodecode/templates/pullrequests/pullrequest_show.html:133
+#: rhodecode/templates/pullrequests/pullrequest_show.html:162
 msgid "Comments"
 msgstr ""
 
@@ -4777,7 +5247,7 b' msgstr ""'
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:49
 #: rhodecode/templates/admin/repos/repo_edit.html:46
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:34
-#: rhodecode/templates/base/base.html:82
+#: rhodecode/templates/base/base.html:77
 msgid "Permissions"
 msgstr ""
 
@@ -4815,14 +5285,18 b' msgid "Registration"'
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.html:33
+msgid "Password Reset"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_application.html:42
 msgid "Registration Page Message"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions_application.html:37
+#: rhodecode/templates/admin/permissions/permissions_application.html:46
 msgid "Custom message to be displayed on the registration page. HTML syntax is supported."
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions_application.html:43
+#: rhodecode/templates/admin/permissions/permissions_application.html:52
 msgid "External Authentication Account Activation"
 msgstr ""
 
@@ -4894,13 +5368,12 b' msgid "Default User Permissions Overview'
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:5
-#: rhodecode/templates/admin/users/user_add.html:116
 msgid "Add repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:14
 #: rhodecode/templates/admin/users/user_edit_advanced.html:12
-#: rhodecode/templates/base/base.html:79 rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:148
 msgid "Repository groups"
 msgstr ""
 
@@ -4914,7 +5387,7 b' msgid "Group Parent"'
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:63
-#: rhodecode/templates/admin/repos/repo_add_base.html:53
+#: rhodecode/templates/admin/repos/repo_add_base.html:55
 msgid "Copy Parent Group Permissions"
 msgstr ""
 
@@ -4938,47 +5411,51 b' msgstr ""'
 msgid "Advanced"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:8
-msgid "Total repositories"
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:7
+msgid "Is Personal Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:9
+msgid "Total repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:10
 msgid "Top level repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:11
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:12
 msgid "Children groups"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:17
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:18
 #, python-format
 msgid "Repository Group: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:27
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:28
 msgid "Delete repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:35
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:36
 #, python-format
 msgid "This repository group includes %s children repository group."
 msgid_plural "This repository group includes %s children repository groups."
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:44
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:45
 #, python-format
 msgid "This repository group includes %s repository."
 msgid_plural "This repository group includes %s repositories."
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:56
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:57
 #, python-format
 msgid "Confirm to delete this group: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:57
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:58
 msgid "Delete this repository group"
 msgstr ""
 
@@ -4986,25 +5463,6 b' msgstr ""'
 msgid "Repository Group Permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:11
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:126
-#: rhodecode/templates/admin/repos/repo_edit_permissions.html:12
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:11
-msgid "None"
-msgstr ""
-
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:12
-#: rhodecode/templates/admin/repos/repo_edit_permissions.html:13
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:12
-msgid "Read"
-msgstr ""
-
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:13
-#: rhodecode/templates/admin/repos/repo_edit_permissions.html:14
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:13
-msgid "Write"
-msgstr ""
-
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:15
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:16
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:15
@@ -5020,7 +5478,6 b' msgstr ""'
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:34
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:34
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:34
-#: rhodecode/templates/pullrequests/pullrequest_show.html:199
 msgid "owner"
 msgstr ""
 
@@ -5105,7 +5562,7 b' msgid "Import Existing Repository ?"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:23
-#: rhodecode/templates/base/base.html:198
+#: rhodecode/templates/base/base.html:193
 msgid "Clone from"
 msgstr ""
 
@@ -5114,7 +5571,7 b' msgid "Optional http[s] URL from which t'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:36
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:100
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:102
 #: rhodecode/templates/forks/fork.html:52
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
@@ -5123,46 +5580,46 b' msgstr ""'
 msgid "Repository Group"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:46
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:61
-#: rhodecode/templates/forks/fork.html:63
+#: rhodecode/templates/admin/repos/repo_add_base.html:47
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:62
+#: rhodecode/templates/forks/fork.html:64
 #, python-format
 msgid "Select my personal group (%(repo_group_name)s)"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:48
-#: rhodecode/templates/forks/fork.html:65
+#: rhodecode/templates/admin/repos/repo_add_base.html:50
+#: rhodecode/templates/forks/fork.html:67
 msgid "Optionally select a group to put this repository into."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:57
+#: rhodecode/templates/admin/repos/repo_add_base.html:59
 msgid "Copy permission set from the parent repository group."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:66
+#: rhodecode/templates/admin/repos/repo_add_base.html:68
 msgid "Set the type of repository to create."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:71
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:68
-#: rhodecode/templates/forks/fork.html:71
+#: rhodecode/templates/admin/repos/repo_add_base.html:73
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:70
+#: rhodecode/templates/forks/fork.html:73
 msgid "Landing commit"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:75
+#: rhodecode/templates/admin/repos/repo_add_base.html:77
 msgid "The default commit for file pages, downloads, full text search index, and README generation."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_creating.html:9
+#: rhodecode/templates/admin/repos/repo_creating.html:5
 #, python-format
 msgid "%s Creating repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_creating.html:16
+#: rhodecode/templates/admin/repos/repo_creating.html:12
 msgid "Creating repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_creating.html:30
+#: rhodecode/templates/admin/repos/repo_creating.html:26
 #, python-format
 msgid "Repository \"%(repo_name)s\" is being created, you will be redirected when this process is finished.repo_name"
 msgstr ""
@@ -5189,6 +5646,10 b' msgstr ""'
 msgid "Statistics"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit.html:87
+msgid "Reviewers"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:7
 msgid "Updated on"
 msgstr ""
@@ -5285,7 +5746,7 b' msgid "Delete forks"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:139
-#: rhodecode/templates/data_table/_dt_elements.html:120
+#: rhodecode/templates/data_table/_dt_elements.html:124
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
@@ -5346,7 +5807,7 b' msgstr ""'
 #: rhodecode/templates/admin/user_groups/user_groups.html:62
 #: rhodecode/templates/admin/users/user_add.html:97
 #: rhodecode/templates/admin/users/user_edit_profile.html:90
-#: rhodecode/templates/admin/users/users.html:99
+#: rhodecode/templates/admin/users/users.html:101
 msgid "Active"
 msgstr ""
 
@@ -5502,50 +5963,50 b' msgid "http[s] url where from repository'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.html:56
-#: rhodecode/templates/data_table/_dt_elements.html:160
+#: rhodecode/templates/data_table/_dt_elements.html:164
 #: rhodecode/templates/forks/fork.html:58
 msgid "Repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:63
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:65
 msgid "Optional select a group to put this repository into."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:72
-#: rhodecode/templates/forks/fork.html:75
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:74
+#: rhodecode/templates/forks/fork.html:77
 msgid "Default commit for files page, downloads, whoosh and readme"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:90
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:92
 msgid "Change owner of this repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:106
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:108
 #: rhodecode/templates/data_table/_dt_elements.html:58
 msgid "Private repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:115
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:117
 msgid "Enable statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:119
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:121
 msgid "Enable statistics window on summary page."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:124
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:126
 msgid "Enable downloads"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:128
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:130
 msgid "Enable download menu on summary page."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:133
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:135
 msgid "Enable automatic locking"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:137
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:139
 msgid "Enable automatic locking on repository. Pulling from this repository creates a lock that can be released by pushing back by the same user"
 msgstr ""
 
@@ -5574,10 +6035,10 b' msgid "Select to inherit global vcs sett'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_vcs.html:45
-#: rhodecode/templates/admin/settings/settings_global.html:109
+#: rhodecode/templates/admin/settings/settings_global.html:139
 #: rhodecode/templates/admin/settings/settings_labs.html:48
 #: rhodecode/templates/admin/settings/settings_vcs.html:13
-#: rhodecode/templates/admin/settings/settings_visual.html:219
+#: rhodecode/templates/admin/settings/settings_visual.html:221
 msgid "Save settings"
 msgstr ""
 
@@ -5657,10 +6118,6 b' msgstr ""'
 msgid "Send an auto-generated email from this server to above email..."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_email.html:48
-msgid "Send"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings_global.html:5
 msgid "Branding"
 msgstr ""
@@ -5677,32 +6134,61 b' msgstr ""'
 msgid "Set a custom text that is shown as authentication message to clients trying to connect."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_global.html:35
+#: rhodecode/templates/admin/settings/settings_global.html:36
+#: rhodecode/templates/admin/users/user_edit_advanced.html:56
+msgid "Personal Repository Group"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:41
+msgid "Create Personal Repository Group"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:44
+msgid "Always create Personal Repository Groups for new users."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:45
+msgid "When creating new users from add user form or API you can still turn this off via a checkbox or flag"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:49
+msgid "Personal Repo Group Pattern"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:55
+msgid "Pattern used to create Personal Repository Groups. Prefix can be other existing repository group path[s], eg. /u/${username}"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:56
+msgid "Available variables are currently ${username} and ${user_id}"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:64
 msgid "Registration Captcha"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_global.html:39
+#: rhodecode/templates/admin/settings/settings_global.html:68
 msgid "Google ReCaptcha public key"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_global.html:46
+#: rhodecode/templates/admin/settings/settings_global.html:75
 msgid "Public key for reCaptcha system."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_global.html:51
+#: rhodecode/templates/admin/settings/settings_global.html:80
 msgid "Google ReCaptcha private key"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_global.html:58
+#: rhodecode/templates/admin/settings/settings_global.html:87
 msgid "Private key for reCaptcha system. Setting this value will enable captcha on registration"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_global.html:66
+#: rhodecode/templates/admin/settings/settings_global.html:95
 msgid "Custom Header Code"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_global.html:71
-#: rhodecode/templates/admin/settings/settings_global.html:93
+#: rhodecode/templates/admin/settings/settings_global.html:100
+#: rhodecode/templates/admin/settings/settings_global.html:123
 #: rhodecode/templates/debug_style/form-elements-small.html:59
 #: rhodecode/templates/debug_style/form-elements.html:57
 #: rhodecode/templates/debug_style/form-elements.html:82
@@ -5712,7 +6198,7 b' msgstr ""'
 #: rhodecode/templates/debug_style/form-elements.html:515
 #: rhodecode/templates/debug_style/form-elements.html:519
 #: rhodecode/templates/debug_style/form-elements.html:537
-#: rhodecode/templates/debug_style/form-elements.html:587
+#: rhodecode/templates/debug_style/form-elements.html:581
 #: rhodecode/templates/debug_style/form-inline.html:38
 #: rhodecode/templates/debug_style/form-inline.html:139
 #: rhodecode/templates/debug_style/form-inline.html:147
@@ -5725,8 +6211,8 b' msgstr ""'
 msgid "Templates..."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_global.html:74
-#: rhodecode/templates/admin/settings/settings_global.html:96
+#: rhodecode/templates/admin/settings/settings_global.html:103
+#: rhodecode/templates/admin/settings/settings_global.html:126
 #: rhodecode/templates/debug_style/form-elements-small.html:62
 #: rhodecode/templates/debug_style/form-elements.html:60
 #: rhodecode/templates/debug_style/form-elements.html:85
@@ -5736,7 +6222,7 b' msgstr ""'
 #: rhodecode/templates/debug_style/form-elements.html:518
 #: rhodecode/templates/debug_style/form-elements.html:522
 #: rhodecode/templates/debug_style/form-elements.html:540
-#: rhodecode/templates/debug_style/form-elements.html:590
+#: rhodecode/templates/debug_style/form-elements.html:584
 #: rhodecode/templates/debug_style/form-inline.html:41
 #: rhodecode/templates/debug_style/form-inline.html:142
 #: rhodecode/templates/debug_style/form-inline.html:150
@@ -5749,23 +6235,27 b' msgstr ""'
 msgid "Server Announcement"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_global.html:80
+#: rhodecode/templates/admin/settings/settings_global.html:104
+msgid "Flash message filtering"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:110
 msgid "Custom js/css code added at the end of the <header/> tag."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_global.html:81
+#: rhodecode/templates/admin/settings/settings_global.html:111
 msgid "Use <script/> or <css/> tags to define custom styling or scripting"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_global.html:88
+#: rhodecode/templates/admin/settings/settings_global.html:118
 msgid "Custom Footer Code"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_global.html:102
+#: rhodecode/templates/admin/settings/settings_global.html:132
 msgid "Custom js/css code added at the end of the <body> tag."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_global.html:103
+#: rhodecode/templates/admin/settings/settings_global.html:133
 msgid "Use <script> or <css> tags to define custom styling or scripting"
 msgstr ""
 
@@ -5826,152 +6316,15 b' msgstr ""'
 msgid "Last %(size)s bytes of process logs, use ?offset=[num] GET param to set custom size"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_system.html:4
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:4
-msgid "RhodeCode Enterprise version"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:4
-msgid "check for updates"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:5
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:5
-msgid "Upgrade info endpoint"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:5
-msgid "Note: please make sure this server can access this url"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:6
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:6
-msgid "Configuration INI file"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:8
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:8
-msgid "RhodeCode Enterprise Server IP"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:9
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:9
-msgid "RhodeCode Enterprise Server ID"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:10
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:10
-msgid "Platform"
+#: rhodecode/templates/admin/settings/settings_system.html:3
+msgid "Checking for updates..."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:11
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:11
-msgid "Uptime"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:12
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:12
-msgid "Storage location"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:13
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:13
-msgid "Storage disk space"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:15
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:15
-msgid "Search index storage"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:16
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:16
-msgid "Search index size"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:18
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:18
-msgid "Gist storage"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:19
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:19
-msgid "Gist storage size"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:21
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:21
-msgid "Archive cache"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:21
-msgid "Enable this by setting archive_cache_dir=/path/to/cache option in the .ini file"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:22
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:22
-msgid "Archive cache size"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:24
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:24
-msgid "System memory"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:25
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:25
-msgid "CPU"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:26
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:26
-msgid "Load"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:29
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:29
-msgid "Python version"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:30
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:30
-msgid "Python path"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:31
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:31
-msgid "GIT version"
+msgid "create summary snapshot"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:32
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:32
-msgid "HG version"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:33
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:33
-msgid "SVN version"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:34
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:34
-msgid "Database"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:35
-#: rhodecode/templates/admin/settings/settings_system_snapshot.html:35
-msgid "Database version"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:41
-msgid "Checking for updates..."
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:49
-msgid "create snapshot"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings_system.html:64
 msgid "Python Packages"
 msgstr ""
 
@@ -6035,86 +6388,86 b' msgstr ""'
 msgid "Parses meta tags from repository description field and turns them into colored tags."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:86
+#: rhodecode/templates/admin/settings/settings_visual.html:88
 msgid "Dashboard Items"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:90
+#: rhodecode/templates/admin/settings/settings_visual.html:92
 msgid "Main page dashboard items"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:96
+#: rhodecode/templates/admin/settings/settings_visual.html:98
 msgid "Number of items displayed in the main page dashboard before pagination is shown."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:100
+#: rhodecode/templates/admin/settings/settings_visual.html:102
 msgid "Admin pages items"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:106
+#: rhodecode/templates/admin/settings/settings_visual.html:108
 msgid "Number of items displayed in the admin pages grids before pagination is shown."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:115
+#: rhodecode/templates/admin/settings/settings_visual.html:117
 msgid "Commit ID Style"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:119
+#: rhodecode/templates/admin/settings/settings_visual.html:121
 msgid "Commit sha length"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:126
+#: rhodecode/templates/admin/settings/settings_visual.html:128
 msgid ""
 "Number of chars to show in commit sha displayed in web interface.\n"
 "                                                By default it's shown as r123:9043a6a4c226 this value defines the\n"
 "                                                length of the sha after the `r123:` part."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:134
+#: rhodecode/templates/admin/settings/settings_visual.html:136
 msgid "Show commit ID numeric reference"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:134
-msgid "Commit show revision number"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings_visual.html:136
+msgid "Commit show revision number"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:138
 msgid ""
 "Show revision number in commit sha displayed in web interface.\n"
 "                                        By default it's shown as r123:9043a6a4c226 this value defines the\n"
 "                                        if the `r123:` part is shown."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:145
-#: rhodecode/templates/debug_style/index.html:62
+#: rhodecode/templates/admin/settings/settings_visual.html:147
+#: rhodecode/templates/debug_style/index.html:63
 msgid "Icons"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:150
+#: rhodecode/templates/admin/settings/settings_visual.html:152
 msgid "Show public repo icon on repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:156
-msgid "Show private repo icon on repositories"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings_visual.html:158
+msgid "Show private repo icon on repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:160
 msgid "Show public/private icons next to repositories names."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:165
+#: rhodecode/templates/admin/settings/settings_visual.html:167
 msgid "Markup Renderer"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:172
+#: rhodecode/templates/admin/settings/settings_visual.html:174
 msgid "Default renderer used to render comments, pull request descriptions and other description elements. After change old entries will still work correctly."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:179
+#: rhodecode/templates/admin/settings/settings_visual.html:181
 msgid "Clone URL"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:188
+#: rhodecode/templates/admin/settings/settings_visual.html:190
 msgid ""
 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
 "                       {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
@@ -6124,11 +6477,11 b' msgid ""'
 "                       {repoid} ID of repository, can be used to contruct clone-by-id"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:201
+#: rhodecode/templates/admin/settings/settings_visual.html:203
 msgid "Custom Support Link"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_visual.html:209
+#: rhodecode/templates/admin/settings/settings_visual.html:211
 #, python-format
 msgid ""
 "Custom url for the support link located at the bottom.\n"
@@ -6143,7 +6496,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/user_groups/user_group_add.html:13
 #: rhodecode/templates/admin/users/user_edit_advanced.html:13
-#: rhodecode/templates/base/base.html:81 rhodecode/templates/base/base.html:156
+#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:151
 msgid "User groups"
 msgstr ""
 
@@ -6177,7 +6530,6 b' msgstr ""'
 msgid "Permissions summary"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit.html:38
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:8
 #: rhodecode/templates/admin/user_groups/user_groups.html:60
 #: rhodecode/templates/debug_style/form-elements.html:509
@@ -6211,15 +6563,6 b' msgstr ""'
 msgid "Delete This User Group"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_members.html:5
-#, python-format
-msgid "Members of User Group: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/user_groups/user_group_edit_members.html:27
-msgid "No members yet"
-msgstr ""
-
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:5
 msgid "User Group Permissions"
 msgstr ""
@@ -6233,36 +6576,12 b' msgstr ""'
 msgid "Change owner of this user group."
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:59
-#: rhodecode/templates/base/base.html:258
-#: rhodecode/templates/base/base.html:400
-#: rhodecode/templates/search/search.html:64
-msgid "Search"
-msgstr ""
-
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:66
-#: rhodecode/templates/debug_style/form-elements.html:513
-#: rhodecode/templates/debug_style/form-elements.html:571
-#: rhodecode/templates/debug_style/forms.html:236
-msgid "Chosen group members"
-msgstr ""
-
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:69
-#: rhodecode/templates/debug_style/form-elements.html:525
-#: rhodecode/templates/debug_style/form-elements.html:575
-#: rhodecode/templates/debug_style/forms.html:240
-msgid "Remove all elements"
-msgstr ""
-
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:79
-msgid "Available users"
-msgstr ""
-
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:83
-#: rhodecode/templates/debug_style/form-elements.html:543
-#: rhodecode/templates/debug_style/form-elements.html:593
-#: rhodecode/templates/debug_style/forms.html:258
-msgid "Add all elements"
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:60
+msgid "Add members"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:96
+msgid "No members yet"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_groups.html:5
@@ -6279,7 +6598,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/users/user_add.html:13
 #: rhodecode/templates/admin/users/user_edit.html:14
-#: rhodecode/templates/base/base.html:80
+#: rhodecode/templates/base/base.html:75
 msgid "Users"
 msgstr ""
 
@@ -6304,13 +6623,21 b' msgstr ""'
 msgid "Force user to change his password on the next login"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_add.html:120
-msgid ""
-"Add repository group with the same name as username. \n"
-"User will be automatically set as this group owner."
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_add.html:136
+#: rhodecode/templates/admin/users/user_add.html:116
+msgid "Add personal repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:121
+#: rhodecode/templates/admin/users/user_edit_advanced.html:67
+#, python-format
+msgid "New group will be created at: `/%(path)s`"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:122
+msgid "User will be automatically set as this group owner."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:139
 msgid "generated password:"
 msgstr ""
 
@@ -6342,7 +6669,7 b' msgid "Source of Record"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:8
-#: rhodecode/templates/admin/users/users.html:97
+#: rhodecode/templates/admin/users/users.html:99
 msgid "Last login"
 msgstr ""
 
@@ -6379,76 +6706,72 b' msgstr ""'
 msgid "When this is enabled user will have to change they password when they next use RhodeCode system. This will also forbid vcs operations until someone makes a password change in the web interface"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.html:56
-msgid "Personal Repository Group"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit_advanced.html:62
 msgid "Users personal repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.html:64
+#: rhodecode/templates/admin/users/user_edit_advanced.html:65
 msgid "This user currently does not have a personal repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.html:68
+#: rhodecode/templates/admin/users/user_edit_advanced.html:72
 msgid "Create personal repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.html:77
+#: rhodecode/templates/admin/users/user_edit_advanced.html:81
 msgid "Delete User"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.html:85
+#: rhodecode/templates/admin/users/user_edit_advanced.html:89
 #, python-format
 msgid "This user owns %s repository."
 msgid_plural "This user owns %s repositories."
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.html:89
+#: rhodecode/templates/admin/users/user_edit_advanced.html:93
 msgid "Detach repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.html:94
-#: rhodecode/templates/admin/users/user_edit_advanced.html:110
-#: rhodecode/templates/admin/users/user_edit_advanced.html:126
+#: rhodecode/templates/admin/users/user_edit_advanced.html:98
+#: rhodecode/templates/admin/users/user_edit_advanced.html:114
+#: rhodecode/templates/admin/users/user_edit_advanced.html:130
 msgid "Delete repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.html:101
+#: rhodecode/templates/admin/users/user_edit_advanced.html:105
 #, python-format
 msgid "This user owns %s repository group."
 msgid_plural "This user owns %s repository groups."
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.html:105
+#: rhodecode/templates/admin/users/user_edit_advanced.html:109
 msgid "Detach repository groups"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.html:117
+#: rhodecode/templates/admin/users/user_edit_advanced.html:121
 #, python-format
 msgid "This user owns %s user group."
 msgid_plural "This user owns %s user groups."
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.html:121
+#: rhodecode/templates/admin/users/user_edit_advanced.html:125
 msgid "Detach user groups"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.html:135
-#: rhodecode/templates/data_table/_dt_elements.html:191
+#: rhodecode/templates/admin/users/user_edit_advanced.html:139
+#: rhodecode/templates/data_table/_dt_elements.html:199
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.html:137
+#: rhodecode/templates/admin/users/user_edit_advanced.html:141
 msgid "Delete this user"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_advanced.html:147
+#: rhodecode/templates/admin/users/user_edit_advanced.html:151
 #, python-format
 msgid "When selecting the detach option, the depending objects owned by this user will be assigned to the `%s` super admin in the system. The delete option will delete the user's repositories!"
 msgstr ""
@@ -6523,68 +6846,63 b' msgstr ""'
 msgid "Users administration"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:103
+#: rhodecode/templates/admin/users/users.html:105
 msgid "Authentication type"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:44
-#: rhodecode/templates/errors/error_document.html:57
-msgid "Support"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:51
+#: rhodecode/templates/base/base.html:50
 #, python-format
 msgid "RhodeCode instance id: %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:83
+#: rhodecode/templates/base/base.html:78
 msgid "Authentication"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:85
+#: rhodecode/templates/base/base.html:80
 msgid "Defaults"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:103
+#: rhodecode/templates/base/base.html:98
 #: rhodecode/templates/files/files_pjax.html:24
 #: rhodecode/templates/summary/components.html:42
 msgid "Show More"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:190
+#: rhodecode/templates/base/base.html:185
 msgid "Fork of"
 msgstr ""
 
+#: rhodecode/templates/base/base.html:202
+#, python-format
+msgid "Repository locked by %(user)s"
+msgstr ""
+
 #: rhodecode/templates/base/base.html:207
-#, python-format
-msgid "Repository locked by %(user)s"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:212
 msgid "Repository not locked. Pull repository to lock it."
 msgstr ""
 
-#: rhodecode/templates/base/base.html:230
+#: rhodecode/templates/base/base.html:225
 #: rhodecode/templates/data_table/_dt_elements.html:12
 #: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/data_table/_dt_elements.html:149
+#: rhodecode/templates/data_table/_dt_elements.html:153
 msgid "Summary"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:231
+#: rhodecode/templates/base/base.html:226
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:18
 msgid "Changelog"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/templates/base/base.html:227
 #: rhodecode/templates/data_table/_dt_elements.html:22
 #: rhodecode/templates/data_table/_dt_elements.html:23
 #: rhodecode/templates/files/files.html:15
 msgid "Files"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:234
+#: rhodecode/templates/base/base.html:229
 #: rhodecode/templates/bookmarks/bookmarks.html:68
 #: rhodecode/templates/branches/branches.html:67
 #: rhodecode/templates/files/file_diff.html:11
@@ -6593,29 +6911,35 b' msgstr ""'
 msgid "Compare"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:239
+#: rhodecode/templates/base/base.html:234
 #, python-format
 msgid "Show Pull Requests for %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:248
+#: rhodecode/templates/base/base.html:243
 msgid "Options"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:255
+#: rhodecode/templates/base/base.html:250
 #: rhodecode/templates/forks/forks_data.html:30
 msgid "Compare fork"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:262
+#: rhodecode/templates/base/base.html:253
+#: rhodecode/templates/base/base.html:400
+#: rhodecode/templates/search/search.html:64
+msgid "Search"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:257
 msgid "Unlock"
 msgstr ""
 
+#: rhodecode/templates/base/base.html:259
+msgid "Lock"
+msgstr ""
+
 #: rhodecode/templates/base/base.html:264
-msgid "Lock"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:269
 #: rhodecode/templates/data_table/_dt_elements.html:27
 #: rhodecode/templates/data_table/_dt_elements.html:28
 #: rhodecode/templates/forks/forks_data.html:8
@@ -6625,29 +6949,33 b' msgid_plural "Forks"'
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/base/base.html:270
+#: rhodecode/templates/base/base.html:265
 msgid "Create Pull Request"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:292
+#: rhodecode/templates/base/base.html:287
 msgid "Sign in"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:300
+#: rhodecode/templates/base/base.html:295
 #: rhodecode/templates/debug_style/login.html:28
 msgid "Sign in to your account"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:316
+#: rhodecode/templates/base/base.html:312
 #: rhodecode/templates/debug_style/login.html:46
 msgid "(Forgot password?)"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:325
+#: rhodecode/templates/base/base.html:322
 #: rhodecode/templates/debug_style/login.html:56
 msgid "Don't have an account ?"
 msgstr ""
 
+#: rhodecode/templates/base/base.html:342
+msgid "My personal group"
+msgstr ""
+
 #: rhodecode/templates/base/base.html:346
 msgid "Sign Out"
 msgstr ""
@@ -6692,6 +7020,7 b' msgstr ""'
 
 #: rhodecode/templates/base/base.html:422
 #: rhodecode/templates/base/base.html:423
+#: rhodecode/templates/debug_style/alerts.html:5
 #: rhodecode/templates/debug_style/buttons.html:5
 #: rhodecode/templates/debug_style/code-block.html:6
 #: rhodecode/templates/debug_style/collapsable-content.html:5
@@ -6812,8 +7141,9 b' msgid "Confirm to remove this pattern:"'
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.html:192
-#: rhodecode/templates/changeset/changeset_file_comment.html:144
-#: rhodecode/templates/changeset/changeset_file_comment.html:291
+#: rhodecode/templates/changeset/changeset_file_comment.html:142
+#: rhodecode/templates/changeset/changeset_file_comment.html:266
+#: rhodecode/templates/codeblocks/diffs.html:78
 #: rhodecode/templates/files/files_add.html:78
 #: rhodecode/templates/files/files_add.html:224
 #: rhodecode/templates/files/files_edit.html:82
@@ -6895,7 +7225,7 b' msgstr ""'
 msgid "No permission defined"
 msgstr ""
 
-#: rhodecode/templates/base/root.html:161
+#: rhodecode/templates/base/root.html:163
 msgid "Please enable JavaScript to use RhodeCode Enterprise"
 msgstr ""
 
@@ -7007,43 +7337,51 b' msgstr ""'
 msgid "Proxy subversion HTTP requests"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.html:153
+#: rhodecode/templates/base/vcs_settings.html:154
 msgid "Subversion HTTP Support. Enables communication with SVN over HTTP protocol."
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.html:158
+#: rhodecode/templates/base/vcs_settings.html:155
+msgid "SVN Protocol setup Documentation"
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.html:161
 msgid "Subversion HTTP Server URL"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.html:171
+#: rhodecode/templates/base/vcs_settings.html:169
+msgid "Generate Apache Config"
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.html:179
 msgid "Subversion Settings"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.html:176
+#: rhodecode/templates/base/vcs_settings.html:184
 msgid "Repository patterns"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.html:180
+#: rhodecode/templates/base/vcs_settings.html:188
 msgid "Patterns for identifying SVN branches and tags. For recursive search, use \"*\". Eg.: \"/branches/*\""
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.html:246
-msgid "Pull Request Settings"
-msgstr ""
-
-#: rhodecode/templates/base/vcs_settings.html:251
-msgid "Enable server-side merge for pull requests"
-msgstr ""
-
 #: rhodecode/templates/base/vcs_settings.html:254
+msgid "Pull Request Settings"
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.html:259
+msgid "Enable server-side merge for pull requests"
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.html:262
 msgid "Note: when this feature is enabled, it only runs hooks defined in the rcextension package. Custom hooks added on the Admin -> Settings -> Hooks page will not be run when pull requests are automatically merged from the web interface."
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.html:258
+#: rhodecode/templates/base/vcs_settings.html:266
 msgid "Invalidate and relocate inline comments during update"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.html:261
+#: rhodecode/templates/base/vcs_settings.html:269
 msgid "During the update of a pull request, the position of inline comments will be updated and outdated inline comments will be hidden."
 msgstr ""
 
@@ -7164,6 +7502,12 b' msgstr ""'
 msgid "Commit has comments"
 msgstr ""
 
+#: rhodecode/templates/changelog/changelog.html:153
+#: rhodecode/templates/compare/compare_commits.html:50
+#: rhodecode/templates/search/search_commit.html:36
+msgid "Expand commit message"
+msgstr ""
+
 #: rhodecode/templates/changelog/changelog.html:191
 #: rhodecode/templates/changelog/changelog_summary_data.html:69
 #: rhodecode/templates/changeset/changeset.html:99
@@ -7182,7 +7526,6 b' msgid "There are no changes yet"'
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/pullrequests/pullrequest_show.html:362
 msgid "Removed"
 msgstr ""
 
@@ -7262,8 +7605,8 b' msgstr ""'
 
 #: rhodecode/templates/changeset/changeset.html:66
 #: rhodecode/templates/changeset/changeset.html:72
-#: rhodecode/templates/changeset/changeset_file_comment.html:36
-#: rhodecode/templates/changeset/changeset_file_comment.html:90
+#: rhodecode/templates/changeset/changeset_file_comment.html:43
+#: rhodecode/templates/changeset/changeset_file_comment.html:88
 msgid "Commit status"
 msgstr ""
 
@@ -7279,6 +7622,8 b' msgstr ""'
 
 #: rhodecode/templates/changeset/changeset.html:119
 #: rhodecode/templates/changeset/diff_block.html:85
+#: rhodecode/templates/codeblocks/diffs.html:359
+#: rhodecode/templates/codeblocks/diffs.html:362
 msgid "Raw diff"
 msgstr ""
 
@@ -7297,6 +7642,8 b' msgstr ""'
 
 #: rhodecode/templates/changeset/changeset.html:127
 #: rhodecode/templates/changeset/diff_block.html:90
+#: rhodecode/templates/codeblocks/diffs.html:366
+#: rhodecode/templates/codeblocks/diffs.html:369
 msgid "Download diff"
 msgstr ""
 
@@ -7307,198 +7654,128 b' msgstr ""'
 
 #: rhodecode/templates/changeset/changeset.html:145
 #: rhodecode/templates/changeset/changeset.html:147
-#: rhodecode/tests/functional/test_commit_comments.py:263
+#: rhodecode/tests/functional/test_commit_comments.py:269
 #, python-format
 msgid "%d Commit comment"
 msgid_plural "%d Commit comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:151
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/pullrequests/pullrequest_show.html:145
-#: rhodecode/templates/pullrequests/pullrequest_show.html:147
-#: rhodecode/tests/functional/test_commit_comments.py:270
+#: rhodecode/templates/changeset/changeset.html:150
+#: rhodecode/templates/changeset/changeset.html:152
+#: rhodecode/templates/pullrequests/pullrequest_show.html:174
+#: rhodecode/templates/pullrequests/pullrequest_show.html:176
+#: rhodecode/tests/functional/test_commit_comments.py:276
 #, python-format
 msgid "%d Inline Comment"
 msgid_plural "%d Inline Comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:175
-msgid "Browse files at current commit"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:175
-msgid "Browse files"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:177
-#: rhodecode/templates/changeset/changeset_range.html:59
-#: rhodecode/templates/compare/compare_diff.html:255
-#: rhodecode/templates/files/file_diff.html:77
-#: rhodecode/templates/pullrequests/pullrequest_show.html:265
-msgid "Expand All"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:177
-#: rhodecode/templates/changeset/changeset_range.html:59
-#: rhodecode/templates/compare/compare_diff.html:255
-#: rhodecode/templates/files/file_diff.html:77
-#: rhodecode/templates/pullrequests/pullrequest_show.html:265
-msgid "Collapse All"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:188
-#: rhodecode/templates/compare/compare_diff.html:263
-#: rhodecode/templates/pullrequests/pullrequest_show.html:274
-msgid "No files"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:225
-#: rhodecode/templates/files/file_diff.html:128
-#: rhodecode/templates/pullrequests/pullrequest_show.html:315
-msgid "Show comments"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:226
-#: rhodecode/templates/files/file_diff.html:129
-#: rhodecode/templates/pullrequests/pullrequest_show.html:316
-msgid "Hide comments"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:243
-#: rhodecode/templates/changeset/diff_block.html:25
-#: rhodecode/templates/changeset/diff_block.html:46
-#: rhodecode/templates/files/file_diff.html:146
-msgid "Diff was truncated. File content available only in full diff."
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:243
-#: rhodecode/templates/changeset/diff_block.html:7
-#: rhodecode/templates/changeset/diff_block.html:10
-#: rhodecode/templates/changeset/diff_block.html:25
-#: rhodecode/templates/changeset/diff_block.html:46
-#: rhodecode/templates/changeset/diff_block.html:59
-#: rhodecode/templates/files/file_diff.html:146
-msgid "Showing a big diff might take some time and resources, continue?"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:243
-#: rhodecode/templates/changeset/diff_block.html:7
-#: rhodecode/templates/changeset/diff_block.html:10
-#: rhodecode/templates/changeset/diff_block.html:25
-#: rhodecode/templates/changeset/diff_block.html:46
-#: rhodecode/templates/files/file_diff.html:146
-#: rhodecode/templates/pullrequests/pullrequest_show.html:390
-#: rhodecode/templates/pullrequests/pullrequest_show.html:396
-msgid "Show full diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:312
+#: rhodecode/templates/changeset/changeset.html:233
 msgid "No Child Commits"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:348
+#: rhodecode/templates/changeset/changeset.html:269
 msgid "No Parent Commits"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:21
-#, python-format
-msgid "Vote on pull request #%s"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:23
-#, python-format
-msgid "Comment on pull request #%s"
-msgstr ""
-
 #: rhodecode/templates/changeset/changeset_file_comment.html:28
-msgid "Status change on commit"
+#, python-format
+msgid "Vote on pull request #%s"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:30
+#, python-format
+msgid "Comment on pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:35
+msgid "Status change on commit"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:37
 msgid "Comment on commit"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:58
-msgid "Previous comment"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:62
-msgid "Next comment"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:118
+#: rhodecode/templates/changeset/changeset_file_comment.html:59
+msgid "Prev"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:60
+msgid "Next"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:116
+#: rhodecode/templates/codeblocks/diffs.html:55
 msgid "Create a comment on line {1}."
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset_file_comment.html:119
+#: rhodecode/templates/changeset/changeset_file_comment.html:226
+#: rhodecode/templates/codeblocks/diffs.html:58
+#, python-format
+msgid "Comments parsed using %s syntax with %s support."
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset_file_comment.html:121
-#: rhodecode/templates/changeset/changeset_file_comment.html:251
-#, python-format
-msgid "Comments parsed using %s syntax with %s support."
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:123
-#: rhodecode/templates/changeset/changeset_file_comment.html:253
+#: rhodecode/templates/changeset/changeset_file_comment.html:228
+#: rhodecode/templates/codeblocks/diffs.html:60
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:133
-#: rhodecode/templates/changeset/changeset_file_comment.html:264
+#: rhodecode/templates/changeset/changeset_file_comment.html:131
+#: rhodecode/templates/changeset/changeset_file_comment.html:239
+#: rhodecode/templates/codeblocks/diffs.html:70
 msgid "Comment preview"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:146
-#: rhodecode/templates/changeset/changeset_file_comment.html:293
-#: rhodecode/templates/compare/compare_diff.html:57
+#: rhodecode/templates/changeset/changeset_file_comment.html:144
+#: rhodecode/templates/changeset/changeset_file_comment.html:268
+#: rhodecode/templates/codeblocks/diffs.html:80
+#: rhodecode/templates/compare/compare_diff.html:58
 #: rhodecode/templates/email_templates/commit_comment.mako:87
 #: rhodecode/templates/email_templates/pull_request_comment.mako:97
 msgid "Comment"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:154
+#: rhodecode/templates/changeset/changeset_file_comment.html:152
+#: rhodecode/templates/codeblocks/diffs.html:93
 msgid "You need to be logged in to comment."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:154
+#: rhodecode/templates/changeset/changeset_file_comment.html:152
+#: rhodecode/templates/codeblocks/diffs.html:93
 msgid "Login now"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:158
+#: rhodecode/templates/changeset/changeset_file_comment.html:156
 msgid "Hide"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:171
-#, python-format
-msgid "%d Pull Request Comment"
-msgid_plural "%d Pull Request Comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:173
-#, python-format
-msgid "%d Commit Comment"
-msgid_plural "%d Commit Comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:223
+#: rhodecode/templates/changeset/changeset_file_comment.html:198
 msgid "Merge Pull Request"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:243
+#: rhodecode/templates/changeset/changeset_file_comment.html:218
 msgid "Create a comment on this Pull Request."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:245
+#: rhodecode/templates/changeset/changeset_file_comment.html:220
 msgid "Create comments on this Commit range."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:247
+#: rhodecode/templates/changeset/changeset_file_comment.html:222
 msgid "Create a comment on this Commit."
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset_file_comment.html:259
+#: rhodecode/templates/pullrequests/pullrequest_show.html:14
+#: rhodecode/templates/pullrequests/pullrequest_show.html:141
+#: rhodecode/templates/pullrequests/pullrequests.html:52
+msgid "Closed"
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset_range.html:5
 #, python-format
 msgid "%s Commits"
@@ -7521,19 +7798,52 b' msgid "Show combined compare"'
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:7
+#: rhodecode/templates/codeblocks/diffs.html:148
+#: rhodecode/templates/codeblocks/diffs.html:211
 msgid "The requested commit is too big and content was truncated."
 msgstr ""
 
+#: rhodecode/templates/changeset/diff_block.html:7
+#: rhodecode/templates/changeset/diff_block.html:10
+#: rhodecode/templates/changeset/diff_block.html:25
+#: rhodecode/templates/changeset/diff_block.html:46
+#: rhodecode/templates/changeset/diff_block.html:59
+#: rhodecode/templates/codeblocks/diffs.html:151
+#: rhodecode/templates/codeblocks/diffs.html:211
+#: rhodecode/templates/files/file_diff.html:146
+msgid "Showing a big diff might take some time and resources, continue?"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:7
+#: rhodecode/templates/changeset/diff_block.html:10
+#: rhodecode/templates/changeset/diff_block.html:25
+#: rhodecode/templates/changeset/diff_block.html:46
+#: rhodecode/templates/codeblocks/diffs.html:151
+#: rhodecode/templates/codeblocks/diffs.html:211
+#: rhodecode/templates/files/file_diff.html:146
+msgid "Show full diff"
+msgstr ""
+
 #: rhodecode/templates/changeset/diff_block.html:10
 msgid "The requested file is too big and its content is not shown."
 msgstr ""
 
+#: rhodecode/templates/changeset/diff_block.html:25
+#: rhodecode/templates/changeset/diff_block.html:46
+#: rhodecode/templates/files/file_diff.html:146
+msgid "Diff was truncated. File content available only in full diff."
+msgstr ""
+
 #: rhodecode/templates/changeset/diff_block.html:64
+#: rhodecode/templates/codeblocks/diffs.html:329
+#: rhodecode/templates/codeblocks/diffs.html:345
 #, python-format
 msgid "Show file at commit: %(commit_id)s"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:69
+#: rhodecode/templates/codeblocks/diffs.html:336
+#: rhodecode/templates/codeblocks/diffs.html:352
 #, python-format
 msgid "File no longer present at commit: %(commit_id)s"
 msgstr ""
@@ -7563,12 +7873,99 b' msgstr[0] ""'
 msgstr[1] ""
 
 #: rhodecode/templates/changeset/diff_block.html:99
+#: rhodecode/templates/codeblocks/diffs.html:153
 #, python-format
 msgid "%(num)s file changed: %(linesadd)s inserted, %(linesdel)s deleted"
 msgid_plural "%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted"
 msgstr[0] ""
 msgstr[1] ""
 
+#: rhodecode/templates/codeblocks/diffs.html:137
+msgid "Browse Files at revision {}"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:138
+msgid "Browse Files"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:150
+#, python-format
+msgid "%(num)s file changed."
+msgid_plural "%(num)s files changed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/codeblocks/diffs.html:160
+msgid "No files"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:185
+msgid "File was deleted"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:187
+msgid "Binary file hidden"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:198
+#, python-format
+msgid "This diff has been collapsed as it changes many lines, (%i lines changed)"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:200
+msgid "Show them"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:203
+msgid "Hide them"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:331
+#: rhodecode/templates/codeblocks/diffs.html:338
+msgid "Show file before"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:347
+#: rhodecode/templates/codeblocks/diffs.html:354
+msgid "Show file after"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:383
+#: rhodecode/templates/files/file_diff.html:128
+msgid "Show comments"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:383
+#: rhodecode/templates/files/file_diff.html:129
+msgid "Hide comments"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:545
+msgid "View side by side"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:547
+msgid "Side by Side"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:551
+msgid "View unified"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:552
+msgid "Unified"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:561
+#: rhodecode/templates/files/file_diff.html:77
+msgid "Expand All"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.html:565
+#: rhodecode/templates/files/file_diff.html:77
+msgid "Collapse All"
+msgstr ""
+
 #: rhodecode/templates/compare/compare_commits.html:5
 msgid "No Commits"
 msgstr ""
@@ -7577,48 +7974,48 b' msgstr ""'
 msgid "Common Ancestor Commit"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_commits.html:20
+#: rhodecode/templates/compare/compare_commits.html:21
 msgid "Time"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:6
-#: rhodecode/templates/compare/compare_diff.html:8
+#: rhodecode/templates/compare/compare_diff.html:7
+#: rhodecode/templates/compare/compare_diff.html:9
 #, python-format
 msgid "%s Compare"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:16
+#: rhodecode/templates/compare/compare_diff.html:17
 #, python-format
 msgid "%s commit"
 msgid_plural "%s commits"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/compare/compare_diff.html:37
-#: rhodecode/templates/compare/compare_diff.html:55
+#: rhodecode/templates/compare/compare_diff.html:38
+#: rhodecode/templates/compare/compare_diff.html:56
 msgid "Compare Commits"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:46
-#: rhodecode/templates/email_templates/pull_request_review.mako:74
-#: rhodecode/templates/files/file_diff.html:56
-#: rhodecode/templates/pullrequests/pullrequest_show.html:85
-msgid "Target"
-msgstr ""
-
 #: rhodecode/templates/compare/compare_diff.html:47
+#: rhodecode/templates/email_templates/pull_request_review.mako:74
+#: rhodecode/templates/files/file_diff.html:56
+#: rhodecode/templates/pullrequests/pullrequest_show.html:95
+msgid "Target"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:48
 #: rhodecode/templates/email_templates/pull_request_comment.mako:93
 #: rhodecode/templates/email_templates/pull_request_review.mako:73
 #: rhodecode/templates/files/file_diff.html:62
-#: rhodecode/templates/files/files_source.html:19
+#: rhodecode/templates/files/files_source.html:20
 msgid "Source"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:53
+#: rhodecode/templates/compare/compare_diff.html:54
 msgid "Swap"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:245
+#: rhodecode/templates/compare/compare_diff.html:246
 msgid "Compare commits, branches, bookmarks or tags."
 msgstr ""
 
@@ -7642,52 +8039,52 b' msgstr ""'
 msgid "Repository creating in progress..."
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:84
+#: rhodecode/templates/data_table/_dt_elements.html:88
 msgid "No commits yet"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:91
-#: rhodecode/templates/data_table/_dt_elements.html:93
+#: rhodecode/templates/data_table/_dt_elements.html:95
+#: rhodecode/templates/data_table/_dt_elements.html:97
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:99
-#: rhodecode/templates/data_table/_dt_elements.html:101
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:129
+#: rhodecode/templates/data_table/_dt_elements.html:133
 msgid "Creating"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:131
+#: rhodecode/templates/data_table/_dt_elements.html:135
 msgid "Created"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:177
+#: rhodecode/templates/data_table/_dt_elements.html:185
 #, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:203
+#: rhodecode/templates/data_table/_dt_elements.html:211
 #, python-format
 msgid "Confirm to delete this user group: %s"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:220
+#: rhodecode/templates/data_table/_dt_elements.html:228
 msgid "User group"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:264
-#: rhodecode/templates/forks/fork.html:81
+#: rhodecode/templates/data_table/_dt_elements.html:272
+#: rhodecode/templates/forks/fork.html:83
 msgid "Private"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:289
+#: rhodecode/templates/data_table/_dt_elements.html:306
 #, python-format
 msgid "Pull request #%(pr_number)s"
 msgstr ""
@@ -7700,12 +8097,30 b' msgstr ""'
 msgid "Default"
 msgstr ""
 
+#: rhodecode/templates/debug_style/form-elements.html:513
+#: rhodecode/templates/debug_style/form-elements.html:565
+#: rhodecode/templates/debug_style/forms.html:236
+msgid "Chosen group members"
+msgstr ""
+
+#: rhodecode/templates/debug_style/form-elements.html:525
+#: rhodecode/templates/debug_style/form-elements.html:569
+#: rhodecode/templates/debug_style/forms.html:240
+msgid "Remove all elements"
+msgstr ""
+
 #: rhodecode/templates/debug_style/form-elements.html:535
-#: rhodecode/templates/debug_style/form-elements.html:585
+#: rhodecode/templates/debug_style/form-elements.html:579
 #: rhodecode/templates/debug_style/forms.html:250
 msgid "Available members"
 msgstr ""
 
+#: rhodecode/templates/debug_style/form-elements.html:543
+#: rhodecode/templates/debug_style/form-elements.html:587
+#: rhodecode/templates/debug_style/forms.html:258
+msgid "Add all elements"
+msgstr ""
+
 #: rhodecode/templates/debug_style/forms.html:119
 msgid "Some text..."
 msgstr ""
@@ -7744,50 +8159,54 b' msgid "Labels"'
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:59
-msgid "Tables"
+msgid "Alerts"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:60
-msgid "Tables wide"
+msgid "Tables"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:61
+msgid "Tables wide"
+msgstr ""
+
+#: rhodecode/templates/debug_style/index.html:62
 msgid "Collapsable Content"
 msgstr ""
 
-#: rhodecode/templates/debug_style/index.html:63
-msgid "Layout form with sidebar"
-msgstr ""
-
 #: rhodecode/templates/debug_style/index.html:64
-msgid "Login"
+msgid "Layout form with sidebar"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:65
-msgid "Login 2"
+msgid "Login"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:66
+msgid "Login 2"
+msgstr ""
+
+#: rhodecode/templates/debug_style/index.html:67
 msgid "Code blocks"
 msgstr ""
 
-#: rhodecode/templates/debug_style/index.html:69
+#: rhodecode/templates/debug_style/index.html:70
 msgid "Panels"
 msgstr ""
 
-#: rhodecode/templates/debug_style/index.html:72
-msgid "Form elements"
-msgstr ""
-
 #: rhodecode/templates/debug_style/index.html:73
-msgid "Form elements small"
+msgid "Form elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:74
-msgid "Form inline elements"
+msgid "Form elements small"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:75
+msgid "Form inline elements"
+msgstr ""
+
+#: rhodecode/templates/debug_style/index.html:76
 msgid "Form vertical"
 msgstr ""
 
@@ -7989,7 +8408,7 b' msgstr ""'
 msgid "Profile"
 msgstr ""
 
-#: rhodecode/templates/errors/error_document.html:39
+#: rhodecode/templates/errors/error_document.html:44
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
@@ -8000,8 +8419,6 b' msgid "%(user)s commited on %(date)s UTC'
 msgstr ""
 
 #: rhodecode/templates/feed/atom_feed_entry.mako:26
-#: rhodecode/templates/pullrequests/pullrequest_show.html:390
-#: rhodecode/templates/pullrequests/pullrequest_show.html:396
 msgid "Commit was too big and was cut off..."
 msgstr ""
 
@@ -8112,11 +8529,6 b' msgid "Filename"'
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:54
-#: rhodecode/templates/files/files_add.html:65
-msgid "or"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.html:54
 msgid "Upload File"
 msgstr ""
 
@@ -8198,13 +8610,13 b' msgid "Delete file"'
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.html:45
-#: rhodecode/templates/files/files_source.html:50
+#: rhodecode/templates/files/files_source.html:51
 #, python-format
 msgid "Binary file (%s)"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.html:50
-#: rhodecode/templates/files/files_source.html:62
+#: rhodecode/templates/files/files_source.html:73
 msgid "File is too big to display"
 msgstr ""
 
@@ -8267,51 +8679,51 b' msgstr ""'
 msgid "Location"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:6
+#: rhodecode/templates/files/files_source.html:7
 #: rhodecode/templates/search/search_content.html:57
 msgid "line"
 msgid_plural "lines"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/files/files_source.html:13
+#: rhodecode/templates/files/files_source.html:14
 msgid "History"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:16
+#: rhodecode/templates/files/files_source.html:17
 #: rhodecode/templates/search/search_content.html:68
 msgid "Show Full History"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:21
+#: rhodecode/templates/files/files_source.html:22
 #: rhodecode/templates/search/search_content.html:70
 msgid "Annotation"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:23
+#: rhodecode/templates/files/files_source.html:24
 #: rhodecode/templates/search/search_content.html:71
 msgid "Raw"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:25
+#: rhodecode/templates/files/files_source.html:26
 #: rhodecode/templates/search/search_content.html:73
 msgid "Download"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:32
+#: rhodecode/templates/files/files_source.html:33
 #, python-format
 msgid "Edit on Branch:%s"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:37
+#: rhodecode/templates/files/files_source.html:38
 msgid "Editing binary files not allowed"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:40
-msgid "Editing files allowed only when on branch head commit"
-msgstr ""
-
 #: rhodecode/templates/files/files_source.html:41
+msgid "Editing files allowed only when on branch head commit"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:42
 msgid "Deleting files allowed only when on branch head commit"
 msgstr ""
 
@@ -8346,15 +8758,15 b' msgstr ""'
 msgid "Fork name"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:91
+#: rhodecode/templates/forks/fork.html:93
 msgid "Copy permissions"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:95
+#: rhodecode/templates/forks/fork.html:97
 msgid "Copy permissions from forked repository"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:100
+#: rhodecode/templates/forks/fork.html:102
 msgid "Fork this Repository"
 msgstr ""
 
@@ -8434,44 +8846,44 b' msgid "Submit Pull Request"'
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:109
-#: rhodecode/templates/pullrequests/pullrequest_show.html:182
+#: rhodecode/templates/pullrequests/pullrequest_show.html:211
 msgid "Pull request reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:117
-#: rhodecode/templates/pullrequests/pullrequest_show.html:215
+#: rhodecode/templates/pullrequests/pullrequest.html:119
+#: rhodecode/templates/pullrequests/pullrequest_show.html:255
 msgid "Add reviewer"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:279
-#: rhodecode/templates/pullrequests/pullrequest.html:521
+#: rhodecode/templates/pullrequests/pullrequest.html:281
+#: rhodecode/templates/pullrequests/pullrequest.html:548
 msgid "Please select origin and destination"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:285
+#: rhodecode/templates/pullrequests/pullrequest.html:287
 msgid "Loading compare ..."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:332
 #: rhodecode/templates/pullrequests/pullrequest.html:334
+#: rhodecode/templates/pullrequests/pullrequest.html:336
 msgid "This pull request will consist of __COMMITS__ commit."
 msgid_plural "This pull request will consist of __COMMITS__ commits."
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:337
+#: rhodecode/templates/pullrequests/pullrequest.html:339
 msgid "Show detailed compare."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:344
+#: rhodecode/templates/pullrequests/pullrequest.html:346
 msgid "There are no commits to merge."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:451
+#: rhodecode/templates/pullrequests/pullrequest.html:446
 msgid "Destination repository"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:462
+#: rhodecode/templates/pullrequests/pullrequest.html:457
 msgid "Select commit reference"
 msgstr ""
 
@@ -8484,95 +8896,84 b' msgstr ""'
 msgid "From"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:51
-#: rhodecode/templates/pullrequests/pullrequest_show.html:185
-msgid "Close"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:58
+#: rhodecode/templates/pullrequests/pullrequest_show.html:54
+msgid "Confirm to delete this pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:61
+msgid "Cancel edit"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:68
 msgid "Origin"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:105
+#: rhodecode/templates/pullrequests/pullrequest_show.html:134
 msgid "Review"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:116
+#: rhodecode/templates/pullrequests/pullrequest_show.html:145
 #, python-format
 msgid "calculated based on %s reviewer vote"
 msgid_plural "calculated based on %s reviewers votes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:139
-#: rhodecode/templates/pullrequests/pullrequest_show.html:141
+#: rhodecode/templates/pullrequests/pullrequest_show.html:168
+#: rhodecode/templates/pullrequests/pullrequest_show.html:170
 #, python-format
 msgid "%d Pull request comment"
 msgid_plural "%d Pull request comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:151
+#: rhodecode/templates/pullrequests/pullrequest_show.html:180
 #, python-format
 msgid "%d Outdated Comment"
 msgid_plural "%d Outdated Comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:151
+#: rhodecode/templates/pullrequests/pullrequest_show.html:180
 msgid "(Show)"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:160
-#: rhodecode/templates/pullrequests/pullrequest_show.html:219
+#: rhodecode/templates/pullrequests/pullrequest_show.html:189
+#: rhodecode/templates/pullrequests/pullrequest_show.html:259
 msgid "Save Changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:199
-msgid "reviewer"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:236
+#: rhodecode/templates/pullrequests/pullrequest_show.html:276
 msgid "Missing requirements:"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:237
+#: rhodecode/templates/pullrequests/pullrequest_show.html:277
 msgid "These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:245
+#: rhodecode/templates/pullrequests/pullrequest_show.html:285
 msgid "Missing commits"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:246
+#: rhodecode/templates/pullrequests/pullrequest_show.html:286
 msgid "This pull request cannot be displayed, because one or more commits no longer exist in the source repository."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:247
+#: rhodecode/templates/pullrequests/pullrequest_show.html:287
 msgid "Please update this pull request, push the commits back into the source repository, or consider closing this pull request."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:254
+#: rhodecode/templates/pullrequests/pullrequest_show.html:294
 msgid "Update commits"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:257
+#: rhodecode/templates/pullrequests/pullrequest_show.html:297
 #, python-format
 msgid "Compare View: %s commit"
 msgid_plural "Compare View: %s commits"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:334
-#: rhodecode/templates/pullrequests/pullrequest_show.html:369
-msgid "Outdated Inline Comments"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:390
-#: rhodecode/templates/pullrequests/pullrequest_show.html:396
-msgid "Showing a huge diff might take some time and resources"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequests.html:4
 #, python-format
 msgid "%s Pull Requests"