release: merge back stable branch into default

.hgtags

@@ -5,3 +5,4 b' 7fd5c850745e2ea821fb4406af5f4bff9b0a7526'
 41c87da28a179953df86061d817bc35533c66dd2 v4.1.2
 baaf9f5bcea3bae0ef12ae20c8b270482e62abb6 v4.2.0
 32a70c7e56844a825f61df496ee5eaf8c3c4e189 v4.2.1
+fa695cdb411d294679ac081d595ac654e5613b03 v4.3.0

pkgs/python-packages.nix

@@ -754,7 +754,7 b''
     };
   };
   gprof2dot = super.buildPythonPackage {
-    name = "gprof2dot-2015.12.01";
+    name = "gprof2dot-2015.12.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];

rhodecode/i18n/be/LC_MESSAGES/rhodecode.po

@@ -7,8 +7,8 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2016-06-28 10:55+0000\n"
-"PO-Revision-Date: 2016-06-28 10:56+0000\n"
+"POT-Creation-Date: 2016-08-02 20:55+0000\n"
+"PO-Revision-Date: 2016-08-02 20:57+0000\n"
 "Last-Translator: Marcin Kuzminski <[e-mail]>\n"
 "Language-Team: Belarusian (http://www.transifex.com/rhodecode/RhodeCode/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -18,17 +18,81 b' msgstr ""'
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: rhodecode/authentication/routes.py:60
-#: rhodecode/controllers/admin/settings.py:844
+#: rhodecode/admin/navigation.py:74 rhodecode/authentication/routes.py:60
+#: rhodecode/integrations/views.py:126
 #: rhodecode/templates/admin/permissions/permissions.html:36
 msgid "Global"
 msgstr ""
 
+#: rhodecode/admin/navigation.py:75
+#: rhodecode/templates/admin/repos/repo_edit.html:52
+msgid "VCS"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:76
+msgid "Visual"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:77
+msgid "Remap and Rescan"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:78
+#: rhodecode/templates/admin/repos/repo_edit.html:58
+msgid "Issue Tracker"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:80 rhodecode/templates/register.html:76
+#: 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/email_templates/user_registration.mako:25
+#: rhodecode/templates/users/user_profile.html:51
+msgid "Email"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:81
+msgid "Hooks"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:82
+msgid "Full Text Search"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:83
+#: rhodecode/templates/admin/integrations/base.html:21
+#: rhodecode/templates/admin/integrations/edit.html:8
+#: rhodecode/templates/admin/integrations/edit.html:19
+#: rhodecode/templates/admin/integrations/list.html:15
+#: rhodecode/templates/admin/integrations/list.html:19
+#: rhodecode/templates/admin/integrations/list.html:26
+#: rhodecode/templates/admin/repos/repo_edit.html:72
+#: rhodecode/templates/base/base.html:84
+msgid "Integrations"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:85
+#: rhodecode/templates/admin/settings/settings_system.html:47
+msgid "System Info"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:86
+msgid "Open Source Licenses"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:93
+msgid "Labs"
+msgstr ""
+
 #: rhodecode/authentication/schema.py:35
 msgid "Enable or disable this authentication plugin."
 msgstr ""
 
-#: rhodecode/authentication/schema.py:37
+#: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:37
+#: rhodecode/templates/admin/integrations/list.html:62
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:14
 msgid "Enabled"
 msgstr ""
 
@@ -43,20 +107,20 b' msgstr ""'
 msgid "Auth Cache TTL"
 msgstr ""
 
-#: rhodecode/authentication/views.py:88
+#: rhodecode/authentication/views.py:90
 msgid ""
 "Errors exist when saving plugin settings. Please check the form inputs."
 msgstr ""
 
-#: rhodecode/authentication/views.py:101 rhodecode/authentication/views.py:170
+#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:172
 msgid "Auth settings updated successfully."
 msgstr ""
 
-#: rhodecode/authentication/views.py:175
+#: rhodecode/authentication/views.py:177
 msgid "Errors exist when saving plugin setting. Please check the form inputs."
 msgstr ""
 
-#: rhodecode/authentication/views.py:185
+#: rhodecode/authentication/views.py:187
 msgid "Error occurred during update of auth settings."
 msgstr ""
 
@@ -179,7 +243,7 b' msgstr ""'
 #: rhodecode/templates/login.html:50 rhodecode/templates/register.html:48
 #: rhodecode/templates/admin/my_account/my_account.html:30
 #: rhodecode/templates/admin/users/user_add.html:44
-#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:315
 #: rhodecode/templates/debug_style/login.html:45
 msgid "Password"
 msgstr ""
@@ -228,12 +292,12 b' msgstr ""'
 msgid "LDAP Attribute to map to user name"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:144
-msgid "The LDAP Login attribute of the CN must be specified"
+#: rhodecode/authentication/plugins/auth_ldap.py:145
+msgid "Login Attribute"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:146
-msgid "Login Attribute"
+msgid "The LDAP Login attribute of the CN must be specified"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:151
@@ -260,7 +324,7 b' msgstr ""'
 msgid "Email Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:348
+#: rhodecode/authentication/plugins/auth_ldap.py:351
 msgid "LDAP"
 msgstr ""
 
@@ -294,7 +358,7 b' msgid "Rhodecode Token Auth"'
 msgstr ""
 
 #: rhodecode/controllers/changelog.py:90 rhodecode/controllers/compare.py:63
-#: rhodecode/controllers/pullrequests.py:279
+#: rhodecode/controllers/pullrequests.py:280
 msgid "There are no commits yet"
 msgstr ""
 
@@ -330,8 +394,8 b' msgid "No such commit exists for this re'
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:335
-#: rhodecode/controllers/pullrequests.py:746
-#: rhodecode/model/pull_request.py:836
+#: rhodecode/controllers/pullrequests.py:750
+#: rhodecode/model/pull_request.py:843
 #, python-format
 msgid "Status change %(transition_icon)s %(status)s"
 msgstr ""
@@ -390,102 +454,102 b' msgstr ""'
 msgid "There are no files yet. %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:390 rhodecode/controllers/files.py:443
-#: rhodecode/controllers/files.py:474 rhodecode/controllers/files.py:549
-#: rhodecode/controllers/files.py:594 rhodecode/controllers/files.py:685
+#: 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
 #, python-format
 msgid "This repository has been locked by %s on %s"
 msgstr ""
 
+#: rhodecode/controllers/files.py:389 rhodecode/controllers/files.py:442
+msgid "You can only delete files with revision being a valid branch "
+msgstr ""
+
 #: rhodecode/controllers/files.py:398 rhodecode/controllers/files.py:451
-msgid "You can only delete files with revision being a valid branch "
-msgstr ""
-
-#: rhodecode/controllers/files.py:407 rhodecode/controllers/files.py:460
 #, python-format
 msgid "Deleted file %s via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/controllers/files.py:427
+#: rhodecode/controllers/files.py:418
 #, python-format
 msgid "Successfully deleted file %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:430 rhodecode/controllers/files.py:536
-#: rhodecode/controllers/files.py:673
+#: rhodecode/controllers/files.py:421 rhodecode/controllers/files.py:527
+#: rhodecode/controllers/files.py:664
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/controllers/files.py:482 rhodecode/controllers/files.py:557
+#: rhodecode/controllers/files.py:473 rhodecode/controllers/files.py:548
 msgid "You can only edit files with revision being a valid branch "
 msgstr ""
 
-#: rhodecode/controllers/files.py:494 rhodecode/controllers/files.py:569
+#: rhodecode/controllers/files.py:485 rhodecode/controllers/files.py:560
 #, python-format
 msgid "Edited file %s via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/controllers/files.py:511
+#: rhodecode/controllers/files.py:502
 msgid "No changes"
 msgstr ""
 
-#: rhodecode/controllers/files.py:533 rhodecode/controllers/files.py:662
+#: rhodecode/controllers/files.py:524 rhodecode/controllers/files.py:653
 #, python-format
 msgid "Successfully committed to %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:607 rhodecode/controllers/files.py:696
+#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:687
 msgid "Added file via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/controllers/files.py:632
+#: rhodecode/controllers/files.py:623
 msgid "No filename"
 msgstr ""
 
-#: rhodecode/controllers/files.py:665
+#: rhodecode/controllers/files.py:656
 msgid ""
 "The location specified must be a relative path and must not contain .. in "
 "the path"
 msgstr ""
 
-#: rhodecode/controllers/files.py:719
+#: rhodecode/controllers/files.py:710
 msgid "Downloads disabled"
 msgstr ""
 
-#: rhodecode/controllers/files.py:725
+#: rhodecode/controllers/files.py:716
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:727
+#: rhodecode/controllers/files.py:718
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/controllers/files.py:729 rhodecode/controllers/files.py:763
+#: rhodecode/controllers/files.py:720 rhodecode/controllers/files.py:754
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/controllers/files.py:930
+#: rhodecode/controllers/files.py:921
 #, python-format
 msgid "Commit %(commit)s does not exist."
 msgstr ""
 
-#: rhodecode/controllers/files.py:947
+#: rhodecode/controllers/files.py:938
 #, python-format
 msgid "%(file_path)s has not changed between %(commit_1)s and %(commit_2)s."
 msgstr ""
 
-#: rhodecode/controllers/files.py:1014
+#: rhodecode/controllers/files.py:1005
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:1035 rhodecode/controllers/summary.py:256
-#: rhodecode/model/pull_request.py:1051 rhodecode/model/scm.py:783
+#: rhodecode/controllers/files.py:1026 rhodecode/controllers/summary.py:251
+#: rhodecode/model/pull_request.py:1059 rhodecode/model/scm.py:780
 #: rhodecode/templates/base/vcs_settings.html:138
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:1039 rhodecode/model/scm.py:798
+#: rhodecode/controllers/files.py:1030 rhodecode/model/scm.py:795
 #: rhodecode/templates/base/vcs_settings.html:163
 msgid "Tags"
 msgstr ""
@@ -500,14 +564,14 b' msgid "Groups"'
 msgstr ""
 
 #: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247
-#: rhodecode/controllers/pullrequests.py:382
+#: rhodecode/controllers/pullrequests.py:383
 #: 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:79
-#: rhodecode/templates/base/base.html:149
-#: rhodecode/templates/base/base.html:626
+#: rhodecode/templates/base/base.html:78
+#: rhodecode/templates/base/base.html:150
+#: rhodecode/templates/base/base.html:627
 msgid "Repositories"
 msgstr ""
 
@@ -524,98 +588,98 b' msgstr ""'
 msgid "journal"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:293
+#: rhodecode/controllers/pullrequests.py:294
 msgid "Commit does not exist"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:405
+#: rhodecode/controllers/pullrequests.py:406
 msgid "Pull request requires a title with min. 3 chars"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:407
+#: rhodecode/controllers/pullrequests.py:408
 msgid "Error creating pull request: {}"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:454
+#: rhodecode/controllers/pullrequests.py:455
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:457
+#: rhodecode/controllers/pullrequests.py:458
 msgid "Error occurred during sending pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:497
+#: rhodecode/controllers/pullrequests.py:498
 msgid "Cannot update closed pull requests."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:503
+#: rhodecode/controllers/pullrequests.py:504
 msgid "Pull request title & description updated."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:513
+#: rhodecode/controllers/pullrequests.py:514
 msgid ""
 "Pull request updated to \"{source_commit_id}\" with {count_added} added, "
 "{count_removed} removed commits."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:523
+#: rhodecode/controllers/pullrequests.py:524
 msgid "Nothing changed in pull request."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:526
+#: rhodecode/controllers/pullrequests.py:527
 msgid ""
 "Skipping update of pull request due to reference type: {reference_type}"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:533
+#: rhodecode/controllers/pullrequests.py:534
 msgid "Update failed due to missing commits."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:579
+#: rhodecode/controllers/pullrequests.py:580
 msgid "Pull request reviewer approval is pending."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:593
+#: rhodecode/controllers/pullrequests.py:594
 msgid "Pull request was successfully merged and closed."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:631
+#: rhodecode/controllers/pullrequests.py:632
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:664
+#: rhodecode/controllers/pullrequests.py:668
 msgid "Reviewer approval is pending."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:706
+#: rhodecode/controllers/pullrequests.py:710
 msgid "Close Pull Request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:750
-#: rhodecode/model/pull_request.py:840
+#: rhodecode/controllers/pullrequests.py:754
+#: rhodecode/model/pull_request.py:847
 msgid "Closing with"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:795
+#: rhodecode/controllers/pullrequests.py:802
 #, python-format
 msgid ""
 "Closing pull request on other statuses than rejected or approved is "
 "forbidden. Calculated status from all reviewers is currently: %s"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:240
+#: rhodecode/controllers/summary.py:235
 msgid "Branch"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:241
+#: rhodecode/controllers/summary.py:236
 msgid "Tag"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:242
+#: rhodecode/controllers/summary.py:237
 msgid "Bookmark"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:257
+#: rhodecode/controllers/summary.py:252
 msgid "Closed branches"
 msgstr ""
 
@@ -627,83 +691,87 b' msgstr ""'
 msgid "Error occurred during update of default values"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:59
+#: rhodecode/controllers/admin/gists.py:63
 #: rhodecode/controllers/admin/my_account.py:307
-#: rhodecode/controllers/admin/users.py:436
+#: rhodecode/controllers/admin/users.py:431
 msgid "forever"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:60
+#: rhodecode/controllers/admin/gists.py:64
 #: rhodecode/controllers/admin/my_account.py:308
-#: rhodecode/controllers/admin/users.py:437
+#: rhodecode/controllers/admin/users.py:432
 msgid "5 minutes"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:61
+#: rhodecode/controllers/admin/gists.py:65
 #: rhodecode/controllers/admin/my_account.py:309
-#: rhodecode/controllers/admin/users.py:438
+#: rhodecode/controllers/admin/users.py:433
 msgid "1 hour"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/gists.py:66
 #: rhodecode/controllers/admin/my_account.py:310
-#: rhodecode/controllers/admin/users.py:439
+#: rhodecode/controllers/admin/users.py:434
 msgid "1 day"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:63
-#: rhodecode/controllers/admin/my_account.py:311
-#: rhodecode/controllers/admin/users.py:440
-msgid "1 month"
-msgstr ""
-
 #: rhodecode/controllers/admin/gists.py:67
+#: rhodecode/controllers/admin/my_account.py:311
+#: rhodecode/controllers/admin/users.py:435
+msgid "1 month"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:71
 #: rhodecode/controllers/admin/my_account.py:313
-#: rhodecode/controllers/admin/users.py:442
+#: rhodecode/controllers/admin/users.py:437
 msgid "Lifetime"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:69
+#: rhodecode/controllers/admin/gists.py:73
 msgid "Requires registered account"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:70
+#: rhodecode/controllers/admin/gists.py:74
 msgid "Can be accessed by anonymous users"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:180
+#: rhodecode/controllers/admin/gists.py:200
 msgid "Error occurred during gist creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:211
+#: rhodecode/controllers/admin/gists.py:231
 #, python-format
 msgid "Deleted gist %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:284
+#: rhodecode/controllers/admin/gists.py:308
 msgid "Successfully updated gist content"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:289
+#: rhodecode/controllers/admin/gists.py:313
 msgid "Successfully updated gist data"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:292
+#: rhodecode/controllers/admin/gists.py:316
+msgid "Error occurred during update of gist {}: {}"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:320
 #, python-format
 msgid "Error occurred during update of gist %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:315
+#: rhodecode/controllers/admin/gists.py:343
 #: 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:253
+#: rhodecode/templates/data_table/_dt_elements.html:255
 msgid "never"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:320
+#: rhodecode/controllers/admin/gists.py:348
 #, python-format
 msgid "%(expiry)s - current value"
 msgstr ""
@@ -717,7 +785,7 b' msgid "Your account was updated successf'
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:143
-#: rhodecode/controllers/admin/users.py:223
+#: rhodecode/controllers/admin/users.py:218
 #, python-format
 msgid "Error occurred during update of user %s"
 msgstr ""
@@ -731,38 +799,38 b' msgid "Error occurred during update of u'
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:261
-#: rhodecode/controllers/admin/users.py:616
+#: rhodecode/controllers/admin/users.py:611
 #, python-format
 msgid "Added new email address `%s` for user account"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:268
-#: rhodecode/controllers/admin/users.py:623
+#: rhodecode/controllers/admin/users.py:618
 msgid "An error occurred during email saving"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:278
-#: rhodecode/controllers/admin/users.py:638
+#: rhodecode/controllers/admin/users.py:633
 msgid "Removed email address from user account"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:316
-#: rhodecode/controllers/admin/users.py:445
+#: rhodecode/controllers/admin/users.py:440
 msgid "Role"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:329
-#: rhodecode/controllers/admin/users.py:469
+#: rhodecode/controllers/admin/users.py:464
 msgid "Auth token successfully created"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:342
-#: rhodecode/controllers/admin/users.py:488
+#: rhodecode/controllers/admin/users.py:483
 msgid "Auth token successfully reset"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:346
-#: rhodecode/controllers/admin/users.py:492
+#: rhodecode/controllers/admin/users.py:487
 msgid "Auth token successfully deleted"
 msgstr ""
 
@@ -841,309 +909,250 b' msgstr ""'
 msgid "Repository Group permissions updated"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:128
+#: rhodecode/controllers/admin/repos.py:129
 #, python-format
 msgid "Error creating repository %s: invalid certificate"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:132
+#: rhodecode/controllers/admin/repos.py:133
 #, python-format
 msgid "Error creating repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:264
+#: rhodecode/controllers/admin/repos.py:265
 #, python-format
 msgid "Created repository %s from %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:273
+#: rhodecode/controllers/admin/repos.py:274
 #, python-format
 msgid "Forked repository %s as %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:276
+#: rhodecode/controllers/admin/repos.py:277
 #, python-format
 msgid "Created repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:318
+#: rhodecode/controllers/admin/repos.py:319
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:337
+#: rhodecode/controllers/admin/repos.py:338
 #, python-format
 msgid "Error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:365
+#: rhodecode/controllers/admin/repos.py:366
 #, python-format
 msgid "Detached %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:368
+#: rhodecode/controllers/admin/repos.py:369
 #, python-format
 msgid "Deleted %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:373
+#: rhodecode/controllers/admin/repos.py:374
 #, python-format
 msgid "Deleted repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:376
+#: rhodecode/controllers/admin/repos.py:377
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:381
+#: rhodecode/controllers/admin/repos.py:382
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:435
+#: rhodecode/controllers/admin/repos.py:436
 msgid "Repository permissions updated"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:466
+#: rhodecode/controllers/admin/repos.py:467
 msgid "An error occurred during creation of field"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:481
+#: rhodecode/controllers/admin/repos.py:482
 msgid "An error occurred during removal of field"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:520
+#: rhodecode/controllers/admin/repos.py:521
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:524
+#: rhodecode/controllers/admin/repos.py:525
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:548
+#: rhodecode/controllers/admin/repos.py:549
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:550
+#: rhodecode/controllers/admin/repos.py:551
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:557
+#: rhodecode/controllers/admin/repos.py:558
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:575
+#: rhodecode/controllers/admin/repos.py:576
 msgid "Locked repository"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:578
+#: rhodecode/controllers/admin/repos.py:579
 msgid "Unlocked repository"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:581
-#: rhodecode/controllers/admin/repos.py:610
+#: rhodecode/controllers/admin/repos.py:582
+#: rhodecode/controllers/admin/repos.py:611
 msgid "An error occurred during unlocking"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:600
+#: rhodecode/controllers/admin/repos.py:601
 msgid "Unlocked"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:604
+#: rhodecode/controllers/admin/repos.py:605
 msgid "Locked"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:606
+#: rhodecode/controllers/admin/repos.py:607
 #, python-format
 msgid "Repository has been %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:621
+#: rhodecode/controllers/admin/repos.py:622
 msgid "Cache invalidation successful"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:625
+#: rhodecode/controllers/admin/repos.py:626
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:645
+#: rhodecode/controllers/admin/repos.py:646
 msgid "Pulled from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:648
+#: rhodecode/controllers/admin/repos.py:649
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:670
+#: rhodecode/controllers/admin/repos.py:671
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:717
+#: rhodecode/controllers/admin/repos.py:718
 msgid "Error occurred during deleting issue tracker entry"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:720
-#: rhodecode/controllers/admin/settings.py:362
+#: rhodecode/controllers/admin/repos.py:721
+#: rhodecode/controllers/admin/settings.py:363
 msgid "Removed issue tracker entry"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:750
-#: rhodecode/controllers/admin/settings.py:408
+#: rhodecode/controllers/admin/repos.py:751
+#: rhodecode/controllers/admin/settings.py:409
 msgid "Updated issue tracker entries"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:809
-#: rhodecode/controllers/admin/settings.py:141
-#: rhodecode/controllers/admin/settings.py:718
+#: rhodecode/controllers/admin/repos.py:812
+#: rhodecode/controllers/admin/settings.py:142
+#: rhodecode/controllers/admin/settings.py:719
 msgid "Some form inputs contain invalid data."
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:827
+#: rhodecode/controllers/admin/repos.py:830
 msgid "Error occurred during updating repository VCS settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:831
-#: rhodecode/controllers/admin/settings.py:167
+#: rhodecode/controllers/admin/repos.py:834
+#: rhodecode/controllers/admin/settings.py:168
 msgid "Updated VCS settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:163
-#: rhodecode/controllers/admin/settings.py:266
+#: rhodecode/controllers/admin/settings.py:164
+#: rhodecode/controllers/admin/settings.py:267
 msgid "Error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:210
+#: rhodecode/controllers/admin/settings.py:211
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:262
+#: rhodecode/controllers/admin/settings.py:263
 msgid "Updated application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:326
+#: rhodecode/controllers/admin/settings.py:327
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:329
+#: rhodecode/controllers/admin/settings.py:330
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:421
+#: rhodecode/controllers/admin/settings.py:422
 msgid "Please enter email address"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:439
+#: rhodecode/controllers/admin/settings.py:440
 msgid "Send email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:472
+#: rhodecode/controllers/admin/settings.py:473
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:487
+#: rhodecode/controllers/admin/settings.py:488
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:491
+#: rhodecode/controllers/admin/settings.py:492
 msgid "Error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:539
+#: rhodecode/controllers/admin/settings.py:540
 #, python-format
 msgid "Critical: your disk space is very low <b>%s%%</b> usedpercent"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:543
+#: rhodecode/controllers/admin/settings.py:544
 #, python-format
 msgid "Warning: your disk space is running low <b>%s%%</b> usedpercent"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:739
+#: rhodecode/controllers/admin/settings.py:740
 msgid "Error occurred during updating labs settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:744
+#: rhodecode/controllers/admin/settings.py:745
 msgid "Updated Labs settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:794
-msgid "Mercurial server-side merge"
-msgstr ""
-
 #: rhodecode/controllers/admin/settings.py:795
-msgid ""
-"Use rebase instead of creating a merge commit when merging via web interface"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:801
 msgid "Subversion HTTP Support"
 msgstr ""
 
+#: rhodecode/controllers/admin/settings.py:796
+msgid "Proxy subversion HTTP requests"
+msgstr ""
+
 #: rhodecode/controllers/admin/settings.py:802
-msgid "Proxy subversion HTTP requests"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:808
 msgid "Subversion HTTP Server URL"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:810
+#: rhodecode/controllers/admin/settings.py:804
 msgid "e.g. http://localhost:8080/"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:845
-#: rhodecode/templates/admin/repos/repo_edit.html:48
-msgid "VCS"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:846
-msgid "Visual"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:847
-msgid "Remap and Rescan"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:849
-#: rhodecode/templates/admin/repos/repo_edit.html:54
-msgid "Issue Tracker"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:851
-#: rhodecode/templates/register.html:76
-#: 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:91
-#: rhodecode/templates/users/user_profile.html:51
-msgid "Email"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:852
-msgid "Hooks"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:853
-msgid "Full Text Search"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:855
-#: rhodecode/templates/admin/settings/settings_system.html:47
-msgid "System Info"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:857
-msgid "Open Source Licenses"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:875
-msgid "Labs"
-msgstr ""
-
 #: rhodecode/controllers/admin/user_groups.py:168
 #, python-format
 msgid "Created user group %(user_group_link)s"
@@ -1185,123 +1194,286 b' msgid "User Group global permissions upd'
 msgstr ""
 
 #: rhodecode/controllers/admin/user_groups.py:440
-#: rhodecode/controllers/admin/users.py:566
+#: rhodecode/controllers/admin/users.py:561
 msgid "An error occurred during permissions saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:147
+#: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "Created user %(user_link)s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:162
+#: rhodecode/controllers/admin/users.py:157
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:206
+#: rhodecode/controllers/admin/users.py:201
 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 "Detached %s repositories"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:262
-#, python-format
 msgid "Deleted %s repositories"
 msgstr ""
 
+#: rhodecode/controllers/admin/users.py:265
+#, python-format
+msgid "Detached %s repository groups"
+msgstr ""
+
 #: rhodecode/controllers/admin/users.py:270
 #, python-format
-msgid "Detached %s repository groups"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:275
-#, python-format
 msgid "Deleted %s repository groups"
 msgstr ""
 
+#: rhodecode/controllers/admin/users.py:278
+#, python-format
+msgid "Detached %s user groups"
+msgstr ""
+
 #: rhodecode/controllers/admin/users.py:283
 #, python-format
-msgid "Detached %s user groups"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:288
-#, python-format
 msgid "Deleted %s user groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:299
+#: rhodecode/controllers/admin/users.py:294
 msgid "Successfully deleted user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:305
+#: rhodecode/controllers/admin/users.py:300
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:324
+#: rhodecode/controllers/admin/users.py:319
 msgid "Force password change disabled for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:326
+#: rhodecode/controllers/admin/users.py:321
 msgid "Force password change enabled for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:330
+#: rhodecode/controllers/admin/users.py:325
 msgid "An error occurred during password reset for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:356
+#: rhodecode/controllers/admin/users.py:351
 #, python-format
 msgid "Created repository group `%s`"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:360
+#: rhodecode/controllers/admin/users.py:355
 msgid "An error occurred during repository group creation for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:379
-#: rhodecode/controllers/admin/users.py:400
-#: rhodecode/controllers/admin/users.py:430
-#: rhodecode/controllers/admin/users.py:461
-#: rhodecode/controllers/admin/users.py:478
-#: rhodecode/controllers/admin/users.py:501
-#: rhodecode/controllers/admin/users.py:575
-#: rhodecode/controllers/admin/users.py:588
-#: rhodecode/controllers/admin/users.py:646
+#: 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
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:414
+#: rhodecode/controllers/admin/users.py:409
 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:550
+#: rhodecode/controllers/admin/users.py:545
 msgid "User global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:678
+#: rhodecode/controllers/admin/users.py:673
 #, python-format
 msgid "An error occurred during ip saving:%s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:693
+#: rhodecode/controllers/admin/users.py:688
 msgid "An error occurred during ip saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:697
+#: rhodecode/controllers/admin/users.py:692
 #, python-format
 msgid "Added ips %s to user whitelist"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:715
+#: rhodecode/controllers/admin/users.py:710
 msgid "Removed ip address from user whitelist"
 msgstr ""
 
+#: rhodecode/events/pullrequest.py:65
+msgid "pullrequest created"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:74
+msgid "pullrequest closed"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:83
+msgid "pullrequest commits updated"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:92
+msgid "pullrequest review changed"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:101
+msgid "pullrequest merged"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:110
+msgid "pullrequest commented"
+msgstr ""
+
+#: rhodecode/events/repo.py:135
+msgid "repository pre create"
+msgstr ""
+
+#: rhodecode/events/repo.py:144
+msgid "repository created"
+msgstr ""
+
+#: rhodecode/events/repo.py:153
+msgid "repository pre delete"
+msgstr ""
+
+#: rhodecode/events/repo.py:162
+msgid "repository deleted"
+msgstr ""
+
+#: rhodecode/events/repo.py:193
+msgid "repository pre pull"
+msgstr ""
+
+#: rhodecode/events/repo.py:202
+msgid "repository pull"
+msgstr ""
+
+#: rhodecode/events/repo.py:211
+msgid "repository pre push"
+msgstr ""
+
+#: rhodecode/events/repo.py:222
+msgid "repository push"
+msgstr ""
+
+#: rhodecode/events/user.py:34
+msgid "user registered"
+msgstr ""
+
+#: rhodecode/events/user.py:48
+msgid "user pre create"
+msgstr ""
+
+#: rhodecode/events/user.py:61
+msgid "user pre update"
+msgstr ""
+
+#: rhodecode/integrations/schema.py:35
+msgid "Enable or disable this integration."
+msgstr ""
+
+#: rhodecode/integrations/schema.py:42
+msgid "Short name for this integration."
+msgstr ""
+
+#: rhodecode/integrations/schema.py:44
+msgid "Integration name"
+msgstr ""
+
+#: rhodecode/integrations/views.py:172
+msgid "Integration {integration_name} deleted successfully."
+msgstr ""
+
+#: rhodecode/integrations/views.py:200
+msgid ""
+"Errors exist when saving integration settings. Please check the form inputs."
+msgstr ""
+
+#: rhodecode/integrations/views.py:220
+msgid "Integration {integration_name} updated successfully."
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:45
+msgid "Slack service URL"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:46
+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:59 rhodecode/templates/login.html:43
+#: rhodecode/templates/register.html:41
+#: 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/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/debug_style/login.html:36
+#: rhodecode/templates/email_templates/user_registration.mako:23
+#: rhodecode/templates/users/user_profile.html:27
+msgid "Username"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:60
+msgid "Username to show notifications coming from."
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:69
+msgid "Channel"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:70
+msgid "Channel to send notifications to."
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:79
+msgid "Emoji"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:80
+msgid "Emoji to use eg. :studio_microphone:"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:107
+msgid "Slack"
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:41
+msgid "Webhook URL"
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:42
+msgid "URL of the webhook to receive POST event."
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:51
+msgid "Secret Token"
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:52
+msgid "String used to validate received payloads."
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:62
+msgid "Webhook"
+msgstr ""
+
 #: rhodecode/lib/action_parser.py:89
 msgid "[deleted] repository"
 msgstr ""
@@ -1443,11 +1615,15 b' msgstr ""'
 msgid "You need to be signed in to view this page"
 msgstr ""
 
-#: rhodecode/lib/base.py:511
+#: rhodecode/lib/base.py:545
 #, python-format
 msgid "The repository at %(repo_name)s cannot be located."
 msgstr ""
 
+#: rhodecode/lib/diffs.py:56
+msgid "Click to comment"
+msgstr ""
+
 #: rhodecode/lib/diffs.py:71
 msgid "Binary file"
 msgstr ""
@@ -1461,36 +1637,40 b' msgstr ""'
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1434
+#: rhodecode/lib/diffs.py:631
+msgid "Click to select line"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1481
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1438
+#: rhodecode/lib/helpers.py:1485
 msgid "No Files"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1511
+#: rhodecode/lib/helpers.py:1558
 msgid "new file"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1514
+#: rhodecode/lib/helpers.py:1561
 msgid "mod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1517
+#: rhodecode/lib/helpers.py:1564
 msgid "del"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1520
+#: rhodecode/lib/helpers.py:1567
 msgid "rename"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1525
+#: rhodecode/lib/helpers.py:1572
 msgid "chmod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1767
+#: rhodecode/lib/helpers.py:1819
 msgid ""
 "Example filter terms:\n"
 "     repository:vcs\n"
@@ -1509,14 +1689,14 b' msgid ""'
 "     \"username:test AND repository:test*\"\n"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1787
+#: rhodecode/lib/helpers.py:1839
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from the"
 " filesystem please run the application again in order to rescan repositories"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:453
+#: rhodecode/lib/utils2.py:454
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
@@ -1525,7 +1705,7 b' msgstr[1] ""'
 msgstr[2] ""
 msgstr[3] ""
 
-#: rhodecode/lib/utils2.py:454
+#: rhodecode/lib/utils2.py:455
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
@@ -1534,7 +1714,7 b' msgstr[1] ""'
 msgstr[2] ""
 msgstr[3] ""
 
-#: rhodecode/lib/utils2.py:455
+#: rhodecode/lib/utils2.py:456
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -1543,7 +1723,7 b' msgstr[1] ""'
 msgstr[2] ""
 msgstr[3] ""
 
-#: rhodecode/lib/utils2.py:456
+#: rhodecode/lib/utils2.py:457
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1552,7 +1732,7 b' msgstr[1] ""'
 msgstr[2] ""
 msgstr[3] ""
 
-#: rhodecode/lib/utils2.py:457
+#: rhodecode/lib/utils2.py:458
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1561,7 +1741,7 b' msgstr[1] ""'
 msgstr[2] ""
 msgstr[3] ""
 
-#: rhodecode/lib/utils2.py:458
+#: rhodecode/lib/utils2.py:459
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1570,42 +1750,44 b' msgstr[1] ""'
 msgstr[2] ""
 msgstr[3] ""
 
-#: rhodecode/lib/utils2.py:476
+#: rhodecode/lib/utils2.py:477
 #, python-format
 msgid "in %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:482
+#: rhodecode/lib/utils2.py:483
 #, python-format
 msgid "%s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:492
+#: rhodecode/lib/utils2.py:493
 #, python-format
 msgid "%s, %s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:494
+#: rhodecode/lib/utils2.py:495
 #, python-format
 msgid "in %s, %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:496
+#: rhodecode/lib/utils2.py:497
 #, python-format
 msgid "%s and %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:498
+#: rhodecode/lib/utils2.py:499
 #, python-format
 msgid "%s and %s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:500
+#: rhodecode/lib/utils2.py:501
 #, python-format
 msgid "in %s and %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:504
+#: rhodecode/lib/utils2.py:505 rhodecode/public/js/scripts.js:25035
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174
 msgid "just now"
 msgstr ""
 
@@ -1631,7 +1813,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 rhodecode/model/db.py:2291
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293
+#: rhodecode/model/db.py:2285
 msgid "Repository no access"
 msgstr ""
 
@@ -1657,7 +1841,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 rhodecode/model/db.py:2292
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294
+#: rhodecode/model/db.py:2286
 msgid "Repository read access"
 msgstr ""
 
@@ -1683,7 +1869,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 rhodecode/model/db.py:2293
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295
+#: rhodecode/model/db.py:2287
 msgid "Repository write access"
 msgstr ""
 
@@ -1709,7 +1897,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 rhodecode/model/db.py:2294
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296
+#: rhodecode/model/db.py:2288
 msgid "Repository admin access"
 msgstr ""
 
@@ -1775,7 +1965,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 rhodecode/model/db.py:2312
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314
+#: rhodecode/model/db.py:2306
 msgid "Repository creation disabled"
 msgstr ""
 
@@ -1801,7 +1993,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 rhodecode/model/db.py:2313
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315
+#: rhodecode/model/db.py:2307
 msgid "Repository creation enabled"
 msgstr ""
 
@@ -1827,7 +2021,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 rhodecode/model/db.py:2317
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319
+#: rhodecode/model/db.py:2311
 msgid "Repository forking disabled"
 msgstr ""
 
@@ -1853,7 +2049,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 rhodecode/model/db.py:2318
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320
+#: rhodecode/model/db.py:2312
 msgid "Repository forking enabled"
 msgstr ""
 
@@ -1901,7 +2099,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343
-#: rhodecode/model/db.py:2950
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952
+#: rhodecode/model/db.py:2944
 msgid "Not Reviewed"
 msgstr ""
 
@@ -1928,7 +2127,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344
-#: rhodecode/model/db.py:2951
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953
+#: rhodecode/model/db.py:2945
 msgid "Approved"
 msgstr ""
 
@@ -1955,7 +2155,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345
-#: rhodecode/model/db.py:2952
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954
+#: rhodecode/model/db.py:2946
 msgid "Rejected"
 msgstr ""
 
@@ -1982,7 +2183,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346
-#: rhodecode/model/db.py:2953
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955
+#: rhodecode/model/db.py:2947
 msgid "Under Review"
 msgstr ""
 
@@ -2005,7 +2207,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 rhodecode/model/db.py:2296
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298
+#: rhodecode/model/db.py:2290
 msgid "Repository group no access"
 msgstr ""
 
@@ -2028,7 +2232,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 rhodecode/model/db.py:2297
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299
+#: rhodecode/model/db.py:2291
 msgid "Repository group read access"
 msgstr ""
 
@@ -2051,7 +2257,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 rhodecode/model/db.py:2298
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300
+#: rhodecode/model/db.py:2292
 msgid "Repository group write access"
 msgstr ""
 
@@ -2074,7 +2282,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 rhodecode/model/db.py:2299
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301
+#: rhodecode/model/db.py:2293
 msgid "Repository group admin access"
 msgstr ""
 
@@ -2096,7 +2306,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 rhodecode/model/db.py:2301
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303
+#: rhodecode/model/db.py:2295
 msgid "User group no access"
 msgstr ""
 
@@ -2118,7 +2330,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 rhodecode/model/db.py:2302
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304
+#: rhodecode/model/db.py:2296
 msgid "User group read access"
 msgstr ""
 
@@ -2140,7 +2354,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 rhodecode/model/db.py:2303
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305
+#: rhodecode/model/db.py:2297
 msgid "User group write access"
 msgstr ""
 
@@ -2162,7 +2378,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 rhodecode/model/db.py:2304
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306
+#: rhodecode/model/db.py:2298
 msgid "User group admin access"
 msgstr ""
 
@@ -2184,7 +2402,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 rhodecode/model/db.py:2306
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308
+#: rhodecode/model/db.py:2300
 msgid "Repository Group creation disabled"
 msgstr ""
 
@@ -2206,7 +2426,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 rhodecode/model/db.py:2307
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309
+#: rhodecode/model/db.py:2301
 msgid "Repository Group creation enabled"
 msgstr ""
 
@@ -2228,7 +2450,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 rhodecode/model/db.py:2309
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311
+#: rhodecode/model/db.py:2303
 msgid "User Group creation disabled"
 msgstr ""
 
@@ -2250,7 +2474,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 rhodecode/model/db.py:2310
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312
+#: rhodecode/model/db.py:2304
 msgid "User Group creation enabled"
 msgstr ""
 
@@ -2273,7 +2499,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000
-#: rhodecode/model/db.py:2320
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322
+#: rhodecode/model/db.py:2314
 msgid "Registration disabled"
 msgstr ""
 
@@ -2296,7 +2523,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001
-#: rhodecode/model/db.py:2321
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323
+#: rhodecode/model/db.py:2315
 msgid "User Registration with manual account activation"
 msgstr ""
 
@@ -2319,7 +2547,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002
-#: rhodecode/model/db.py:2322
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324
+#: rhodecode/model/db.py:2316
 msgid "User Registration with automatic account activation"
 msgstr ""
 
@@ -2342,7 +2571,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004
-#: rhodecode/model/db.py:2324
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326
+#: rhodecode/model/db.py:2318
 msgid "Manual activation of external account"
 msgstr ""
 
@@ -2365,7 +2595,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005
-#: rhodecode/model/db.py:2325
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327
+#: rhodecode/model/db.py:2319
 msgid "Automatic activation of external account"
 msgstr ""
 
@@ -2381,7 +2612,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 rhodecode/model/db.py:2314
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316
+#: rhodecode/model/db.py:2308
 msgid ""
 "Repository creation enabled with write permission to a repository group"
 msgstr ""
@@ -2398,7 +2631,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 rhodecode/model/db.py:2315
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317
+#: rhodecode/model/db.py:2309
 msgid ""
 "Repository creation disabled with write permission to a repository group"
 msgstr ""
@@ -2412,7 +2647,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 rhodecode/model/db.py:2289
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291
+#: rhodecode/model/db.py:2283
 msgid "RhodeCode Super Administrator"
 msgstr ""
 
@@ -2424,7 +2661,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007
-#: rhodecode/model/db.py:2327
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329
+#: rhodecode/model/db.py:2321
 msgid "Inherit object permissions from default user disabled"
 msgstr ""
 
@@ -2436,10 +2674,36 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008
-#: rhodecode/model/db.py:2328
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330
+#: rhodecode/model/db.py:2322
 msgid "Inherit object permissions from default user enabled"
 msgstr ""
 
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 rhodecode/model/db.py:910
+msgid "all"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 rhodecode/model/db.py:911
+msgid "http/web interface"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 rhodecode/model/db.py:912
+msgid "vcs (git/hg/svn protocol)"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 rhodecode/model/db.py:913
+msgid "api calls"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 rhodecode/model/db.py:914
+msgid "feed access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069
+#: rhodecode/model/db.py:2061
+msgid "No parent"
+msgstr ""
+
 #: rhodecode/lib/index/whoosh.py:148
 msgid "Invalid search query. Try quoting it."
 msgstr ""
@@ -2484,50 +2748,34 b' msgstr ""'
 msgid "Your password reset link was sent"
 msgstr ""
 
-#: rhodecode/login/views.py:333
+#: rhodecode/login/views.py:336
 msgid ""
 "Your password reset was successful, a new password has been sent to your "
 "email"
 msgstr ""
 
-#: rhodecode/model/db.py:909
-msgid "all"
-msgstr ""
-
-#: rhodecode/model/db.py:910
-msgid "http/web interface"
-msgstr ""
-
-#: rhodecode/model/db.py:911
-msgid "vcs (git/hg protocol)"
-msgstr ""
-
-#: rhodecode/model/db.py:912
-msgid "api calls"
-msgstr ""
-
-#: rhodecode/model/db.py:913
-msgid "feed access"
-msgstr ""
-
-#: rhodecode/model/db.py:2067
-msgid "No parent"
-msgstr ""
-
-#: rhodecode/model/forms.py:66
+#: rhodecode/model/comment.py:263
+msgid "made a comment"
+msgstr ""
+
+#: rhodecode/model/comment.py:264
+msgid "Refresh page"
+msgstr ""
+
+#: rhodecode/model/forms.py:85
 msgid "Please enter a login"
 msgstr ""
 
-#: rhodecode/model/forms.py:67
+#: rhodecode/model/forms.py:86
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
-#: rhodecode/model/forms.py:76
+#: rhodecode/model/forms.py:95
 msgid "Please enter a password"
 msgstr ""
 
-#: rhodecode/model/forms.py:77
+#: rhodecode/model/forms.py:96
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
@@ -2642,43 +2890,43 b' msgid ""'
 " %(pr_title)s"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:448
+#: rhodecode/model/pull_request.py:449
 msgid "Pull request merged and closed"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:867
+#: rhodecode/model/pull_request.py:874
 msgid "Server-side pull request merging is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:869
+#: rhodecode/model/pull_request.py:876
 msgid "This pull request is closed."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:880
+#: rhodecode/model/pull_request.py:887
 msgid "Pull request merging is not supported."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:898
+#: rhodecode/model/pull_request.py:905
 msgid "Target repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:901
+#: rhodecode/model/pull_request.py:908
 msgid "Source repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1050 rhodecode/model/scm.py:791
+#: rhodecode/model/pull_request.py:1058 rhodecode/model/scm.py:788
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1055
+#: rhodecode/model/pull_request.py:1063
 msgid "Commit IDs"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1058
+#: rhodecode/model/pull_request.py:1066
 msgid "Closed Branches"
 msgstr ""
 
-#: rhodecode/model/scm.py:773
+#: rhodecode/model/scm.py:770
 msgid "latest tip"
 msgstr ""
 
@@ -2894,6 +3142,7 b' msgid "Revisions %(revs)s are already pa'
 msgstr ""
 
 #: rhodecode/model/validators.py:933
+#: rhodecode/model/validation_schema/validators.py:14
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
@@ -2908,31 +3157,391 b' msgid "Key name can only consist of lett'
 msgstr ""
 
 #: rhodecode/model/validators.py:976
-msgid "Filename cannot be inside a directory"
-msgstr ""
-
-#: rhodecode/model/validators.py:992
 #, python-format
 msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
 msgstr ""
 
-#: rhodecode/model/validators.py:995
+#: rhodecode/model/validators.py:979
 #, python-format
 msgid "The plugin \"%(plugin_id)s\" is missing an includeme function."
 msgstr ""
 
-#: rhodecode/model/validators.py:998
+#: rhodecode/model/validators.py:982
 #, python-format
 msgid "Can not load plugin \"%(plugin_id)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:1000
+#: rhodecode/model/validators.py:984
 #, python-format
 msgid "No plugin available with ID \"%(plugin_id)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:1067
-msgid "This gistid is already in use"
+#: rhodecode/model/validation_schema/schemas/gist_schema.py:89
+msgid "Gist with name {} already exists"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/gist_schema.py:95
+msgid "Filename {} cannot be inside a directory"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/gist_schema.py:132
+msgid "Duplicated value for filename found: `{}`"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:23039
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
+#: 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/src/rhodecode/comments.js:235
+msgid "Add another comment"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41526
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
+#: rhodecode/public/js/src/rhodecode/comments.js:453
+msgid "Status Review"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41540
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:3
+#: rhodecode/public/js/src/rhodecode/comments.js:467
+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/src/rhodecode/comments.js:580
+msgid "Submitting..."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41703
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
+#: rhodecode/public/js/src/rhodecode/comments.js:630
+#: rhodecode/templates/files/files_browser_tree.html:47
+msgid "Loading ..."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41903
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
+#: 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/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/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/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/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/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/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/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/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/src/rhodecode.js:162
+msgid "Show more"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
+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."
+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."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
+msgid "No tags available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18
+msgid "No user groups available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19
+msgid "No users available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
+#: rhodecode/templates/changelog/changelog.html:62
+msgid "Open new pull request"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22
+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
+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"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
+msgid "files"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
+msgid "specify commit"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
+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} years"
 msgstr ""
 
 #: rhodecode/templates/index.html:5
@@ -2993,7 +3602,7 b' msgstr ""'
 #: rhodecode/templates/base/perms_summary.html:102
 #: rhodecode/templates/bookmarks/bookmarks.html:59
 #: rhodecode/templates/branches/branches.html:58
-#: rhodecode/templates/files/files_browser.html:49
+#: rhodecode/templates/files/files_browser_tree.html:5
 #: rhodecode/templates/pullrequests/pullrequests.html:100
 #: rhodecode/templates/tags/tags.html:59
 msgid "Name"
@@ -3002,6 +3611,7 b' msgstr ""'
 #: rhodecode/templates/index_base.html:100
 #: rhodecode/templates/index_base.html:125
 #: rhodecode/templates/admin/gists/index.html:114
+#: rhodecode/templates/admin/integrations/list.html:63
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:77
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:45
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42
@@ -3017,8 +3627,9 b' msgstr ""'
 #: rhodecode/templates/base/issue_tracker_settings.html:10
 #: rhodecode/templates/changeset/changeset.html:53
 #: rhodecode/templates/compare/compare_commits.html:24
+#: rhodecode/templates/email_templates/commit_comment.mako:82
 #: rhodecode/templates/email_templates/pull_request_review.mako:30
-#: rhodecode/templates/email_templates/pull_request_review.mako:67
+#: rhodecode/templates/email_templates/pull_request_review.mako:51
 #: rhodecode/templates/files/file_tree_detail.html:5
 #: rhodecode/templates/files/file_tree_detail.html:12
 #: rhodecode/templates/forks/fork.html:48
@@ -3056,12 +3667,12 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:63
 #: rhodecode/templates/bookmarks/bookmarks.html:66
 #: rhodecode/templates/branches/branches.html:65
-#: rhodecode/templates/changelog/changelog.html:106
-#: rhodecode/templates/changelog/changelog_summary_data.html:6
+#: 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/email_templates/commit_comment.mako:16
 #: rhodecode/templates/email_templates/commit_comment.mako:45
+#: rhodecode/templates/email_templates/commit_comment.mako:81
 #: rhodecode/templates/search/search_commit.html:6
 #: rhodecode/templates/tags/tags.html:66
 msgid "Commit"
@@ -3077,7 +3688,7 b' msgid "Home"'
 msgstr ""
 
 #: rhodecode/templates/login.html:5 rhodecode/templates/login.html:35
-#: rhodecode/templates/login.html:64 rhodecode/templates/base/base.html:328
+#: rhodecode/templates/login.html:64 rhodecode/templates/base/base.html:329
 #: rhodecode/templates/debug_style/login.html:60
 msgid "Sign In"
 msgstr ""
@@ -3086,20 +3697,6 b' msgstr ""'
 msgid "Go to the registration page to create a new account."
 msgstr ""
 
-#: rhodecode/templates/login.html:43 rhodecode/templates/register.html:41
-#: rhodecode/templates/admin/admin_log.html:5
-#: 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/users/user_add.html:35
-#: rhodecode/templates/admin/users/user_edit_profile.html:39
-#: rhodecode/templates/admin/users/users.html:89
-#: rhodecode/templates/base/base.html:305
-#: rhodecode/templates/debug_style/login.html:36
-#: rhodecode/templates/users/user_profile.html:27
-msgid "Username"
-msgstr ""
-
 #: rhodecode/templates/login.html:58
 msgid "Remember me"
 msgstr ""
@@ -3135,7 +3732,7 b' msgid "Send password reset email"'
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:60
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr ""
 
 #: rhodecode/templates/register.html:35
@@ -3156,7 +3753,7 b' msgstr ""'
 #: 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:93
+#: rhodecode/templates/admin/users/users.html:92
 msgid "First Name"
 msgstr ""
 
@@ -3166,7 +3763,7 b' msgstr ""'
 #: 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:95
+#: rhodecode/templates/admin/users/users.html:94
 msgid "Last Name"
 msgstr ""
 
@@ -3180,7 +3777,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:15
-#: rhodecode/templates/base/base.html:78
+#: rhodecode/templates/base/base.html:77
 msgid "Admin journal"
 msgstr ""
 
@@ -3207,17 +3804,17 b' msgstr[3] ""'
 msgid "Example Queries"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:6
+#: rhodecode/templates/admin/admin_log.html:8
 #: rhodecode/templates/admin/my_account/my_account_repos.html:37
 #: 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_groups.html:66
-#: rhodecode/templates/admin/users/users.html:106
+#: rhodecode/templates/admin/users/users.html:105
 msgid "Action"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:7
+#: rhodecode/templates/admin/admin_log.html:9
 #: rhodecode/templates/admin/defaults/defaults.html:31
 #: rhodecode/templates/admin/permissions/permissions_objects.html:13
 #: rhodecode/templates/search/search_commit.html:5
@@ -3225,18 +3822,18 b' msgstr ""'
 msgid "Repository"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:8
+#: rhodecode/templates/admin/admin_log.html:10
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:60
 #: rhodecode/templates/tags/tags.html:61
 msgid "Date"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:9
+#: rhodecode/templates/admin/admin_log.html:11
 msgid "From IP"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:44
+#: rhodecode/templates/admin/admin_log.html:46
 msgid "No actions yet"
 msgstr ""
 
@@ -3248,6 +3845,9 b' 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:19
+#: rhodecode/templates/admin/integrations/edit.html:15
+#: rhodecode/templates/admin/integrations/list.html:8
 #: 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
@@ -3265,9 +3865,9 b' msgstr ""'
 #: 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:102
-#: rhodecode/templates/base/base.html:405
-#: rhodecode/templates/base/base.html:412
+#: rhodecode/templates/admin/users/users.html:101
+#: rhodecode/templates/base/base.html:406
+#: rhodecode/templates/base/base.html:413
 msgid "Admin"
 msgstr ""
 
@@ -3294,14 +3894,6 b' msgstr ""'
 msgid "Available Built-in Plugins"
 msgstr ""
 
-#: rhodecode/templates/admin/auth/auth_settings.html:71
-msgid "enabled"
-msgstr ""
-
-#: rhodecode/templates/admin/auth/auth_settings.html:71
-msgid "disabled"
-msgstr ""
-
 #: rhodecode/templates/admin/auth/auth_settings.html:81
 #: rhodecode/templates/admin/auth/plugin_settings.html:87
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:63
@@ -3342,6 +3934,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:14
 #: rhodecode/templates/admin/gists/index.html:110
+#: rhodecode/templates/admin/integrations/list.html:64
 #: rhodecode/templates/admin/repos/repo_add_base.html:62
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:12
 msgid "Type"
@@ -3414,18 +4007,18 b' msgstr ""'
 msgid "Gist access level"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.html:59
+#: rhodecode/templates/admin/gists/edit.html:62
 #: 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:103
+#: rhodecode/templates/admin/gists/edit.html:107
 msgid "Update Gist"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.html:104
+#: rhodecode/templates/admin/gists/edit.html:108
 #: rhodecode/templates/base/issue_tracker_settings.html:74
 #: rhodecode/templates/changeset/changeset_file_comment.html:139
 #: rhodecode/templates/files/files_add.html:102
@@ -3486,14 +4079,14 b' 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:87
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:89
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:62
-#: rhodecode/templates/changelog/changelog.html:102
-#: rhodecode/templates/changelog/changelog_summary_data.html:10
+#: 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/files/files_browser.html:53
+#: rhodecode/templates/files/files_browser_tree.html:9
 #: rhodecode/templates/pullrequests/pullrequest_show.html:169
 #: rhodecode/templates/pullrequests/pullrequests.html:102
 #: rhodecode/templates/search/search_commit.html:16
@@ -3576,9 +4169,10 b' msgid "Gist"'
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:49
+#: rhodecode/templates/admin/integrations/list.html:110
 #: 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:61
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:63
 #: 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
@@ -3590,10 +4184,10 b' msgstr ""'
 #: rhodecode/templates/base/vcs_settings.html:172
 #: rhodecode/templates/changeset/changeset_file_comment.html:49
 #: rhodecode/templates/changeset/changeset_file_comment.html:99
-#: rhodecode/templates/data_table/_dt_elements.html:117
-#: rhodecode/templates/data_table/_dt_elements.html:174
-#: rhodecode/templates/data_table/_dt_elements.html:188
-#: rhodecode/templates/data_table/_dt_elements.html:200
+#: 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/debug_style/buttons.html:132
 #: rhodecode/templates/files/files_source.html:33
 #: rhodecode/templates/files/files_source.html:37
@@ -3606,14 +4200,15 b' msgid "Confirm to delete this Gist"'
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:56
+#: rhodecode/templates/admin/integrations/list.html:103
 #: 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:112
-#: rhodecode/templates/data_table/_dt_elements.html:170
-#: rhodecode/templates/data_table/_dt_elements.html:183
-#: rhodecode/templates/data_table/_dt_elements.html:196
+#: 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/debug_style/buttons.html:128
 #: rhodecode/templates/files/files_add.html:204
 #: rhodecode/templates/files/files_edit.html:165
@@ -3643,8 +4238,45 b' msgstr ""'
 msgid "Show as raw"
 msgstr ""
 
+#: rhodecode/templates/admin/integrations/base.html:12
+msgid "Integrations settings"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/edit.html:17
+#: rhodecode/templates/admin/integrations/list.html:10
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44
+#: rhodecode/templates/admin/repos/repo_edit.html:15
+#: 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
+msgid "Settings"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/edit.html:36
+#, python-format
+msgid "Create new %(integration_type)s integration"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:31
+msgid "Create new integration"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:56
+msgid "Current integrations"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:65
+msgid "Actions"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:89
+msgid "unknown integration"
+msgstr ""
+
 #: rhodecode/templates/admin/my_account/my_account.html:5
-#: rhodecode/templates/base/base.html:342
+#: rhodecode/templates/base/base.html:343
 msgid "My account"
 msgstr ""
 
@@ -3680,7 +4312,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/my_account/my_account.html:40
 #: rhodecode/templates/admin/notifications/notifications.html:33
-#: rhodecode/templates/base/base.html:242
+#: rhodecode/templates/base/base.html:243
 msgid "Pull Requests"
 msgstr ""
 
@@ -3688,6 +4320,10 b' msgstr ""'
 msgid "My Permissions"
 msgstr ""
 
+#: rhodecode/templates/admin/my_account/my_account.html:42
+msgid "My Live Notifications"
+msgstr ""
+
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:3
 msgid "Authentication Tokens"
 msgstr ""
@@ -3699,7 +4335,7 b' msgstr ""'
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:8
 msgid ""
 "Each token can have a role. VCS tokens can be used together with the "
-"authtoken auth plugin for git/hg operations."
+"authtoken auth plugin for git/hg/svn operations."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:14
@@ -3776,6 +4412,19 b' msgstr ""'
 msgid "New email address"
 msgstr ""
 
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:3
+msgid "Your live notification settings"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:14
+#: rhodecode/templates/admin/notifications/show_notification.html:12
+msgid "Notifications"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:14
+msgid "Disabled"
+msgstr ""
+
 #: rhodecode/templates/admin/my_account/my_account_password.html:3
 msgid "Change Your Account Password"
 msgstr ""
@@ -3832,35 +4481,35 b' 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:86
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:88
 msgid "Target Repo"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:26
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:89
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:91
 #: rhodecode/templates/admin/settings/settings_global.html:9
 #: rhodecode/templates/email_templates/pull_request_review.mako:28
-#: rhodecode/templates/email_templates/pull_request_review.mako:65
+#: rhodecode/templates/email_templates/pull_request_review.mako:48
 #: rhodecode/templates/pullrequests/pullrequest.html:38
 #: rhodecode/templates/pullrequests/pullrequests.html:104
 msgid "Title"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:27
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:90
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:92
 msgid "Opened On"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:41
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:103
-#: rhodecode/templates/changelog/changelog.html:141
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:43
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:107
+#: 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:50
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:112
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:52
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:116
 #: rhodecode/templates/changeset/changeset_file_comment.html:284
 #: rhodecode/templates/pullrequests/pullrequest_show.html:14
 #: rhodecode/templates/pullrequests/pullrequest_show.html:112
@@ -3868,19 +4517,19 b' msgstr ""'
 msgid "Closed"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:62
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:64
 msgid "Confirm to delete this pull request"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:69
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:71
 msgid "You currently have no open pull requests."
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:77
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:79
 msgid "Pull Requests You Participate In"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:125
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:129
 msgid ""
 "There are currently no open pull requests requiring your participation."
 msgstr ""
@@ -3921,19 +4570,15 b' msgstr ""'
 msgid "Show notification"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/show_notification.html:12
-msgid "Notifications"
-msgstr ""
-
 #: rhodecode/templates/admin/permissions/permissions.html:5
 msgid "Permissions Administration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:14
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:45
-#: rhodecode/templates/admin/repos/repo_edit.html:42
+#: rhodecode/templates/admin/repos/repo_edit.html:46
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:34
-#: rhodecode/templates/base/base.html:83
+#: rhodecode/templates/base/base.html:82
 msgid "Permissions"
 msgstr ""
 
@@ -4079,8 +4724,8 b' 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:80
-#: rhodecode/templates/base/base.html:152
+#: rhodecode/templates/base/base.html:79
+#: rhodecode/templates/base/base.html:153
 msgid "Repository groups"
 msgstr ""
 
@@ -4111,18 +4756,8 b' msgstr ""'
 msgid "Add Child Group"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44
-#: rhodecode/templates/admin/repos/repo_edit.html:15
-#: rhodecode/templates/admin/repos/repo_edit.html:39
-#: 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:250
-msgid "Settings"
-msgstr ""
-
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:46
-#: rhodecode/templates/admin/repos/repo_edit.html:45
+#: rhodecode/templates/admin/repos/repo_edit.html:49
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:35
 #: rhodecode/templates/admin/users/user_edit.html:35
 msgid "Advanced"
@@ -4304,7 +4939,7 b' msgid "Import Existing Repository ?"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:23
-#: rhodecode/templates/base/base.html:197
+#: rhodecode/templates/base/base.html:198
 msgid "Clone from"
 msgstr ""
 
@@ -4376,19 +5011,19 b' msgstr ""'
 msgid "%s repository settings"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:51
+#: rhodecode/templates/admin/repos/repo_edit.html:55
 msgid "Extra Fields"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:57
-msgid "Caches"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:61
-msgid "Remote"
+msgid "Caches"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:65
+msgid "Remote"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:69
 #: rhodecode/templates/summary/components.html:135
 msgid "Statistics"
 msgstr ""
@@ -4497,7 +5132,7 b' msgid "Delete forks"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:139
-#: rhodecode/templates/data_table/_dt_elements.html:118
+#: rhodecode/templates/data_table/_dt_elements.html:120
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
@@ -4566,7 +5201,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:100
+#: rhodecode/templates/admin/users/users.html:99
 msgid "Active"
 msgstr ""
 
@@ -4726,7 +5361,7 b' msgid ""'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.html:56
-#: rhodecode/templates/data_table/_dt_elements.html:158
+#: rhodecode/templates/data_table/_dt_elements.html:160
 #: rhodecode/templates/forks/fork.html:58
 msgid "Repository group"
 msgstr ""
@@ -4981,12 +5616,11 b' msgid "Server Announcement"'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:80
-msgid "Custom js/css code added at the end of the <header> tag."
+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:103
-msgid "Use <script> or <css> tags to define custom styling or scripting"
+msgid "Use <script/> or <css/> tags to define custom styling or scripting"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:88
@@ -4997,6 +5631,10 b' msgstr ""'
 msgid "Custom js/css code added at the end of the <body> tag."
 msgstr ""
 
+#: rhodecode/templates/admin/settings/settings_global.html:103
+msgid "Use <script> or <css> tags to define custom styling or scripting"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings_hooks.html:3
 msgid "Built in Mercurial hooks - read only"
 msgstr ""
@@ -5389,8 +6027,8 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:82
-#: rhodecode/templates/base/base.html:155
+#: rhodecode/templates/base/base.html:81
+#: rhodecode/templates/base/base.html:156
 msgid "User groups"
 msgstr ""
 
@@ -5482,8 +6120,8 b' msgid "Change owner of this user group."'
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:59
-#: rhodecode/templates/base/base.html:257
-#: rhodecode/templates/base/base.html:399
+#: rhodecode/templates/base/base.html:258
+#: rhodecode/templates/base/base.html:400
 #: rhodecode/templates/search/search.html:64
 msgid "Search"
 msgstr ""
@@ -5527,7 +6165,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/users/user_add.html:13
 #: rhodecode/templates/admin/users/user_edit.html:14
-#: rhodecode/templates/base/base.html:81
+#: rhodecode/templates/base/base.html:80
 msgid "Users"
 msgstr ""
 
@@ -5590,7 +6228,7 b' msgid "Source of Record"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:8
-#: rhodecode/templates/admin/users/users.html:98
+#: rhodecode/templates/admin/users/users.html:97
 msgid "Last login"
 msgstr ""
 
@@ -5696,7 +6334,7 b' msgid "Detach user groups"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:135
-#: rhodecode/templates/data_table/_dt_elements.html:189
+#: rhodecode/templates/data_table/_dt_elements.html:191
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
@@ -5781,21 +6419,21 b' msgstr ""'
 msgid "Users administration"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:104
+#: rhodecode/templates/admin/users/users.html:103
 msgid "Authentication type"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:45
+#: rhodecode/templates/base/base.html:44
 #: rhodecode/templates/errors/error_document.html:51
 msgid "Support"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:52
+#: rhodecode/templates/base/base.html:51
 #, python-format
 msgid "RhodeCode instance id: %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:84
+#: rhodecode/templates/base/base.html:83
 msgid "Authentication"
 msgstr ""
 
@@ -5809,40 +6447,40 b' msgstr ""'
 msgid "Show More"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:189
+#: rhodecode/templates/base/base.html:190
 msgid "Fork of"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:206
+#: rhodecode/templates/base/base.html:207
 #, python-format
 msgid "Repository locked by %(user)s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/base/base.html:212
 msgid "Repository not locked. Pull repository to lock it."
 msgstr ""
 
-#: rhodecode/templates/base/base.html:229
-#: rhodecode/templates/data_table/_dt_elements.html:12
-#: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/data_table/_dt_elements.html:147
-msgid "Summary"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:230
+#: rhodecode/templates/data_table/_dt_elements.html:12
+#: rhodecode/templates/data_table/_dt_elements.html:13
+#: rhodecode/templates/data_table/_dt_elements.html:149
+msgid "Summary"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:231
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:18
 msgid "Changelog"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:231
+#: rhodecode/templates/base/base.html:232
 #: 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:233
+#: rhodecode/templates/base/base.html:234
 #: rhodecode/templates/bookmarks/bookmarks.html:68
 #: rhodecode/templates/branches/branches.html:67
 #: rhodecode/templates/files/file_diff.html:11
@@ -5851,29 +6489,29 b' msgstr ""'
 msgid "Compare"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:239
 #, python-format
 msgid "Show Pull Requests for %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:247
+#: rhodecode/templates/base/base.html:248
 msgid "Options"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:254
+#: rhodecode/templates/base/base.html:255
 #: rhodecode/templates/forks/forks_data.html:30
 msgid "Compare fork"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:261
+#: rhodecode/templates/base/base.html:262
 msgid "Unlock"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:263
+#: rhodecode/templates/base/base.html:264
 msgid "Lock"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:268
+#: 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
@@ -5885,73 +6523,73 b' msgstr[1] ""'
 msgstr[2] ""
 msgstr[3] ""
 
-#: rhodecode/templates/base/base.html:269
+#: rhodecode/templates/base/base.html:270
 msgid "Create Pull Request"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:291
+#: rhodecode/templates/base/base.html:292
 msgid "Sign in"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:300
 #: rhodecode/templates/debug_style/login.html:28
 msgid "Sign in to your account"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:316
 #: rhodecode/templates/debug_style/login.html:46
 msgid "(Forgot password?)"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:325
 #: rhodecode/templates/debug_style/login.html:56
 msgid "Don't have an account ?"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:345
+#: rhodecode/templates/base/base.html:346
 msgid "Sign Out"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:381
-msgid "Show activity journal"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:382
+msgid "Show activity journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:383
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:14
 msgid "Journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:387
+#: rhodecode/templates/base/base.html:388
 msgid "Show Public activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:388
+#: rhodecode/templates/base/base.html:389
 msgid "Public journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:393
-msgid "Show Gists"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:394
+msgid "Show Gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:395
 msgid "Gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:398
+#: rhodecode/templates/base/base.html:399
 msgid "Search in repositories you have access to"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:404
+#: rhodecode/templates/base/base.html:405
 msgid "Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:411
+#: rhodecode/templates/base/base.html:412
 msgid "Delegated Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:421
 #: rhodecode/templates/base/base.html:422
+#: rhodecode/templates/base/base.html:423
 #: rhodecode/templates/debug_style/buttons.html:5
 #: rhodecode/templates/debug_style/code-block.html:6
 #: rhodecode/templates/debug_style/collapsable-content.html:5
@@ -5972,15 +6610,15 b' msgstr ""'
 msgid "Style"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:479
+#: rhodecode/templates/base/base.html:480
 msgid "Go to"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:590
+#: rhodecode/templates/base/base.html:591
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:598
+#: rhodecode/templates/base/base.html:599
 msgid "Site-wide shortcuts"
 msgstr ""
 
@@ -6172,7 +6810,7 b' msgstr ""'
 msgid "No permission defined"
 msgstr ""
 
-#: rhodecode/templates/base/root.html:151
+#: rhodecode/templates/base/root.html:120
 msgid "Please enable JavaScript to use RhodeCode Enterprise"
 msgstr ""
 
@@ -6314,6 +6952,24 b' msgid ""'
 " updated and outdated inline comments will be hidden."
 msgstr ""
 
+#: rhodecode/templates/base/vcs_settings.html:222
+msgid "Labs settings"
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.html:222
+msgid ""
+"These features are considered experimental and may not work as expected."
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.html:229
+msgid "Mercurial server-side merge"
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.html:234
+msgid ""
+"Use rebase instead of creating a merge commit when merging via web interface"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
@@ -6328,8 +6984,8 b' msgid "Compare Selected Bookmarks"'
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks_data.html:13
-#: rhodecode/templates/changelog/changelog.html:180
-#: rhodecode/templates/changelog/changelog_summary_data.html:53
+#: rhodecode/templates/changelog/changelog.html:183
+#: rhodecode/templates/changelog/changelog_summary_data.html:62
 #: rhodecode/templates/changeset/changeset.html:92
 #: rhodecode/templates/files/base.html:10
 #, python-format
@@ -6350,8 +7006,8 b' msgid "Compare Selected Branches"'
 msgstr ""
 
 #: rhodecode/templates/branches/branches_data.html:12
-#: rhodecode/templates/changelog/changelog.html:172
-#: rhodecode/templates/changelog/changelog_summary_data.html:67
+#: rhodecode/templates/changelog/changelog.html:175
+#: rhodecode/templates/changelog/changelog_summary_data.html:76
 #: rhodecode/templates/changeset/changeset.html:105
 #: rhodecode/templates/files/base.html:23
 #, python-format
@@ -6383,10 +7039,6 b' msgstr ""'
 msgid "Compare fork with Parent (%s)"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:62
-msgid "Open new pull request"
-msgstr ""
-
 #: rhodecode/templates/changelog/changelog.html:68
 #: rhodecode/templates/changelog/changelog.html:69
 msgid "Clear selection"
@@ -6396,43 +7048,49 b' msgstr ""'
 msgid "Clear filter"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:103
-#: rhodecode/templates/changelog/changelog_summary_data.html:9
-msgid "Age"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:105
+#: rhodecode/templates/changelog/changelog.html:107
 #: rhodecode/templates/files/files_add.html:93
 #: rhodecode/templates/files/files_delete.html:60
 #: rhodecode/templates/files/files_edit.html:96
 msgid "Commit Message"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:108
-#: rhodecode/templates/changelog/changelog_summary_data.html:11
+#: rhodecode/templates/changelog/changelog.html:109
+#: rhodecode/templates/changelog/changelog_summary_data.html:10
+msgid "Age"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:112
+#: rhodecode/templates/changelog/changelog_summary_data.html:12
 msgid "Refs"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:122
-#: rhodecode/templates/changelog/changelog_summary_data.html:22
+#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog_summary_data.html:21
 #, python-format
 msgid ""
 "Commit status: %s\n"
 "Click to open associated pull request #%s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:130
+#: rhodecode/templates/changelog/changelog_summary_data.html:25
 #, python-format
 msgid "Commit status: %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:162
-#: rhodecode/templates/changelog/changelog_summary_data.html:33
+#: rhodecode/templates/changelog/changelog.html:136
+#: rhodecode/templates/changelog/changelog_summary_data.html:31
+msgid "Commit status: Not Reviewed"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:141
+#: rhodecode/templates/changelog/changelog_summary_data.html:36
 msgid "Commit has comments"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:188
-#: rhodecode/templates/changelog/changelog_summary_data.html:60
+#: rhodecode/templates/changelog/changelog.html:191
+#: rhodecode/templates/changelog/changelog_summary_data.html:69
 #: rhodecode/templates/changeset/changeset.html:99
 #: rhodecode/templates/files/base.html:17
 #: rhodecode/templates/tags/tags_data.html:12
@@ -6440,16 +7098,16 b' msgstr ""'
 msgid "Tag %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:338
+#: rhodecode/templates/changelog/changelog.html:341
 msgid "Filter changelog"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:411
+#: rhodecode/templates/changelog/changelog.html:414
 msgid "There are no changes yet"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/pullrequests/pullrequest_show.html:358
+#: rhodecode/templates/pullrequests/pullrequest_show.html:362
 msgid "Removed"
 msgstr ""
 
@@ -6480,25 +7138,25 b' msgstr ""'
 msgid "Show File"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:8
+#: rhodecode/templates/changelog/changelog_summary_data.html:9
 #: rhodecode/templates/search/search_commit.html:8
 msgid "Commit message"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:91
+#: rhodecode/templates/changelog/changelog_summary_data.html:100
 msgid "Add or upload files directly via RhodeCode:"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:94
+#: rhodecode/templates/changelog/changelog_summary_data.html:103
 #: rhodecode/templates/files/files_browser.html:25
 msgid "Add New File"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:102
+#: rhodecode/templates/changelog/changelog_summary_data.html:111
 msgid "Push new repo:"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:113
+#: rhodecode/templates/changelog/changelog_summary_data.html:122
 msgid "Existing repository?"
 msgstr ""
 
@@ -6574,7 +7232,7 b' msgstr ""'
 
 #: rhodecode/templates/changeset/changeset.html:145
 #: rhodecode/templates/changeset/changeset.html:147
-#: rhodecode/tests/functional/test_changeset_comments.py:217
+#: rhodecode/tests/functional/test_commit_comments.py:263
 #, python-format
 msgid "%d Commit comment"
 msgid_plural "%d Commit comments"
@@ -6587,7 +7245,7 b' msgstr[3] ""'
 #: rhodecode/templates/changeset/changeset.html:153
 #: rhodecode/templates/pullrequests/pullrequest_show.html:145
 #: rhodecode/templates/pullrequests/pullrequest_show.html:147
-#: rhodecode/tests/functional/test_changeset_comments.py:224
+#: rhodecode/tests/functional/test_commit_comments.py:270
 #, python-format
 msgid "%d Inline Comment"
 msgid_plural "%d Inline Comments"
@@ -6596,15 +7254,15 b' msgstr[1] ""'
 msgstr[2] ""
 msgstr[3] ""
 
-#: rhodecode/templates/changeset/changeset.html:177
+#: 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
-msgid "Browse files"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:179
 #: rhodecode/templates/changeset/changeset_range.html:59
 #: rhodecode/templates/compare/compare_diff.html:255
 #: rhodecode/templates/files/file_diff.html:77
@@ -6612,7 +7270,7 b' msgstr ""'
 msgid "Expand All"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:179
+#: 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
@@ -6620,30 +7278,32 b' msgstr ""'
 msgid "Collapse All"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:190
+#: 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:227
+#: 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:228
+#: 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:245
+#: 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:245
+#: 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
@@ -6653,22 +7313,22 b' msgstr ""'
 msgid "Showing a big diff might take some time and resources, continue?"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:245
+#: 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:386
-#: rhodecode/templates/pullrequests/pullrequest_show.html:392
+#: rhodecode/templates/pullrequests/pullrequest_show.html:390
+#: rhodecode/templates/pullrequests/pullrequest_show.html:396
 msgid "Show full diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:314
+#: rhodecode/templates/changeset/changeset.html:312
 msgid "No Child Commits"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:350
+#: rhodecode/templates/changeset/changeset.html:348
 msgid "No Parent Commits"
 msgstr ""
 
@@ -6722,6 +7382,8 b' 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/email_templates/commit_comment.mako:87
+#: rhodecode/templates/email_templates/pull_request_comment.mako:93
 msgid "Comment"
 msgstr ""
 
@@ -6881,12 +7543,15 b' msgid "Compare Commits"'
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.html:46
+#: rhodecode/templates/email_templates/pull_request_review.mako:50
 #: 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_comment.mako:92
+#: rhodecode/templates/email_templates/pull_request_review.mako:49
 #: rhodecode/templates/files/file_diff.html:62
 #: rhodecode/templates/files/files_source.html:18
 msgid "Source"
@@ -6936,15 +7601,15 b' msgstr ""'
 msgid "Subscribe to %s atom feed"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:127
+#: rhodecode/templates/data_table/_dt_elements.html:129
 msgid "Creating"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:129
+#: rhodecode/templates/data_table/_dt_elements.html:131
 msgid "Created"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:175
+#: rhodecode/templates/data_table/_dt_elements.html:177
 #, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
@@ -6953,21 +7618,21 b' msgstr[1] ""'
 msgstr[2] ""
 msgstr[3] ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:201
+#: rhodecode/templates/data_table/_dt_elements.html:203
 #, python-format
 msgid "Confirm to delete this user group: %s"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:218
+#: rhodecode/templates/data_table/_dt_elements.html:220
 msgid "User group"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:262
+#: rhodecode/templates/data_table/_dt_elements.html:264
 #: rhodecode/templates/forks/fork.html:81
 msgid "Private"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:287
+#: rhodecode/templates/data_table/_dt_elements.html:289
 #, python-format
 msgid "Pull request #%(pr_number)s"
 msgstr ""
@@ -7071,85 +7736,138 b' msgstr ""'
 msgid "Form vertical"
 msgstr ""
 
-#: rhodecode/templates/email_templates/base.mako:16
+#: rhodecode/templates/email_templates/base.mako:7
 #, python-format
 msgid "This is a notification from RhodeCode. %(instance_url)s"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:5
-#: rhodecode/templates/email_templates/pull_request_comment.mako:5
+#: rhodecode/templates/email_templates/base.mako:90
+msgid "RhodeCode"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:16
+#: rhodecode/templates/email_templates/pull_request_comment.mako:17
 msgid "[mention]"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:5
-#, python-format
-msgid "%(user)s commented on commit of %(repo_name)s"
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:14
-#: rhodecode/templates/email_templates/commit_comment.mako:41
-#: rhodecode/templates/email_templates/pull_request_comment.mako:15
-#: rhodecode/templates/email_templates/pull_request_comment.mako:51
-msgid "Comment link"
+#: rhodecode/templates/email_templates/commit_comment.mako:19
+#, python-format
+msgid ""
+"%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:19
+#: rhodecode/templates/email_templates/commit_comment.mako:22
+#: rhodecode/templates/email_templates/commit_comment.mako:24
+#, python-format
+msgid "in the %(repo_name)s repository"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:22
+#, python-format
+msgid "%(user)s commented on commit `%(commit_id)s` (status: %(status)s)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:24
+#: rhodecode/templates/email_templates/commit_comment.mako:78
+#, python-format
+msgid "%(user)s commented on commit `%(commit_id)s`"
+msgstr ""
+
 #: rhodecode/templates/email_templates/commit_comment.mako:43
-#: rhodecode/templates/email_templates/pull_request_comment.mako:20
-#: rhodecode/templates/email_templates/pull_request_comment.mako:54
+#: rhodecode/templates/email_templates/pull_request_comment.mako:43
+msgid "Comment link"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:48
+#: rhodecode/templates/email_templates/pull_request_comment.mako:48
 #, python-format
 msgid "File: %(comment_file)s on line %(comment_line)s"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:28
-#: rhodecode/templates/email_templates/commit_comment.mako:56
+#: rhodecode/templates/email_templates/commit_comment.mako:54
 msgid "Commit status was changed to"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:35
-#, python-format
-msgid "%(user)s commented on a file in commit of %(repo_url)s."
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:37
-#, python-format
-msgid "%(user)s commented on a commit of %(repo_url)s."
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:47
-#: rhodecode/templates/files/files_detail.html:5
-#: rhodecode/templates/files/files_detail.html:12
-msgid "Commit Description"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:5
-#, python-format
-msgid "%(user)s commented on pull request #%(pr_id)s: \"%(pr_title)s\""
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:17
-#: rhodecode/templates/email_templates/pull_request_comment.mako:52
+#: rhodecode/templates/email_templates/commit_comment.mako:76
+#, python-format
+msgid "%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:76
+#: rhodecode/templates/email_templates/commit_comment.mako:78
+#, python-format
+msgid "in the %(repo)s repository"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:85
+msgid "Status"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:85
+msgid "The commit status was changed to"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:87
+#: rhodecode/templates/email_templates/pull_request_comment.mako:93
+#, python-format
+msgid "Comment on line: %(comment_line)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/password_reset.mako:30
+msgid "Generate new password here"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:20
+#, python-format
+msgid ""
+"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: "
+"`%(comment_file)s`)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:23
+#, python-format
+msgid ""
+"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: "
+"%(status)s)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:25
+#: rhodecode/templates/email_templates/pull_request_comment.mako:82
+#, python-format
+msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\""
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:45
 msgid "Source repository"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_comment.mako:29
-#: rhodecode/templates/email_templates/pull_request_comment.mako:63
-msgid "Pull request status was changed to"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:31
-#: rhodecode/templates/email_templates/pull_request_comment.mako:65
-msgid "Pull request was closed with status"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:37
-#, python-format
-msgid "%(user)s commented on a file on pull request #%(pr_id)s: \"%(pr_title)s\"."
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:43
-#, python-format
-msgid "%(user)s commented on a pull request #%(pr_id)s \"%(pr_title)s\"."
+#: rhodecode/templates/email_templates/pull_request_comment.mako:54
+#, python-format
+msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:56
+#, python-format
+msgid ""
+"%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:80
+#, python-format
+msgid ""
+"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" "
+"(file:`%(comment_file)s`)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:86
+#, python-format
+msgid "submitted pull request status: %(status)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:88
+#, python-format
+msgid "submitted pull request status: %(status)s and closed"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:5
@@ -7158,7 +7876,6 b' msgid "%(user)s wants you to review pull'
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:17
-#: rhodecode/templates/email_templates/pull_request_review.mako:54
 #, python-format
 msgid ""
 "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s "
@@ -7166,12 +7883,10 b' msgid ""'
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:26
-#: rhodecode/templates/email_templates/pull_request_review.mako:63
 msgid "Link"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:35
-#: rhodecode/templates/email_templates/pull_request_review.mako:72
 #, python-format
 msgid "Commit (%(num)s)"
 msgid_plural "Commits (%(num)s)"
@@ -7185,6 +7900,27 b' msgstr[3] ""'
 msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"."
 msgstr ""
 
+#: rhodecode/templates/email_templates/pull_request_review.mako:49
+#, python-format
+msgid "%(source_ref_type)s of %(source_repo_url)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_review.mako:50
+#, python-format
+msgid "%(target_ref_type)s of %(target_repo_url)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_review.mako:52
+#: rhodecode/templates/summary/components.html:95
+#: rhodecode/templates/summary/components.html:98
+#, python-format
+msgid "%(num)s Commit"
+msgid_plural "%(num)s Commits"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
 #: rhodecode/templates/email_templates/test.mako:5
 msgid "hello \"world\""
 msgstr ""
@@ -7193,6 +7929,21 b' msgstr ""'
 msgid "Translation"
 msgstr ""
 
+#: rhodecode/templates/email_templates/user_registration.mako:22
+#, python-format
+msgid "New user %(user)s has registered on %(date)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/user_registration.mako:24
+msgid "Full Name"
+msgstr ""
+
+#: rhodecode/templates/email_templates/user_registration.mako:26
+#: rhodecode/templates/users/user.html:29
+#: rhodecode/templates/users/user_profile.html:5
+msgid "Profile"
+msgstr ""
+
 #: rhodecode/templates/errors/error_document.html:39
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
@@ -7204,8 +7955,8 b' msgid "%(user)s commited on %(date)s UTC'
 msgstr ""
 
 #: rhodecode/templates/feed/atom_feed_entry.mako:26
-#: rhodecode/templates/pullrequests/pullrequest_show.html:386
-#: rhodecode/templates/pullrequests/pullrequest_show.html:392
+#: rhodecode/templates/pullrequests/pullrequest_show.html:390
+#: rhodecode/templates/pullrequests/pullrequest_show.html:396
 msgid "Commit was too big and was cut off..."
 msgstr ""
 
@@ -7251,7 +8002,7 b' msgstr[3] ""'
 msgid "Show All"
 msgstr ""
 
-#: rhodecode/templates/files/file_authors_box.html:26
+#: rhodecode/templates/files/file_authors_box.html:25
 msgid "last author"
 msgstr ""
 
@@ -7286,7 +8037,7 b' msgstr ""'
 msgid "%s Files"
 msgstr ""
 
-#: rhodecode/templates/files/files.html:143
+#: rhodecode/templates/files/files.html:131
 msgid "Switch To Commit"
 msgstr ""
 
@@ -7382,22 +8133,18 b' msgstr ""'
 msgid "Loading file list..."
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:50
+#: rhodecode/templates/files/files_browser_tree.html:6
 msgid "Size"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:51
+#: rhodecode/templates/files/files_browser_tree.html:7
 msgid "Modified"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:52
+#: rhodecode/templates/files/files_browser_tree.html:8
 msgid "Last Commit"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:89
-msgid "Loading..."
-msgstr ""
-
 #: rhodecode/templates/files/files_delete.html:4
 #, python-format
 msgid "%s Files Delete"
@@ -7422,6 +8169,11 b' msgstr ""'
 msgid "Delete File"
 msgstr ""
 
+#: rhodecode/templates/files/files_detail.html:5
+#: rhodecode/templates/files/files_detail.html:12
+msgid "Commit Description"
+msgstr ""
+
 #: rhodecode/templates/files/files_detail.html:35
 msgid "File last commit"
 msgstr ""
@@ -7582,7 +8334,7 b' msgstr ""'
 msgid "Forked"
 msgstr ""
 
-#: rhodecode/templates/forks/forks_data.html:48
+#: rhodecode/templates/forks/forks_data.html:46
 msgid "There are no forks yet"
 msgstr ""
 
@@ -7598,7 +8350,7 b' msgstr ""'
 msgid "RSS journal feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal_data.html:53
+#: rhodecode/templates/journal/journal_data.html:51
 msgid "No entries yet"
 msgstr ""
 
@@ -7786,13 +8538,13 b' msgstr[1] ""'
 msgstr[2] ""
 msgstr[3] ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:330
-#: rhodecode/templates/pullrequests/pullrequest_show.html:365
+#: 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:386
-#: rhodecode/templates/pullrequests/pullrequest_show.html:392
+#: 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 ""
 
@@ -7979,16 +8731,6 b' msgstr ""'
 msgid "Information"
 msgstr ""
 
-#: rhodecode/templates/summary/components.html:95
-#: rhodecode/templates/summary/components.html:98
-#, python-format
-msgid "%(num)s Commit"
-msgid_plural "%(num)s Commits"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
 #: rhodecode/templates/summary/components.html:102
 msgid "Number of Repository Forks"
 msgstr ""
@@ -8052,11 +8794,6 b' msgstr ""'
 msgid "Compare Selected Tags"
 msgstr ""
 
-#: rhodecode/templates/users/user.html:29
-#: rhodecode/templates/users/user_profile.html:5
-msgid "Profile"
-msgstr ""
-
 #: rhodecode/templates/users/user_profile.html:35
 msgid "First name"
 msgstr ""

rhodecode/i18n/de/LC_MESSAGES/rhodecode.po

@@ -9,8 +9,8 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2016-06-28 10:55+0000\n"
-"PO-Revision-Date: 2016-06-28 10:56+0000\n"
+"POT-Creation-Date: 2016-08-02 20:55+0000\n"
+"PO-Revision-Date: 2016-08-02 20:57+0000\n"
 "Last-Translator: Marcin Kuzminski <[e-mail]>\n"
 "Language-Team: German (http://www.transifex.com/rhodecode/RhodeCode/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -20,17 +20,81 b' msgstr ""'
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: rhodecode/authentication/routes.py:60
-#: rhodecode/controllers/admin/settings.py:844
+#: rhodecode/admin/navigation.py:74 rhodecode/authentication/routes.py:60
+#: rhodecode/integrations/views.py:126
 #: rhodecode/templates/admin/permissions/permissions.html:36
 msgid "Global"
 msgstr ""
 
+#: rhodecode/admin/navigation.py:75
+#: rhodecode/templates/admin/repos/repo_edit.html:52
+msgid "VCS"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:76
+msgid "Visual"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:77
+msgid "Remap and Rescan"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:78
+#: rhodecode/templates/admin/repos/repo_edit.html:58
+msgid "Issue Tracker"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:80 rhodecode/templates/register.html:76
+#: 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/email_templates/user_registration.mako:25
+#: rhodecode/templates/users/user_profile.html:51
+msgid "Email"
+msgstr "EMail"
+
+#: rhodecode/admin/navigation.py:81
+msgid "Hooks"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:82
+msgid "Full Text Search"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:83
+#: rhodecode/templates/admin/integrations/base.html:21
+#: rhodecode/templates/admin/integrations/edit.html:8
+#: rhodecode/templates/admin/integrations/edit.html:19
+#: rhodecode/templates/admin/integrations/list.html:15
+#: rhodecode/templates/admin/integrations/list.html:19
+#: rhodecode/templates/admin/integrations/list.html:26
+#: rhodecode/templates/admin/repos/repo_edit.html:72
+#: rhodecode/templates/base/base.html:84
+msgid "Integrations"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:85
+#: rhodecode/templates/admin/settings/settings_system.html:47
+msgid "System Info"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:86
+msgid "Open Source Licenses"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:93
+msgid "Labs"
+msgstr ""
+
 #: rhodecode/authentication/schema.py:35
 msgid "Enable or disable this authentication plugin."
 msgstr ""
 
-#: rhodecode/authentication/schema.py:37
+#: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:37
+#: rhodecode/templates/admin/integrations/list.html:62
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:14
 msgid "Enabled"
 msgstr "Aktiviert"
 
@@ -45,20 +109,20 b' msgstr ""'
 msgid "Auth Cache TTL"
 msgstr ""
 
-#: rhodecode/authentication/views.py:88
+#: rhodecode/authentication/views.py:90
 msgid ""
 "Errors exist when saving plugin settings. Please check the form inputs."
 msgstr ""
 
-#: rhodecode/authentication/views.py:101 rhodecode/authentication/views.py:170
+#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:172
 msgid "Auth settings updated successfully."
 msgstr ""
 
-#: rhodecode/authentication/views.py:175
+#: rhodecode/authentication/views.py:177
 msgid "Errors exist when saving plugin setting. Please check the form inputs."
 msgstr ""
 
-#: rhodecode/authentication/views.py:185
+#: rhodecode/authentication/views.py:187
 msgid "Error occurred during update of auth settings."
 msgstr ""
 
@@ -181,7 +245,7 b' msgstr ""'
 #: rhodecode/templates/login.html:50 rhodecode/templates/register.html:48
 #: rhodecode/templates/admin/my_account/my_account.html:30
 #: rhodecode/templates/admin/users/user_add.html:44
-#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:315
 #: rhodecode/templates/debug_style/login.html:45
 msgid "Password"
 msgstr "Passwort"
@@ -230,12 +294,12 b' msgstr ""'
 msgid "LDAP Attribute to map to user name"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:144
-msgid "The LDAP Login attribute of the CN must be specified"
+#: rhodecode/authentication/plugins/auth_ldap.py:145
+msgid "Login Attribute"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:146
-msgid "Login Attribute"
+msgid "The LDAP Login attribute of the CN must be specified"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:151
@@ -262,7 +326,7 b' msgstr ""'
 msgid "Email Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:348
+#: rhodecode/authentication/plugins/auth_ldap.py:351
 msgid "LDAP"
 msgstr ""
 
@@ -296,7 +360,7 b' msgid "Rhodecode Token Auth"'
 msgstr ""
 
 #: rhodecode/controllers/changelog.py:90 rhodecode/controllers/compare.py:63
-#: rhodecode/controllers/pullrequests.py:279
+#: rhodecode/controllers/pullrequests.py:280
 msgid "There are no commits yet"
 msgstr "Es sind noch keine Commits vorhanden"
 
@@ -332,8 +396,8 b' msgid "No such commit exists for this re'
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:335
-#: rhodecode/controllers/pullrequests.py:746
-#: rhodecode/model/pull_request.py:836
+#: rhodecode/controllers/pullrequests.py:750
+#: rhodecode/model/pull_request.py:843
 #, python-format
 msgid "Status change %(transition_icon)s %(status)s"
 msgstr "Status Änderung %(transition_icon)s %(status)s"
@@ -392,102 +456,102 b' msgstr ""'
 msgid "There are no files yet. %s"
 msgstr "Es sind noch keine Dateien vorhanden. %s"
 
-#: rhodecode/controllers/files.py:390 rhodecode/controllers/files.py:443
-#: rhodecode/controllers/files.py:474 rhodecode/controllers/files.py:549
-#: rhodecode/controllers/files.py:594 rhodecode/controllers/files.py:685
+#: 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
 #, python-format
 msgid "This repository has been locked by %s on %s"
 msgstr "Das Repository is vom %s seit %s gesperrt"
 
-#: rhodecode/controllers/files.py:398 rhodecode/controllers/files.py:451
+#: rhodecode/controllers/files.py:389 rhodecode/controllers/files.py:442
 msgid "You can only delete files with revision being a valid branch "
 msgstr "Du kannst Dateien nur dann löschen, wenn die Revision ein gültiger Branch ist"
 
-#: rhodecode/controllers/files.py:407 rhodecode/controllers/files.py:460
+#: rhodecode/controllers/files.py:398 rhodecode/controllers/files.py:451
 #, python-format
 msgid "Deleted file %s via RhodeCode Enterprise"
 msgstr "Datei %s wurde über RhodeCode Enterprise gelöscht."
 
-#: rhodecode/controllers/files.py:427
+#: rhodecode/controllers/files.py:418
 #, python-format
 msgid "Successfully deleted file %s"
 msgstr "Datei %s erfolgreich gelöscht"
 
-#: rhodecode/controllers/files.py:430 rhodecode/controllers/files.py:536
-#: rhodecode/controllers/files.py:673
+#: rhodecode/controllers/files.py:421 rhodecode/controllers/files.py:527
+#: rhodecode/controllers/files.py:664
 msgid "Error occurred during commit"
 msgstr "Während des Committens trat ein Fehler auf"
 
-#: rhodecode/controllers/files.py:482 rhodecode/controllers/files.py:557
+#: rhodecode/controllers/files.py:473 rhodecode/controllers/files.py:548
 msgid "You can only edit files with revision being a valid branch "
 msgstr "Du kannst Dateien nur dann bearbeiten, wenn die Revision ein gültiger Branch ist"
 
-#: rhodecode/controllers/files.py:494 rhodecode/controllers/files.py:569
+#: rhodecode/controllers/files.py:485 rhodecode/controllers/files.py:560
 #, python-format
 msgid "Edited file %s via RhodeCode Enterprise"
 msgstr "Datei %s wurde über RhodeCode Enterprise editiert."
 
-#: rhodecode/controllers/files.py:511
+#: rhodecode/controllers/files.py:502
 msgid "No changes"
 msgstr "Keine Änderungen"
 
-#: rhodecode/controllers/files.py:533 rhodecode/controllers/files.py:662
+#: rhodecode/controllers/files.py:524 rhodecode/controllers/files.py:653
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Der Commit zu %s war erfolgreich"
 
-#: rhodecode/controllers/files.py:607 rhodecode/controllers/files.py:696
+#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:687
 msgid "Added file via RhodeCode Enterprise"
 msgstr "Eine Datei wurde über RhodeCode Enterprise hinzugefügt."
 
-#: rhodecode/controllers/files.py:632
+#: rhodecode/controllers/files.py:623
 msgid "No filename"
 msgstr "Kein Dateiname"
 
-#: rhodecode/controllers/files.py:665
+#: rhodecode/controllers/files.py:656
 msgid ""
 "The location specified must be a relative path and must not contain .. in "
 "the path"
 msgstr "Die spezifizierte Adresse muss ein gültiger Pfad sein und .. darf nicht teil des Pfades sein"
 
-#: rhodecode/controllers/files.py:719
+#: rhodecode/controllers/files.py:710
 msgid "Downloads disabled"
 msgstr "Downloads deaktiviert"
 
-#: rhodecode/controllers/files.py:725
+#: rhodecode/controllers/files.py:716
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Unbekannte Revision %s"
 
-#: rhodecode/controllers/files.py:727
+#: rhodecode/controllers/files.py:718
 msgid "Empty repository"
 msgstr "Leeres Repository"
 
-#: rhodecode/controllers/files.py:729 rhodecode/controllers/files.py:763
+#: rhodecode/controllers/files.py:720 rhodecode/controllers/files.py:754
 msgid "Unknown archive type"
 msgstr "Unbekannter Archiv Typ"
 
-#: rhodecode/controllers/files.py:930
+#: rhodecode/controllers/files.py:921
 #, python-format
 msgid "Commit %(commit)s does not exist."
 msgstr ""
 
-#: rhodecode/controllers/files.py:947
+#: rhodecode/controllers/files.py:938
 #, python-format
 msgid "%(file_path)s has not changed between %(commit_1)s and %(commit_2)s."
 msgstr ""
 
-#: rhodecode/controllers/files.py:1014
+#: rhodecode/controllers/files.py:1005
 msgid "Changesets"
 msgstr "Changesets"
 
-#: rhodecode/controllers/files.py:1035 rhodecode/controllers/summary.py:256
-#: rhodecode/model/pull_request.py:1051 rhodecode/model/scm.py:783
+#: rhodecode/controllers/files.py:1026 rhodecode/controllers/summary.py:251
+#: rhodecode/model/pull_request.py:1059 rhodecode/model/scm.py:780
 #: rhodecode/templates/base/vcs_settings.html:138
 msgid "Branches"
 msgstr "Entwicklungszweige"
 
-#: rhodecode/controllers/files.py:1039 rhodecode/model/scm.py:798
+#: rhodecode/controllers/files.py:1030 rhodecode/model/scm.py:795
 #: rhodecode/templates/base/vcs_settings.html:163
 msgid "Tags"
 msgstr "Tags"
@@ -502,14 +566,14 b' msgid "Groups"'
 msgstr "Gruppen"
 
 #: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247
-#: rhodecode/controllers/pullrequests.py:382
+#: rhodecode/controllers/pullrequests.py:383
 #: 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:79
-#: rhodecode/templates/base/base.html:149
-#: rhodecode/templates/base/base.html:626
+#: rhodecode/templates/base/base.html:78
+#: rhodecode/templates/base/base.html:150
+#: rhodecode/templates/base/base.html:627
 msgid "Repositories"
 msgstr "Repositories"
 
@@ -526,98 +590,98 b' msgstr "\xc3\x96ffentliches Journal"'
 msgid "journal"
 msgstr "Logbuch"
 
-#: rhodecode/controllers/pullrequests.py:293
+#: rhodecode/controllers/pullrequests.py:294
 msgid "Commit does not exist"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:405
+#: rhodecode/controllers/pullrequests.py:406
 msgid "Pull request requires a title with min. 3 chars"
 msgstr "Der Titel eines Pullrequests muss mindestens aus 3 Zeichen bestehen"
 
-#: rhodecode/controllers/pullrequests.py:407
+#: rhodecode/controllers/pullrequests.py:408
 msgid "Error creating pull request: {}"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:454
+#: rhodecode/controllers/pullrequests.py:455
 msgid "Successfully opened new pull request"
 msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet"
 
-#: rhodecode/controllers/pullrequests.py:457
+#: rhodecode/controllers/pullrequests.py:458
 msgid "Error occurred during sending pull request"
 msgstr "Es trat ein Fehler auf während der Pullrequest gesendet wurde"
 
-#: rhodecode/controllers/pullrequests.py:497
+#: rhodecode/controllers/pullrequests.py:498
 msgid "Cannot update closed pull requests."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:503
+#: rhodecode/controllers/pullrequests.py:504
 msgid "Pull request title & description updated."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:513
+#: rhodecode/controllers/pullrequests.py:514
 msgid ""
 "Pull request updated to \"{source_commit_id}\" with {count_added} added, "
 "{count_removed} removed commits."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:523
+#: rhodecode/controllers/pullrequests.py:524
 msgid "Nothing changed in pull request."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:526
+#: rhodecode/controllers/pullrequests.py:527
 msgid ""
 "Skipping update of pull request due to reference type: {reference_type}"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:533
+#: rhodecode/controllers/pullrequests.py:534
 msgid "Update failed due to missing commits."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:579
+#: rhodecode/controllers/pullrequests.py:580
 msgid "Pull request reviewer approval is pending."
 msgstr "Reviewer Zustimmung fehlt."
 
-#: rhodecode/controllers/pullrequests.py:593
+#: rhodecode/controllers/pullrequests.py:594
 msgid "Pull request was successfully merged and closed."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:631
+#: rhodecode/controllers/pullrequests.py:632
 msgid "Successfully deleted pull request"
 msgstr "Pullrequest erfolgreich gelöscht"
 
-#: rhodecode/controllers/pullrequests.py:664
+#: rhodecode/controllers/pullrequests.py:668
 msgid "Reviewer approval is pending."
 msgstr "Reviewer Zustimmung steht noch aus."
 
-#: rhodecode/controllers/pullrequests.py:706
+#: rhodecode/controllers/pullrequests.py:710
 msgid "Close Pull Request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:750
-#: rhodecode/model/pull_request.py:840
+#: rhodecode/controllers/pullrequests.py:754
+#: rhodecode/model/pull_request.py:847
 msgid "Closing with"
 msgstr "Schließen mit"
 
-#: rhodecode/controllers/pullrequests.py:795
+#: rhodecode/controllers/pullrequests.py:802
 #, python-format
 msgid ""
 "Closing pull request on other statuses than rejected or approved is "
 "forbidden. Calculated status from all reviewers is currently: %s"
 msgstr "Ein Pullrequest kann nur in den Stati rejected oder approved geschlossen werden. Berechneter Status aus den Reviews ist: %s"
 
-#: rhodecode/controllers/summary.py:240
+#: rhodecode/controllers/summary.py:235
 msgid "Branch"
 msgstr "Branch"
 
-#: rhodecode/controllers/summary.py:241
+#: rhodecode/controllers/summary.py:236
 msgid "Tag"
 msgstr "Tag"
 
-#: rhodecode/controllers/summary.py:242
+#: rhodecode/controllers/summary.py:237
 msgid "Bookmark"
 msgstr "Lesezeichen"
 
-#: rhodecode/controllers/summary.py:257
+#: rhodecode/controllers/summary.py:252
 msgid "Closed branches"
 msgstr "Geschlossene Branches"
 
@@ -629,83 +693,87 b' msgstr "Standardeinstellungen erfolgreic'
 msgid "Error occurred during update of default values"
 msgstr "Fehler bei der Aktualisierung der Standardwerte aufgetreten"
 
-#: rhodecode/controllers/admin/gists.py:59
+#: rhodecode/controllers/admin/gists.py:63
 #: rhodecode/controllers/admin/my_account.py:307
-#: rhodecode/controllers/admin/users.py:436
+#: rhodecode/controllers/admin/users.py:431
 msgid "forever"
 msgstr "für immer"
 
-#: rhodecode/controllers/admin/gists.py:60
+#: rhodecode/controllers/admin/gists.py:64
 #: rhodecode/controllers/admin/my_account.py:308
-#: rhodecode/controllers/admin/users.py:437
+#: rhodecode/controllers/admin/users.py:432
 msgid "5 minutes"
 msgstr "5 Minuten"
 
-#: rhodecode/controllers/admin/gists.py:61
+#: rhodecode/controllers/admin/gists.py:65
 #: rhodecode/controllers/admin/my_account.py:309
-#: rhodecode/controllers/admin/users.py:438
+#: rhodecode/controllers/admin/users.py:433
 msgid "1 hour"
 msgstr "1 Stunde"
 
-#: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/gists.py:66
 #: rhodecode/controllers/admin/my_account.py:310
-#: rhodecode/controllers/admin/users.py:439
+#: rhodecode/controllers/admin/users.py:434
 msgid "1 day"
 msgstr "1 Tag"
 
-#: rhodecode/controllers/admin/gists.py:63
+#: rhodecode/controllers/admin/gists.py:67
 #: rhodecode/controllers/admin/my_account.py:311
-#: rhodecode/controllers/admin/users.py:440
+#: rhodecode/controllers/admin/users.py:435
 msgid "1 month"
 msgstr "1 Monat"
 
-#: rhodecode/controllers/admin/gists.py:67
+#: rhodecode/controllers/admin/gists.py:71
 #: rhodecode/controllers/admin/my_account.py:313
-#: rhodecode/controllers/admin/users.py:442
+#: rhodecode/controllers/admin/users.py:437
 msgid "Lifetime"
 msgstr "Lebensdauer"
 
-#: rhodecode/controllers/admin/gists.py:69
+#: rhodecode/controllers/admin/gists.py:73
 msgid "Requires registered account"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:70
+#: rhodecode/controllers/admin/gists.py:74
 msgid "Can be accessed by anonymous users"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:180
+#: rhodecode/controllers/admin/gists.py:200
 msgid "Error occurred during gist creation"
 msgstr "Fehler bei der Erstellung des Gist aufgetreten"
 
-#: rhodecode/controllers/admin/gists.py:211
+#: rhodecode/controllers/admin/gists.py:231
 #, python-format
 msgid "Deleted gist %s"
 msgstr "Gist %s gelöscht"
 
-#: rhodecode/controllers/admin/gists.py:284
+#: rhodecode/controllers/admin/gists.py:308
 msgid "Successfully updated gist content"
 msgstr "Gist Inhalt erfolgreich aktualisiert"
 
-#: rhodecode/controllers/admin/gists.py:289
+#: rhodecode/controllers/admin/gists.py:313
 msgid "Successfully updated gist data"
 msgstr "Gist Daten erfolgreich aktualisiert"
 
-#: rhodecode/controllers/admin/gists.py:292
+#: rhodecode/controllers/admin/gists.py:316
+msgid "Error occurred during update of gist {}: {}"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:320
 #, python-format
 msgid "Error occurred during update of gist %s"
 msgstr "Fehler beim Update des Gist %s aufgetreten"
 
-#: rhodecode/controllers/admin/gists.py:315
+#: rhodecode/controllers/admin/gists.py:343
 #: 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:253
+#: rhodecode/templates/data_table/_dt_elements.html:255
 msgid "never"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:320
+#: rhodecode/controllers/admin/gists.py:348
 #, python-format
 msgid "%(expiry)s - current value"
 msgstr ""
@@ -719,7 +787,7 b' msgid "Your account was updated successf'
 msgstr "Ihr Account wurde erfolgreich aktualisiert"
 
 #: rhodecode/controllers/admin/my_account.py:143
-#: rhodecode/controllers/admin/users.py:223
+#: rhodecode/controllers/admin/users.py:218
 #, python-format
 msgid "Error occurred during update of user %s"
 msgstr "Fehler bei der Aktualisierung des Benutzers %s"
@@ -733,38 +801,38 b' msgid "Error occurred during update of u'
 msgstr "Fehler bei der Aktualisierung des Benutzerpassworts aufgetreten"
 
 #: rhodecode/controllers/admin/my_account.py:261
-#: rhodecode/controllers/admin/users.py:616
+#: rhodecode/controllers/admin/users.py:611
 #, python-format
 msgid "Added new email address `%s` for user account"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:268
-#: rhodecode/controllers/admin/users.py:623
+#: rhodecode/controllers/admin/users.py:618
 msgid "An error occurred during email saving"
 msgstr "Währen der Speicherung der E-Mail-Addresse trat ein Fehler auf"
 
 #: rhodecode/controllers/admin/my_account.py:278
-#: rhodecode/controllers/admin/users.py:638
+#: rhodecode/controllers/admin/users.py:633
 msgid "Removed email address from user account"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:316
-#: rhodecode/controllers/admin/users.py:445
+#: rhodecode/controllers/admin/users.py:440
 msgid "Role"
 msgstr "Rolle"
 
 #: rhodecode/controllers/admin/my_account.py:329
-#: rhodecode/controllers/admin/users.py:469
+#: rhodecode/controllers/admin/users.py:464
 msgid "Auth token successfully created"
 msgstr "Authentifizierungstoken erfolgreich erstellt"
 
 #: rhodecode/controllers/admin/my_account.py:342
-#: rhodecode/controllers/admin/users.py:488
+#: rhodecode/controllers/admin/users.py:483
 msgid "Auth token successfully reset"
 msgstr "Authentifizierungstoken erfolgreich zurückgesetzt"
 
 #: rhodecode/controllers/admin/my_account.py:346
-#: rhodecode/controllers/admin/users.py:492
+#: rhodecode/controllers/admin/users.py:487
 msgid "Auth token successfully deleted"
 msgstr "Authentifizierungstoken erfolgreich gelöscht"
 
@@ -839,309 +907,250 b' msgstr "Es ist nicht m\xc3\xb6glich als Administrator die eigenen Berechtigungen zu \xc3\xa4ndern"'
 msgid "Repository Group permissions updated"
 msgstr "Berechtigungen der Repository-Gruppe aktualisiert"
 
-#: rhodecode/controllers/admin/repos.py:128
+#: rhodecode/controllers/admin/repos.py:129
 #, python-format
 msgid "Error creating repository %s: invalid certificate"
 msgstr "Fehler beim Erstellen des Repositorys %s: Ungültiges Zertifikat"
 
-#: rhodecode/controllers/admin/repos.py:132
+#: rhodecode/controllers/admin/repos.py:133
 #, python-format
 msgid "Error creating repository %s"
 msgstr "Fehler beim Erstellen des Repositorys %s"
 
-#: rhodecode/controllers/admin/repos.py:264
+#: rhodecode/controllers/admin/repos.py:265
 #, python-format
 msgid "Created repository %s from %s"
 msgstr "Repository %s von %s erstellt"
 
-#: rhodecode/controllers/admin/repos.py:273
+#: rhodecode/controllers/admin/repos.py:274
 #, python-format
 msgid "Forked repository %s as %s"
 msgstr "Repository %s als %s geforkt"
 
-#: rhodecode/controllers/admin/repos.py:276
+#: rhodecode/controllers/admin/repos.py:277
 #, python-format
 msgid "Created repository %s"
 msgstr "Repository %s erstellt"
 
-#: rhodecode/controllers/admin/repos.py:318
+#: rhodecode/controllers/admin/repos.py:319
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Repository %s wurde erfolgreich aktualisiert"
 
-#: rhodecode/controllers/admin/repos.py:337
+#: rhodecode/controllers/admin/repos.py:338
 #, python-format
 msgid "Error occurred during update of repository %s"
 msgstr "Fehler bei der Aktualisierung des Repositorys %s aufgetreten"
 
-#: rhodecode/controllers/admin/repos.py:365
+#: rhodecode/controllers/admin/repos.py:366
 #, python-format
 msgid "Detached %s forks"
 msgstr "%s Forks abgetrennt"
 
-#: rhodecode/controllers/admin/repos.py:368
+#: rhodecode/controllers/admin/repos.py:369
 #, python-format
 msgid "Deleted %s forks"
 msgstr "%s Forks gelöscht"
 
-#: rhodecode/controllers/admin/repos.py:373
+#: rhodecode/controllers/admin/repos.py:374
 #, python-format
 msgid "Deleted repository %s"
 msgstr "Repository %s gelöscht"
 
-#: rhodecode/controllers/admin/repos.py:376
+#: rhodecode/controllers/admin/repos.py:377
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr "%s konnte nicht gelöscht werden da es noch Forks enthält"
 
-#: rhodecode/controllers/admin/repos.py:381
+#: rhodecode/controllers/admin/repos.py:382
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Fehler beim Löschen von %s aufgetreten"
 
-#: rhodecode/controllers/admin/repos.py:435
+#: rhodecode/controllers/admin/repos.py:436
 msgid "Repository permissions updated"
 msgstr "Repository Berechtigungen aktualisiert"
 
-#: rhodecode/controllers/admin/repos.py:466
+#: rhodecode/controllers/admin/repos.py:467
 msgid "An error occurred during creation of field"
 msgstr "Fehler bei der Erstellung des Feldes aufgetreten"
 
-#: rhodecode/controllers/admin/repos.py:481
+#: rhodecode/controllers/admin/repos.py:482
 msgid "An error occurred during removal of field"
 msgstr "Fehler beim Löschen des Feldes aufgetreten"
 
-#: rhodecode/controllers/admin/repos.py:520
+#: rhodecode/controllers/admin/repos.py:521
 msgid "Updated repository visibility in public journal"
 msgstr "Sichtbarkeit des Repositorys im öffentlichen Logbuch aktualisiert"
 
-#: rhodecode/controllers/admin/repos.py:524
+#: rhodecode/controllers/admin/repos.py:525
 msgid "An error occurred during setting this repository in public journal"
 msgstr "Es trat ein Fehler während der Aktualisierung der Sicherbarkeit dieses Repositorys im Öffentlichen Logbuch auf"
 
-#: rhodecode/controllers/admin/repos.py:548
+#: rhodecode/controllers/admin/repos.py:549
 msgid "Nothing"
 msgstr "Nichts"
 
-#: rhodecode/controllers/admin/repos.py:550
+#: rhodecode/controllers/admin/repos.py:551
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "Markiere Repository %s als Abzweig von Repository %s"
 
-#: rhodecode/controllers/admin/repos.py:557
+#: rhodecode/controllers/admin/repos.py:558
 msgid "An error occurred during this operation"
 msgstr "Während dieser operation trat ein Fehler auf"
 
-#: rhodecode/controllers/admin/repos.py:575
+#: rhodecode/controllers/admin/repos.py:576
 msgid "Locked repository"
 msgstr "Gesperrtes Respository"
 
-#: rhodecode/controllers/admin/repos.py:578
+#: rhodecode/controllers/admin/repos.py:579
 msgid "Unlocked repository"
 msgstr "Entsperrtes Repository"
 
-#: rhodecode/controllers/admin/repos.py:581
-#: rhodecode/controllers/admin/repos.py:610
+#: rhodecode/controllers/admin/repos.py:582
+#: rhodecode/controllers/admin/repos.py:611
 msgid "An error occurred during unlocking"
 msgstr "Fehler beim Entsperren des Repositorys aufgetreten"
 
-#: rhodecode/controllers/admin/repos.py:600
+#: rhodecode/controllers/admin/repos.py:601
 msgid "Unlocked"
 msgstr "Entsperrt"
 
-#: rhodecode/controllers/admin/repos.py:604
+#: rhodecode/controllers/admin/repos.py:605
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: rhodecode/controllers/admin/repos.py:606
+#: rhodecode/controllers/admin/repos.py:607
 #, python-format
 msgid "Repository has been %s"
 msgstr "Repository wurde %s"
 
-#: rhodecode/controllers/admin/repos.py:621
+#: rhodecode/controllers/admin/repos.py:622
 msgid "Cache invalidation successful"
 msgstr "Cache erfolgreich invalidiert"
 
-#: rhodecode/controllers/admin/repos.py:625
+#: rhodecode/controllers/admin/repos.py:626
 msgid "An error occurred during cache invalidation"
 msgstr "Währen der Cache Invalidierung trat ein Fehler auf"
 
-#: rhodecode/controllers/admin/repos.py:645
+#: rhodecode/controllers/admin/repos.py:646
 msgid "Pulled from remote location"
 msgstr "Von entferntem Ort übertragen"
 
-#: rhodecode/controllers/admin/repos.py:648
+#: rhodecode/controllers/admin/repos.py:649
 msgid "An error occurred during pull from remote location"
 msgstr "Fehler während des Abrufens vom remote Speicherplatz aufgetreten"
 
-#: rhodecode/controllers/admin/repos.py:670
+#: rhodecode/controllers/admin/repos.py:671
 msgid "An error occurred during deletion of repository stats"
 msgstr "Fehler während des Löschens der Repository-Statistik aufgetreten"
 
-#: rhodecode/controllers/admin/repos.py:717
+#: rhodecode/controllers/admin/repos.py:718
 msgid "Error occurred during deleting issue tracker entry"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:720
-#: rhodecode/controllers/admin/settings.py:362
+#: rhodecode/controllers/admin/repos.py:721
+#: rhodecode/controllers/admin/settings.py:363
 msgid "Removed issue tracker entry"
 msgstr "Ein Eintrag wurde aus dem Issue Tracker gelöscht."
 
-#: rhodecode/controllers/admin/repos.py:750
-#: rhodecode/controllers/admin/settings.py:408
+#: rhodecode/controllers/admin/repos.py:751
+#: rhodecode/controllers/admin/settings.py:409
 msgid "Updated issue tracker entries"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:809
-#: rhodecode/controllers/admin/settings.py:141
-#: rhodecode/controllers/admin/settings.py:718
+#: rhodecode/controllers/admin/repos.py:812
+#: rhodecode/controllers/admin/settings.py:142
+#: rhodecode/controllers/admin/settings.py:719
 msgid "Some form inputs contain invalid data."
 msgstr "Einige Eingabefelder enthalten ungültige Daten."
 
-#: rhodecode/controllers/admin/repos.py:827
+#: rhodecode/controllers/admin/repos.py:830
 msgid "Error occurred during updating repository VCS settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:831
-#: rhodecode/controllers/admin/settings.py:167
+#: rhodecode/controllers/admin/repos.py:834
+#: rhodecode/controllers/admin/settings.py:168
 msgid "Updated VCS settings"
 msgstr "VCS-Einstellungen aktualisiert"
 
-#: rhodecode/controllers/admin/settings.py:163
-#: rhodecode/controllers/admin/settings.py:266
+#: rhodecode/controllers/admin/settings.py:164
+#: rhodecode/controllers/admin/settings.py:267
 msgid "Error occurred during updating application settings"
 msgstr "Fehler während der Aktualisierung der Applikations-Einstellungen aufgetreten"
 
-#: rhodecode/controllers/admin/settings.py:210
+#: rhodecode/controllers/admin/settings.py:211
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr "Repositories erfolgreich gescannt, hinzugefügt: %s; entfernt: %s"
 
-#: rhodecode/controllers/admin/settings.py:262
+#: rhodecode/controllers/admin/settings.py:263
 msgid "Updated application settings"
 msgstr "Applikations-Einstellungen aktualisiert"
 
-#: rhodecode/controllers/admin/settings.py:326
+#: rhodecode/controllers/admin/settings.py:327
 msgid "Updated visualisation settings"
 msgstr "Visualisierungs-Einstellungen aktualisiert"
 
-#: rhodecode/controllers/admin/settings.py:329
+#: rhodecode/controllers/admin/settings.py:330
 msgid "Error occurred during updating visualisation settings"
 msgstr "Fehler bei der Aktualisierung der Visualisierungs-Einstellungen"
 
-#: rhodecode/controllers/admin/settings.py:421
+#: rhodecode/controllers/admin/settings.py:422
 msgid "Please enter email address"
 msgstr "Bitte E-Mail-Adresse eingeben"
 
-#: rhodecode/controllers/admin/settings.py:439
+#: rhodecode/controllers/admin/settings.py:440
 msgid "Send email task created"
 msgstr "Aufgabe zum Senden der E-Mail erstellt"
 
-#: rhodecode/controllers/admin/settings.py:472
+#: rhodecode/controllers/admin/settings.py:473
 msgid "Added new hook"
 msgstr "Neuer Hook hinzugefügt"
 
-#: rhodecode/controllers/admin/settings.py:487
+#: rhodecode/controllers/admin/settings.py:488
 msgid "Updated hooks"
 msgstr "Die Hooks wurden aktutalisiert"
 
-#: rhodecode/controllers/admin/settings.py:491
+#: rhodecode/controllers/admin/settings.py:492
 msgid "Error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:539
+#: rhodecode/controllers/admin/settings.py:540
 #, python-format
 msgid "Critical: your disk space is very low <b>%s%%</b> usedpercent"
 msgstr "Kritisch: Ihr Plattenplatz ist sehr gering <b>%s%%</b> belegt"
 
-#: rhodecode/controllers/admin/settings.py:543
+#: rhodecode/controllers/admin/settings.py:544
 #, python-format
 msgid "Warning: your disk space is running low <b>%s%%</b> usedpercent"
 msgstr "Warnung: Ihr Plattenplatz geht zur Neige <b>%s%%</b> belegt"
 
-#: rhodecode/controllers/admin/settings.py:739
+#: rhodecode/controllers/admin/settings.py:740
 msgid "Error occurred during updating labs settings"
 msgstr "Fehler bei der Aktualisierung der Labs-Einstellungen aufgetreten"
 
-#: rhodecode/controllers/admin/settings.py:744
+#: rhodecode/controllers/admin/settings.py:745
 msgid "Updated Labs settings"
 msgstr "Labs-Einstellungen aktualisiert"
 
-#: rhodecode/controllers/admin/settings.py:794
-msgid "Mercurial server-side merge"
-msgstr "Mercurial merge auf der Serverseite"
-
 #: rhodecode/controllers/admin/settings.py:795
-msgid ""
-"Use rebase instead of creating a merge commit when merging via web interface"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:801
 msgid "Subversion HTTP Support"
 msgstr ""
 
+#: rhodecode/controllers/admin/settings.py:796
+msgid "Proxy subversion HTTP requests"
+msgstr ""
+
 #: rhodecode/controllers/admin/settings.py:802
-msgid "Proxy subversion HTTP requests"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:808
 msgid "Subversion HTTP Server URL"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:810
+#: rhodecode/controllers/admin/settings.py:804
 msgid "e.g. http://localhost:8080/"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:845
-#: rhodecode/templates/admin/repos/repo_edit.html:48
-msgid "VCS"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:846
-msgid "Visual"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:847
-msgid "Remap and Rescan"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:849
-#: rhodecode/templates/admin/repos/repo_edit.html:54
-msgid "Issue Tracker"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:851
-#: rhodecode/templates/register.html:76
-#: 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:91
-#: rhodecode/templates/users/user_profile.html:51
-msgid "Email"
-msgstr "EMail"
-
-#: rhodecode/controllers/admin/settings.py:852
-msgid "Hooks"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:853
-msgid "Full Text Search"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:855
-#: rhodecode/templates/admin/settings/settings_system.html:47
-msgid "System Info"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:857
-msgid "Open Source Licenses"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:875
-msgid "Labs"
-msgstr ""
-
 #: rhodecode/controllers/admin/user_groups.py:168
 #, python-format
 msgid "Created user group %(user_group_link)s"
@@ -1183,123 +1192,286 b' msgid "User Group global permissions upd'
 msgstr "Globale Berechtigungen der Benutzergruppe aktualisiert"
 
 #: rhodecode/controllers/admin/user_groups.py:440
-#: rhodecode/controllers/admin/users.py:566
+#: rhodecode/controllers/admin/users.py:561
 msgid "An error occurred during permissions saving"
 msgstr "Fehler beim Speichern der Berechtigungen aufgetreten"
 
-#: rhodecode/controllers/admin/users.py:147
+#: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "Created user %(user_link)s"
 msgstr "Benutzer %(user_link)s erstellt"
 
-#: rhodecode/controllers/admin/users.py:162
+#: rhodecode/controllers/admin/users.py:157
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr "Fehler beim Erstellen des Benutzers %s aufgetreten"
 
-#: rhodecode/controllers/admin/users.py:206
+#: rhodecode/controllers/admin/users.py:201
 msgid "User updated successfully"
 msgstr "Der Benutzer wurde erfolgreich aktualisiert"
 
-#: rhodecode/controllers/admin/users.py:257
+#: rhodecode/controllers/admin/users.py:252
 #, python-format
 msgid "Detached %s repositories"
 msgstr "%s Repositories abgetrennt"
 
-#: rhodecode/controllers/admin/users.py:262
+#: rhodecode/controllers/admin/users.py:257
 #, python-format
 msgid "Deleted %s repositories"
 msgstr "%s Repositories gelöscht"
 
-#: rhodecode/controllers/admin/users.py:270
+#: rhodecode/controllers/admin/users.py:265
 #, python-format
 msgid "Detached %s repository groups"
 msgstr "%s Repository-Gruppen abgetrennt"
 
-#: rhodecode/controllers/admin/users.py:275
+#: rhodecode/controllers/admin/users.py:270
 #, python-format
 msgid "Deleted %s repository groups"
 msgstr "%s Repository-Gruppen gelöscht"
 
-#: rhodecode/controllers/admin/users.py:283
+#: rhodecode/controllers/admin/users.py:278
 #, python-format
 msgid "Detached %s user groups"
 msgstr "%s Benutzergruppen abgetrennt"
 
-#: rhodecode/controllers/admin/users.py:288
+#: rhodecode/controllers/admin/users.py:283
 #, python-format
 msgid "Deleted %s user groups"
 msgstr "%s Benutzergruppen gelöscht"
 
-#: rhodecode/controllers/admin/users.py:299
+#: rhodecode/controllers/admin/users.py:294
 msgid "Successfully deleted user"
 msgstr "Benutzer erfolgreich gelöscht"
 
-#: rhodecode/controllers/admin/users.py:305
+#: rhodecode/controllers/admin/users.py:300
 msgid "An error occurred during deletion of user"
 msgstr "Während der Löschen des Benutzers trat ein Fehler auf"
 
-#: rhodecode/controllers/admin/users.py:324
+#: rhodecode/controllers/admin/users.py:319
 msgid "Force password change disabled for user"
 msgstr "Erzwungene Passwortänderung inaktiv für Benutzer"
 
-#: rhodecode/controllers/admin/users.py:326
+#: rhodecode/controllers/admin/users.py:321
 msgid "Force password change enabled for user"
 msgstr "Erzwungene Passwortänderung aktiv für Benutzer"
 
-#: rhodecode/controllers/admin/users.py:330
+#: rhodecode/controllers/admin/users.py:325
 msgid "An error occurred during password reset for user"
 msgstr "Fehler beim Zurücksetzen des Passworts für den Benutzer aufgetreten"
 
-#: rhodecode/controllers/admin/users.py:356
+#: rhodecode/controllers/admin/users.py:351
 #, python-format
 msgid "Created repository group `%s`"
 msgstr "Repository-Gruppe %s erstellt"
 
-#: rhodecode/controllers/admin/users.py:360
+#: rhodecode/controllers/admin/users.py:355
 msgid "An error occurred during repository group creation for user"
 msgstr "Fehler bei der Erstellung der Repository-Gruppe aufgetreten"
 
-#: rhodecode/controllers/admin/users.py:379
-#: rhodecode/controllers/admin/users.py:400
-#: rhodecode/controllers/admin/users.py:430
-#: rhodecode/controllers/admin/users.py:461
-#: rhodecode/controllers/admin/users.py:478
-#: rhodecode/controllers/admin/users.py:501
-#: rhodecode/controllers/admin/users.py:575
-#: rhodecode/controllers/admin/users.py:588
-#: rhodecode/controllers/admin/users.py:646
+#: 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
 msgid "You can't edit this user"
 msgstr "Sie können diesen Benutzer nicht editieren"
 
-#: rhodecode/controllers/admin/users.py:414
+#: rhodecode/controllers/admin/users.py:409
 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:550
+#: rhodecode/controllers/admin/users.py:545
 msgid "User global permissions updated successfully"
 msgstr "Globale Berechtigungen des Benutzers erfolgreich aktualisiert"
 
-#: rhodecode/controllers/admin/users.py:678
+#: rhodecode/controllers/admin/users.py:673
 #, python-format
 msgid "An error occurred during ip saving:%s"
 msgstr "Fehler beim Speichern der IP-Adresse aufgetreten: %s"
 
-#: rhodecode/controllers/admin/users.py:693
+#: rhodecode/controllers/admin/users.py:688
 msgid "An error occurred during ip saving"
 msgstr "Fehler beim Speichern der IP-Adresse aufgetreten"
 
-#: rhodecode/controllers/admin/users.py:697
+#: rhodecode/controllers/admin/users.py:692
 #, python-format
 msgid "Added ips %s to user whitelist"
 msgstr "IP-Adressen %s zur Whitelist des Benutzers hinzugefügt"
 
-#: rhodecode/controllers/admin/users.py:715
+#: rhodecode/controllers/admin/users.py:710
 msgid "Removed ip address from user whitelist"
 msgstr "IP-Adressen von der Whitelist des Benutzers entfernt"
 
+#: rhodecode/events/pullrequest.py:65
+msgid "pullrequest created"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:74
+msgid "pullrequest closed"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:83
+msgid "pullrequest commits updated"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:92
+msgid "pullrequest review changed"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:101
+msgid "pullrequest merged"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:110
+msgid "pullrequest commented"
+msgstr ""
+
+#: rhodecode/events/repo.py:135
+msgid "repository pre create"
+msgstr ""
+
+#: rhodecode/events/repo.py:144
+msgid "repository created"
+msgstr ""
+
+#: rhodecode/events/repo.py:153
+msgid "repository pre delete"
+msgstr ""
+
+#: rhodecode/events/repo.py:162
+msgid "repository deleted"
+msgstr ""
+
+#: rhodecode/events/repo.py:193
+msgid "repository pre pull"
+msgstr ""
+
+#: rhodecode/events/repo.py:202
+msgid "repository pull"
+msgstr ""
+
+#: rhodecode/events/repo.py:211
+msgid "repository pre push"
+msgstr ""
+
+#: rhodecode/events/repo.py:222
+msgid "repository push"
+msgstr ""
+
+#: rhodecode/events/user.py:34
+msgid "user registered"
+msgstr ""
+
+#: rhodecode/events/user.py:48
+msgid "user pre create"
+msgstr ""
+
+#: rhodecode/events/user.py:61
+msgid "user pre update"
+msgstr ""
+
+#: rhodecode/integrations/schema.py:35
+msgid "Enable or disable this integration."
+msgstr ""
+
+#: rhodecode/integrations/schema.py:42
+msgid "Short name for this integration."
+msgstr ""
+
+#: rhodecode/integrations/schema.py:44
+msgid "Integration name"
+msgstr ""
+
+#: rhodecode/integrations/views.py:172
+msgid "Integration {integration_name} deleted successfully."
+msgstr ""
+
+#: rhodecode/integrations/views.py:200
+msgid ""
+"Errors exist when saving integration settings. Please check the form inputs."
+msgstr ""
+
+#: rhodecode/integrations/views.py:220
+msgid "Integration {integration_name} updated successfully."
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:45
+msgid "Slack service URL"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:46
+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:59 rhodecode/templates/login.html:43
+#: rhodecode/templates/register.html:41
+#: 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/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/debug_style/login.html:36
+#: rhodecode/templates/email_templates/user_registration.mako:23
+#: rhodecode/templates/users/user_profile.html:27
+msgid "Username"
+msgstr "Benutzername"
+
+#: rhodecode/integrations/types/slack.py:60
+msgid "Username to show notifications coming from."
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:69
+msgid "Channel"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:70
+msgid "Channel to send notifications to."
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:79
+msgid "Emoji"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:80
+msgid "Emoji to use eg. :studio_microphone:"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:107
+msgid "Slack"
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:41
+msgid "Webhook URL"
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:42
+msgid "URL of the webhook to receive POST event."
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:51
+msgid "Secret Token"
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:52
+msgid "String used to validate received payloads."
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:62
+msgid "Webhook"
+msgstr ""
+
 #: rhodecode/lib/action_parser.py:89
 msgid "[deleted] repository"
 msgstr "[gelöscht] Repository"
@@ -1441,11 +1613,15 b' msgstr "Aktion wird f\xc3\xbcr %s nicht unterst\xc3\xbctzt."'
 msgid "You need to be signed in to view this page"
 msgstr "Sie müssen angemeldet sein, um diese Seite zu betrachten"
 
-#: rhodecode/lib/base.py:511
+#: rhodecode/lib/base.py:545
 #, python-format
 msgid "The repository at %(repo_name)s cannot be located."
 msgstr ""
 
+#: rhodecode/lib/diffs.py:56
+msgid "Click to comment"
+msgstr ""
+
 #: rhodecode/lib/diffs.py:71
 msgid "Binary file"
 msgstr "Binärdatei"
@@ -1459,36 +1635,40 b' msgstr "Der \xc3\x84nderungssatz war zu gro\xc3\x9f und wurde abgeschnitten, benutzen sie das Diff Men\xc3\xbc um die Unterschiede anzuzeigen"'
 msgid "No changes detected"
 msgstr "Keine Änderungen erkannt"
 
-#: rhodecode/lib/helpers.py:1434
+#: rhodecode/lib/diffs.py:631
+msgid "Click to select line"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1481
 #, python-format
 msgid " and %s more"
 msgstr "und %s weitere"
 
-#: rhodecode/lib/helpers.py:1438
+#: rhodecode/lib/helpers.py:1485
 msgid "No Files"
 msgstr "Keine Dateien"
 
-#: rhodecode/lib/helpers.py:1511
+#: rhodecode/lib/helpers.py:1558
 msgid "new file"
 msgstr "neue Datei"
 
-#: rhodecode/lib/helpers.py:1514
+#: rhodecode/lib/helpers.py:1561
 msgid "mod"
 msgstr "moderieren"
 
-#: rhodecode/lib/helpers.py:1517
+#: rhodecode/lib/helpers.py:1564
 msgid "del"
 msgstr "löschen"
 
-#: rhodecode/lib/helpers.py:1520
+#: rhodecode/lib/helpers.py:1567
 msgid "rename"
 msgstr "umbennen"
 
-#: rhodecode/lib/helpers.py:1525
+#: rhodecode/lib/helpers.py:1572
 msgid "chmod"
 msgstr "chmod"
 
-#: rhodecode/lib/helpers.py:1767
+#: rhodecode/lib/helpers.py:1819
 msgid ""
 "Example filter terms:\n"
 "     repository:vcs\n"
@@ -1507,91 +1687,93 b' msgid ""'
 "     \"username:test AND repository:test*\"\n"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1787
+#: rhodecode/lib/helpers.py:1839
 #, 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 "Das %s Repository ist nicht in der Datenbank vorhanden, eventuell wurde es im Dateisystem erstellt oder umbenannt. Bitte starten sie die Applikation erneut um die Repositories neu zu Indizieren"
 
-#: rhodecode/lib/utils2.py:453
+#: rhodecode/lib/utils2.py:454
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d Jahr"
 msgstr[1] "%d Jahre"
 
-#: rhodecode/lib/utils2.py:454
+#: rhodecode/lib/utils2.py:455
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d Monat"
 msgstr[1] "%d Monate"
 
-#: rhodecode/lib/utils2.py:455
+#: rhodecode/lib/utils2.py:456
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: rhodecode/lib/utils2.py:456
+#: rhodecode/lib/utils2.py:457
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: rhodecode/lib/utils2.py:457
+#: rhodecode/lib/utils2.py:458
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: rhodecode/lib/utils2.py:458
+#: rhodecode/lib/utils2.py:459
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: rhodecode/lib/utils2.py:476
+#: rhodecode/lib/utils2.py:477
 #, python-format
 msgid "in %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:482
+#: rhodecode/lib/utils2.py:483
 #, python-format
 msgid "%s ago"
 msgstr "vor %s"
 
-#: rhodecode/lib/utils2.py:492
+#: rhodecode/lib/utils2.py:493
 #, python-format
 msgid "%s, %s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:494
+#: rhodecode/lib/utils2.py:495
 #, python-format
 msgid "in %s, %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:496
+#: rhodecode/lib/utils2.py:497
 #, python-format
 msgid "%s and %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:498
+#: rhodecode/lib/utils2.py:499
 #, python-format
 msgid "%s and %s ago"
 msgstr "%s und %s her"
 
-#: rhodecode/lib/utils2.py:500
+#: rhodecode/lib/utils2.py:501
 #, python-format
 msgid "in %s and %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:504
+#: rhodecode/lib/utils2.py:505 rhodecode/public/js/scripts.js:25035
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174
 msgid "just now"
 msgstr "jetzt gerade"
 
@@ -1617,7 +1799,9 b' msgstr "jetzt gerade"'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 rhodecode/model/db.py:2291
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293
+#: rhodecode/model/db.py:2285
 msgid "Repository no access"
 msgstr "Kein Zugriff auf Repository"
 
@@ -1643,7 +1827,9 b' msgstr "Kein Zugriff auf Repository"'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 rhodecode/model/db.py:2292
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294
+#: rhodecode/model/db.py:2286
 msgid "Repository read access"
 msgstr "Lesender Zugriff auf Repository"
 
@@ -1669,7 +1855,9 b' msgstr "Lesender Zugriff auf Repository"'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 rhodecode/model/db.py:2293
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295
+#: rhodecode/model/db.py:2287
 msgid "Repository write access"
 msgstr "Schreibdender Zugriff auf Repository"
 
@@ -1695,7 +1883,9 b' msgstr "Schreibdender Zugriff auf Reposi'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 rhodecode/model/db.py:2294
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296
+#: rhodecode/model/db.py:2288
 msgid "Repository admin access"
 msgstr "Administrativer Zugang zum Repository"
 
@@ -1761,7 +1951,9 b' msgstr "RhodeCode Administrator"'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 rhodecode/model/db.py:2312
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314
+#: rhodecode/model/db.py:2306
 msgid "Repository creation disabled"
 msgstr "Repository erstelllung deaktiviert"
 
@@ -1787,7 +1979,9 b' msgstr "Repository erstelllung deaktivie'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 rhodecode/model/db.py:2313
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315
+#: rhodecode/model/db.py:2307
 msgid "Repository creation enabled"
 msgstr "Repository erstellung aktiviert"
 
@@ -1813,7 +2007,9 b' msgstr "Repository erstellung aktiviert"'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 rhodecode/model/db.py:2317
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319
+#: rhodecode/model/db.py:2311
 msgid "Repository forking disabled"
 msgstr ""
 
@@ -1839,7 +2035,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 rhodecode/model/db.py:2318
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320
+#: rhodecode/model/db.py:2312
 msgid "Repository forking enabled"
 msgstr ""
 
@@ -1887,7 +2085,8 b' msgstr "Registrierung neuer Benutzer in '
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343
-#: rhodecode/model/db.py:2950
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952
+#: rhodecode/model/db.py:2944
 msgid "Not Reviewed"
 msgstr "Nicht Begutachtet"
 
@@ -1914,7 +2113,8 b' msgstr "Nicht Begutachtet"'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344
-#: rhodecode/model/db.py:2951
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953
+#: rhodecode/model/db.py:2945
 msgid "Approved"
 msgstr "Akzeptiert"
 
@@ -1941,7 +2141,8 b' msgstr "Akzeptiert"'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345
-#: rhodecode/model/db.py:2952
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954
+#: rhodecode/model/db.py:2946
 msgid "Rejected"
 msgstr "Abgelehnt"
 
@@ -1968,7 +2169,8 b' msgstr "Abgelehnt"'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346
-#: rhodecode/model/db.py:2953
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955
+#: rhodecode/model/db.py:2947
 msgid "Under Review"
 msgstr "In Begutachtung"
 
@@ -1991,7 +2193,9 b' msgstr "In Begutachtung"'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 rhodecode/model/db.py:2296
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298
+#: rhodecode/model/db.py:2290
 msgid "Repository group no access"
 msgstr ""
 
@@ -2014,7 +2218,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 rhodecode/model/db.py:2297
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299
+#: rhodecode/model/db.py:2291
 msgid "Repository group read access"
 msgstr ""
 
@@ -2037,7 +2243,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 rhodecode/model/db.py:2298
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300
+#: rhodecode/model/db.py:2292
 msgid "Repository group write access"
 msgstr ""
 
@@ -2060,7 +2268,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 rhodecode/model/db.py:2299
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301
+#: rhodecode/model/db.py:2293
 msgid "Repository group admin access"
 msgstr ""
 
@@ -2082,7 +2292,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 rhodecode/model/db.py:2301
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303
+#: rhodecode/model/db.py:2295
 msgid "User group no access"
 msgstr ""
 
@@ -2104,7 +2316,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 rhodecode/model/db.py:2302
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304
+#: rhodecode/model/db.py:2296
 msgid "User group read access"
 msgstr ""
 
@@ -2126,7 +2340,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 rhodecode/model/db.py:2303
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305
+#: rhodecode/model/db.py:2297
 msgid "User group write access"
 msgstr ""
 
@@ -2148,7 +2364,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 rhodecode/model/db.py:2304
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306
+#: rhodecode/model/db.py:2298
 msgid "User group admin access"
 msgstr ""
 
@@ -2170,7 +2388,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 rhodecode/model/db.py:2306
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308
+#: rhodecode/model/db.py:2300
 msgid "Repository Group creation disabled"
 msgstr ""
 
@@ -2192,7 +2412,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 rhodecode/model/db.py:2307
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309
+#: rhodecode/model/db.py:2301
 msgid "Repository Group creation enabled"
 msgstr ""
 
@@ -2214,7 +2436,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 rhodecode/model/db.py:2309
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311
+#: rhodecode/model/db.py:2303
 msgid "User Group creation disabled"
 msgstr ""
 
@@ -2236,7 +2460,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 rhodecode/model/db.py:2310
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312
+#: rhodecode/model/db.py:2304
 msgid "User Group creation enabled"
 msgstr ""
 
@@ -2259,7 +2485,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000
-#: rhodecode/model/db.py:2320
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322
+#: rhodecode/model/db.py:2314
 msgid "Registration disabled"
 msgstr ""
 
@@ -2282,7 +2509,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001
-#: rhodecode/model/db.py:2321
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323
+#: rhodecode/model/db.py:2315
 msgid "User Registration with manual account activation"
 msgstr ""
 
@@ -2305,7 +2533,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002
-#: rhodecode/model/db.py:2322
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324
+#: rhodecode/model/db.py:2316
 msgid "User Registration with automatic account activation"
 msgstr ""
 
@@ -2328,7 +2557,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004
-#: rhodecode/model/db.py:2324
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326
+#: rhodecode/model/db.py:2318
 msgid "Manual activation of external account"
 msgstr ""
 
@@ -2351,7 +2581,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005
-#: rhodecode/model/db.py:2325
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327
+#: rhodecode/model/db.py:2319
 msgid "Automatic activation of external account"
 msgstr ""
 
@@ -2367,7 +2598,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 rhodecode/model/db.py:2314
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316
+#: rhodecode/model/db.py:2308
 msgid ""
 "Repository creation enabled with write permission to a repository group"
 msgstr ""
@@ -2384,7 +2617,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 rhodecode/model/db.py:2315
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317
+#: rhodecode/model/db.py:2309
 msgid ""
 "Repository creation disabled with write permission to a repository group"
 msgstr ""
@@ -2398,7 +2633,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 rhodecode/model/db.py:2289
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291
+#: rhodecode/model/db.py:2283
 msgid "RhodeCode Super Administrator"
 msgstr ""
 
@@ -2410,7 +2647,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007
-#: rhodecode/model/db.py:2327
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329
+#: rhodecode/model/db.py:2321
 msgid "Inherit object permissions from default user disabled"
 msgstr ""
 
@@ -2422,10 +2660,36 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008
-#: rhodecode/model/db.py:2328
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330
+#: rhodecode/model/db.py:2322
 msgid "Inherit object permissions from default user enabled"
 msgstr ""
 
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 rhodecode/model/db.py:910
+msgid "all"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 rhodecode/model/db.py:911
+msgid "http/web interface"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 rhodecode/model/db.py:912
+msgid "vcs (git/hg/svn protocol)"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 rhodecode/model/db.py:913
+msgid "api calls"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 rhodecode/model/db.py:914
+msgid "feed access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069
+#: rhodecode/model/db.py:2061
+msgid "No parent"
+msgstr ""
+
 #: rhodecode/lib/index/whoosh.py:148
 msgid "Invalid search query. Try quoting it."
 msgstr "Ungültige Suchanfrage. Versuchen sie die Anfrage in Anführungszeichen zu setzen."
@@ -2470,50 +2734,34 b' msgstr "Du hast dich erfolgreich bei Rho'
 msgid "Your password reset link was sent"
 msgstr "Ihr Passwort Zurücksetzen Link wurde versendet"
 
-#: rhodecode/login/views.py:333
+#: rhodecode/login/views.py:336
 msgid ""
 "Your password reset was successful, a new password has been sent to your "
 "email"
 msgstr "Ihr Passwort wurde zurückgesetzt, ein neues Passwort wurde and ihre E-Mail Adresse gesendet"
 
-#: rhodecode/model/db.py:909
-msgid "all"
-msgstr ""
-
-#: rhodecode/model/db.py:910
-msgid "http/web interface"
-msgstr ""
-
-#: rhodecode/model/db.py:911
-msgid "vcs (git/hg protocol)"
-msgstr ""
-
-#: rhodecode/model/db.py:912
-msgid "api calls"
-msgstr ""
-
-#: rhodecode/model/db.py:913
-msgid "feed access"
-msgstr ""
-
-#: rhodecode/model/db.py:2067
-msgid "No parent"
-msgstr ""
-
-#: rhodecode/model/forms.py:66
+#: rhodecode/model/comment.py:263
+msgid "made a comment"
+msgstr ""
+
+#: rhodecode/model/comment.py:264
+msgid "Refresh page"
+msgstr ""
+
+#: rhodecode/model/forms.py:85
 msgid "Please enter a login"
 msgstr "Bitte einen Benutzernamen eingeben"
 
-#: rhodecode/model/forms.py:67
+#: rhodecode/model/forms.py:86
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr "Bitte einen Wert mit mindestens %(min)i Zeichen eingeben"
 
-#: rhodecode/model/forms.py:76
+#: rhodecode/model/forms.py:95
 msgid "Please enter a password"
 msgstr "Bitte ein Passwort eingeben"
 
-#: rhodecode/model/forms.py:77
+#: rhodecode/model/forms.py:96
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr "Bitte mindestens %(min)i Zeichen eingeben"
@@ -2628,43 +2876,43 b' msgid ""'
 " %(pr_title)s"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:448
+#: rhodecode/model/pull_request.py:449
 msgid "Pull request merged and closed"
 msgstr "Pullrequest zusammengeführt und geschlossen"
 
-#: rhodecode/model/pull_request.py:867
+#: rhodecode/model/pull_request.py:874
 msgid "Server-side pull request merging is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:869
+#: rhodecode/model/pull_request.py:876
 msgid "This pull request is closed."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:880
+#: rhodecode/model/pull_request.py:887
 msgid "Pull request merging is not supported."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:898
+#: rhodecode/model/pull_request.py:905
 msgid "Target repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:901
+#: rhodecode/model/pull_request.py:908
 msgid "Source repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1050 rhodecode/model/scm.py:791
+#: rhodecode/model/pull_request.py:1058 rhodecode/model/scm.py:788
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: rhodecode/model/pull_request.py:1055
+#: rhodecode/model/pull_request.py:1063
 msgid "Commit IDs"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1058
+#: rhodecode/model/pull_request.py:1066
 msgid "Closed Branches"
 msgstr ""
 
-#: rhodecode/model/scm.py:773
+#: rhodecode/model/scm.py:770
 msgid "latest tip"
 msgstr ""
 
@@ -2880,6 +3128,7 b' msgid "Revisions %(revs)s are already pa'
 msgstr ""
 
 #: rhodecode/model/validators.py:933
+#: rhodecode/model/validation_schema/validators.py:14
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
@@ -2894,31 +3143,391 b' msgid "Key name can only consist of lett'
 msgstr ""
 
 #: rhodecode/model/validators.py:976
-msgid "Filename cannot be inside a directory"
-msgstr ""
-
-#: rhodecode/model/validators.py:992
 #, python-format
 msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
 msgstr ""
 
-#: rhodecode/model/validators.py:995
+#: rhodecode/model/validators.py:979
 #, python-format
 msgid "The plugin \"%(plugin_id)s\" is missing an includeme function."
 msgstr ""
 
-#: rhodecode/model/validators.py:998
+#: rhodecode/model/validators.py:982
 #, python-format
 msgid "Can not load plugin \"%(plugin_id)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:1000
+#: rhodecode/model/validators.py:984
 #, python-format
 msgid "No plugin available with ID \"%(plugin_id)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:1067
-msgid "This gistid is already in use"
+#: rhodecode/model/validation_schema/schemas/gist_schema.py:89
+msgid "Gist with name {} already exists"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/gist_schema.py:95
+msgid "Filename {} cannot be inside a directory"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/gist_schema.py:132
+msgid "Duplicated value for filename found: `{}`"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:23039
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
+#: 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/i18n/select2/translations.js:10
+msgid "No matches found"
+msgstr "Keine Treffer gefunden"
+
+#: rhodecode/public/js/scripts.js:39313
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
+#: 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/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/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/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/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/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/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/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/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/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/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/src/rhodecode/comments.js:235
+msgid "Add another comment"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41526
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
+#: rhodecode/public/js/src/rhodecode/comments.js:453
+msgid "Status Review"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41540
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:3
+#: rhodecode/public/js/src/rhodecode/comments.js:467
+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/src/rhodecode/comments.js:580
+msgid "Submitting..."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41703
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
+#: rhodecode/public/js/src/rhodecode/comments.js:630
+#: rhodecode/templates/files/files_browser_tree.html:47
+msgid "Loading ..."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41903
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
+#: 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/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/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/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/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/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/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/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/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/src/rhodecode.js:162
+msgid "Show more"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
+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."
+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."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
+msgid "No tags available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18
+msgid "No user groups available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19
+msgid "No users available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
+#: rhodecode/templates/changelog/changelog.html:62
+msgid "Open new pull request"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22
+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
+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"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
+msgid "files"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
+msgid "specify commit"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
+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} years"
 msgstr ""
 
 #: rhodecode/templates/index.html:5
@@ -2979,7 +3588,7 b' msgstr ""'
 #: rhodecode/templates/base/perms_summary.html:102
 #: rhodecode/templates/bookmarks/bookmarks.html:59
 #: rhodecode/templates/branches/branches.html:58
-#: rhodecode/templates/files/files_browser.html:49
+#: rhodecode/templates/files/files_browser_tree.html:5
 #: rhodecode/templates/pullrequests/pullrequests.html:100
 #: rhodecode/templates/tags/tags.html:59
 msgid "Name"
@@ -2988,6 +3597,7 b' msgstr "Name"'
 #: rhodecode/templates/index_base.html:100
 #: rhodecode/templates/index_base.html:125
 #: rhodecode/templates/admin/gists/index.html:114
+#: rhodecode/templates/admin/integrations/list.html:63
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:77
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:45
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42
@@ -3003,8 +3613,9 b' msgstr "Name"'
 #: rhodecode/templates/base/issue_tracker_settings.html:10
 #: rhodecode/templates/changeset/changeset.html:53
 #: rhodecode/templates/compare/compare_commits.html:24
+#: rhodecode/templates/email_templates/commit_comment.mako:82
 #: rhodecode/templates/email_templates/pull_request_review.mako:30
-#: rhodecode/templates/email_templates/pull_request_review.mako:67
+#: rhodecode/templates/email_templates/pull_request_review.mako:51
 #: rhodecode/templates/files/file_tree_detail.html:5
 #: rhodecode/templates/files/file_tree_detail.html:12
 #: rhodecode/templates/forks/fork.html:48
@@ -3042,12 +3653,12 b' msgstr "Letzte \xc3\x84nderung"'
 #: rhodecode/templates/admin/repos/repos.html:63
 #: rhodecode/templates/bookmarks/bookmarks.html:66
 #: rhodecode/templates/branches/branches.html:65
-#: rhodecode/templates/changelog/changelog.html:106
-#: rhodecode/templates/changelog/changelog_summary_data.html:6
+#: 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/email_templates/commit_comment.mako:16
 #: rhodecode/templates/email_templates/commit_comment.mako:45
+#: rhodecode/templates/email_templates/commit_comment.mako:81
 #: rhodecode/templates/search/search_commit.html:6
 #: rhodecode/templates/tags/tags.html:66
 msgid "Commit"
@@ -3063,7 +3674,7 b' msgid "Home"'
 msgstr ""
 
 #: rhodecode/templates/login.html:5 rhodecode/templates/login.html:35
-#: rhodecode/templates/login.html:64 rhodecode/templates/base/base.html:328
+#: rhodecode/templates/login.html:64 rhodecode/templates/base/base.html:329
 #: rhodecode/templates/debug_style/login.html:60
 msgid "Sign In"
 msgstr "Einloggen"
@@ -3072,20 +3683,6 b' msgstr "Einloggen"'
 msgid "Go to the registration page to create a new account."
 msgstr ""
 
-#: rhodecode/templates/login.html:43 rhodecode/templates/register.html:41
-#: rhodecode/templates/admin/admin_log.html:5
-#: 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/users/user_add.html:35
-#: rhodecode/templates/admin/users/user_edit_profile.html:39
-#: rhodecode/templates/admin/users/users.html:89
-#: rhodecode/templates/base/base.html:305
-#: rhodecode/templates/debug_style/login.html:36
-#: rhodecode/templates/users/user_profile.html:27
-msgid "Username"
-msgstr "Benutzername"
-
 #: rhodecode/templates/login.html:58
 msgid "Remember me"
 msgstr "Login Speichern"
@@ -3121,8 +3718,8 b' msgid "Send password reset email"'
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:60
-msgid "Password reset link will be send to matching email address"
-msgstr "Der Passwort Reset LInk wird an die passende EMail Addresse gesendet"
+msgid "Password reset link will be sent to matching email address"
+msgstr ""
 
 #: rhodecode/templates/register.html:35
 msgid "Create an account"
@@ -3142,7 +3739,7 b' msgstr "Passwort erneut eingeben"'
 #: 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:93
+#: rhodecode/templates/admin/users/users.html:92
 msgid "First Name"
 msgstr "Vorname"
 
@@ -3152,7 +3749,7 b' msgstr "Vorname"'
 #: 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:95
+#: rhodecode/templates/admin/users/users.html:94
 msgid "Last Name"
 msgstr "Nachname"
 
@@ -3166,7 +3763,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:15
-#: rhodecode/templates/base/base.html:78
+#: rhodecode/templates/base/base.html:77
 msgid "Admin journal"
 msgstr "Admin Logbuch"
 
@@ -3191,17 +3788,17 b' msgstr[1] ""'
 msgid "Example Queries"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:6
+#: rhodecode/templates/admin/admin_log.html:8
 #: rhodecode/templates/admin/my_account/my_account_repos.html:37
 #: 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_groups.html:66
-#: rhodecode/templates/admin/users/users.html:106
+#: rhodecode/templates/admin/users/users.html:105
 msgid "Action"
 msgstr "Aktion"
 
-#: rhodecode/templates/admin/admin_log.html:7
+#: rhodecode/templates/admin/admin_log.html:9
 #: rhodecode/templates/admin/defaults/defaults.html:31
 #: rhodecode/templates/admin/permissions/permissions_objects.html:13
 #: rhodecode/templates/search/search_commit.html:5
@@ -3209,18 +3806,18 b' msgstr "Aktion"'
 msgid "Repository"
 msgstr "Repository"
 
-#: rhodecode/templates/admin/admin_log.html:8
+#: rhodecode/templates/admin/admin_log.html:10
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:60
 #: rhodecode/templates/tags/tags.html:61
 msgid "Date"
 msgstr "Datum"
 
-#: rhodecode/templates/admin/admin_log.html:9
+#: rhodecode/templates/admin/admin_log.html:11
 msgid "From IP"
 msgstr "Von IP"
 
-#: rhodecode/templates/admin/admin_log.html:44
+#: rhodecode/templates/admin/admin_log.html:46
 msgid "No actions yet"
 msgstr "Es sind bisher keine Aktionen passiert"
 
@@ -3232,6 +3829,9 b' 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:19
+#: rhodecode/templates/admin/integrations/edit.html:15
+#: rhodecode/templates/admin/integrations/list.html:8
 #: 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
@@ -3249,9 +3849,9 b' msgstr ""'
 #: 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:102
-#: rhodecode/templates/base/base.html:405
-#: rhodecode/templates/base/base.html:412
+#: rhodecode/templates/admin/users/users.html:101
+#: rhodecode/templates/base/base.html:406
+#: rhodecode/templates/base/base.html:413
 msgid "Admin"
 msgstr "Admin"
 
@@ -3278,14 +3878,6 b' msgstr ""'
 msgid "Available Built-in Plugins"
 msgstr ""
 
-#: rhodecode/templates/admin/auth/auth_settings.html:71
-msgid "enabled"
-msgstr ""
-
-#: rhodecode/templates/admin/auth/auth_settings.html:71
-msgid "disabled"
-msgstr ""
-
 #: rhodecode/templates/admin/auth/auth_settings.html:81
 #: rhodecode/templates/admin/auth/plugin_settings.html:87
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:63
@@ -3326,6 +3918,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:14
 #: rhodecode/templates/admin/gists/index.html:110
+#: rhodecode/templates/admin/integrations/list.html:64
 #: rhodecode/templates/admin/repos/repo_add_base.html:62
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:12
 msgid "Type"
@@ -3398,18 +3991,18 b' msgstr ""'
 msgid "Gist access level"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.html:59
+#: rhodecode/templates/admin/gists/edit.html:62
 #: 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:103
+#: rhodecode/templates/admin/gists/edit.html:107
 msgid "Update Gist"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.html:104
+#: rhodecode/templates/admin/gists/edit.html:108
 #: rhodecode/templates/base/issue_tracker_settings.html:74
 #: rhodecode/templates/changeset/changeset_file_comment.html:139
 #: rhodecode/templates/files/files_add.html:102
@@ -3470,14 +4063,14 b' 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:87
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:89
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:62
-#: rhodecode/templates/changelog/changelog.html:102
-#: rhodecode/templates/changelog/changelog_summary_data.html:10
+#: 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/files/files_browser.html:53
+#: rhodecode/templates/files/files_browser_tree.html:9
 #: rhodecode/templates/pullrequests/pullrequest_show.html:169
 #: rhodecode/templates/pullrequests/pullrequests.html:102
 #: rhodecode/templates/search/search_commit.html:16
@@ -3560,9 +4153,10 b' msgid "Gist"'
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:49
+#: rhodecode/templates/admin/integrations/list.html:110
 #: 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:61
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:63
 #: 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
@@ -3574,10 +4168,10 b' msgstr ""'
 #: rhodecode/templates/base/vcs_settings.html:172
 #: rhodecode/templates/changeset/changeset_file_comment.html:49
 #: rhodecode/templates/changeset/changeset_file_comment.html:99
-#: rhodecode/templates/data_table/_dt_elements.html:117
-#: rhodecode/templates/data_table/_dt_elements.html:174
-#: rhodecode/templates/data_table/_dt_elements.html:188
-#: rhodecode/templates/data_table/_dt_elements.html:200
+#: 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/debug_style/buttons.html:132
 #: rhodecode/templates/files/files_source.html:33
 #: rhodecode/templates/files/files_source.html:37
@@ -3590,14 +4184,15 b' msgid "Confirm to delete this Gist"'
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:56
+#: rhodecode/templates/admin/integrations/list.html:103
 #: 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:112
-#: rhodecode/templates/data_table/_dt_elements.html:170
-#: rhodecode/templates/data_table/_dt_elements.html:183
-#: rhodecode/templates/data_table/_dt_elements.html:196
+#: 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/debug_style/buttons.html:128
 #: rhodecode/templates/files/files_add.html:204
 #: rhodecode/templates/files/files_edit.html:165
@@ -3627,8 +4222,45 b' msgstr ""'
 msgid "Show as raw"
 msgstr ""
 
+#: rhodecode/templates/admin/integrations/base.html:12
+msgid "Integrations settings"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/edit.html:17
+#: rhodecode/templates/admin/integrations/list.html:10
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44
+#: rhodecode/templates/admin/repos/repo_edit.html:15
+#: 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
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: rhodecode/templates/admin/integrations/edit.html:36
+#, python-format
+msgid "Create new %(integration_type)s integration"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:31
+msgid "Create new integration"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:56
+msgid "Current integrations"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:65
+msgid "Actions"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:89
+msgid "unknown integration"
+msgstr ""
+
 #: rhodecode/templates/admin/my_account/my_account.html:5
-#: rhodecode/templates/base/base.html:342
+#: rhodecode/templates/base/base.html:343
 msgid "My account"
 msgstr "Mein Account"
 
@@ -3664,7 +4296,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/my_account/my_account.html:40
 #: rhodecode/templates/admin/notifications/notifications.html:33
-#: rhodecode/templates/base/base.html:242
+#: rhodecode/templates/base/base.html:243
 msgid "Pull Requests"
 msgstr ""
 
@@ -3672,6 +4304,10 b' msgstr ""'
 msgid "My Permissions"
 msgstr ""
 
+#: rhodecode/templates/admin/my_account/my_account.html:42
+msgid "My Live Notifications"
+msgstr ""
+
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:3
 msgid "Authentication Tokens"
 msgstr ""
@@ -3683,7 +4319,7 b' msgstr ""'
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:8
 msgid ""
 "Each token can have a role. VCS tokens can be used together with the "
-"authtoken auth plugin for git/hg operations."
+"authtoken auth plugin for git/hg/svn operations."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:14
@@ -3760,6 +4396,19 b' msgstr ""'
 msgid "New email address"
 msgstr ""
 
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:3
+msgid "Your live notification settings"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:14
+#: rhodecode/templates/admin/notifications/show_notification.html:12
+msgid "Notifications"
+msgstr "Benachrichtigungen"
+
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:14
+msgid "Disabled"
+msgstr "Deaktiviert"
+
 #: rhodecode/templates/admin/my_account/my_account_password.html:3
 msgid "Change Your Account Password"
 msgstr ""
@@ -3816,35 +4465,35 b' 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:86
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:88
 msgid "Target Repo"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:26
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:89
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:91
 #: rhodecode/templates/admin/settings/settings_global.html:9
 #: rhodecode/templates/email_templates/pull_request_review.mako:28
-#: rhodecode/templates/email_templates/pull_request_review.mako:65
+#: rhodecode/templates/email_templates/pull_request_review.mako:48
 #: rhodecode/templates/pullrequests/pullrequest.html:38
 #: rhodecode/templates/pullrequests/pullrequests.html:104
 msgid "Title"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:27
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:90
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:92
 msgid "Opened On"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:41
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:103
-#: rhodecode/templates/changelog/changelog.html:141
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:43
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:107
+#: 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:50
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:112
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:52
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:116
 #: rhodecode/templates/changeset/changeset_file_comment.html:284
 #: rhodecode/templates/pullrequests/pullrequest_show.html:14
 #: rhodecode/templates/pullrequests/pullrequest_show.html:112
@@ -3852,19 +4501,19 b' msgstr ""'
 msgid "Closed"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:62
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:64
 msgid "Confirm to delete this pull request"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:69
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:71
 msgid "You currently have no open pull requests."
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:77
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:79
 msgid "Pull Requests You Participate In"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:125
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:129
 msgid ""
 "There are currently no open pull requests requiring your participation."
 msgstr ""
@@ -3905,19 +4554,15 b' msgstr "Bisher gibt es keine Benachricht'
 msgid "Show notification"
 msgstr "Zeige Benachrichtigung"
 
-#: rhodecode/templates/admin/notifications/show_notification.html:12
-msgid "Notifications"
-msgstr "Benachrichtigungen"
-
 #: rhodecode/templates/admin/permissions/permissions.html:5
 msgid "Permissions Administration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:14
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:45
-#: rhodecode/templates/admin/repos/repo_edit.html:42
+#: rhodecode/templates/admin/repos/repo_edit.html:46
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:34
-#: rhodecode/templates/base/base.html:83
+#: rhodecode/templates/base/base.html:82
 msgid "Permissions"
 msgstr "Rechte"
 
@@ -4063,8 +4708,8 b' 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:80
-#: rhodecode/templates/base/base.html:152
+#: rhodecode/templates/base/base.html:79
+#: rhodecode/templates/base/base.html:153
 msgid "Repository groups"
 msgstr ""
 
@@ -4095,18 +4740,8 b' msgstr ""'
 msgid "Add Child Group"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44
-#: rhodecode/templates/admin/repos/repo_edit.html:15
-#: rhodecode/templates/admin/repos/repo_edit.html:39
-#: 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:250
-msgid "Settings"
-msgstr "Einstellungen"
-
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:46
-#: rhodecode/templates/admin/repos/repo_edit.html:45
+#: rhodecode/templates/admin/repos/repo_edit.html:49
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:35
 #: rhodecode/templates/admin/users/user_edit.html:35
 msgid "Advanced"
@@ -4284,7 +4919,7 b' msgid "Import Existing Repository ?"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:23
-#: rhodecode/templates/base/base.html:197
+#: rhodecode/templates/base/base.html:198
 msgid "Clone from"
 msgstr "Clone von"
 
@@ -4356,19 +4991,19 b' msgstr ""'
 msgid "%s repository settings"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:51
+#: rhodecode/templates/admin/repos/repo_edit.html:55
 msgid "Extra Fields"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:57
-msgid "Caches"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:61
+msgid "Caches"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:65
 msgid "Remote"
 msgstr "Entfernt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:65
+#: rhodecode/templates/admin/repos/repo_edit.html:69
 #: rhodecode/templates/summary/components.html:135
 msgid "Statistics"
 msgstr "Statistiken"
@@ -4475,7 +5110,7 b' msgid "Delete forks"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:139
-#: rhodecode/templates/data_table/_dt_elements.html:118
+#: rhodecode/templates/data_table/_dt_elements.html:120
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
@@ -4542,7 +5177,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:100
+#: rhodecode/templates/admin/users/users.html:99
 msgid "Active"
 msgstr "Aktiv"
 
@@ -4702,7 +5337,7 b' msgid ""'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.html:56
-#: rhodecode/templates/data_table/_dt_elements.html:158
+#: rhodecode/templates/data_table/_dt_elements.html:160
 #: rhodecode/templates/forks/fork.html:58
 msgid "Repository group"
 msgstr "Repository Gruppe"
@@ -4957,12 +5592,11 b' msgid "Server Announcement"'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:80
-msgid "Custom js/css code added at the end of the <header> tag."
+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:103
-msgid "Use <script> or <css> tags to define custom styling or scripting"
+msgid "Use <script/> or <css/> tags to define custom styling or scripting"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:88
@@ -4973,6 +5607,10 b' msgstr ""'
 msgid "Custom js/css code added at the end of the <body> tag."
 msgstr ""
 
+#: rhodecode/templates/admin/settings/settings_global.html:103
+msgid "Use <script> or <css> tags to define custom styling or scripting"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings_hooks.html:3
 msgid "Built in Mercurial hooks - read only"
 msgstr ""
@@ -5365,8 +6003,8 b' msgstr "Benutzergruppe hinzuf\xc3\xbcgen"'
 
 #: rhodecode/templates/admin/user_groups/user_group_add.html:13
 #: rhodecode/templates/admin/users/user_edit_advanced.html:13
-#: rhodecode/templates/base/base.html:82
-#: rhodecode/templates/base/base.html:155
+#: rhodecode/templates/base/base.html:81
+#: rhodecode/templates/base/base.html:156
 msgid "User groups"
 msgstr "Benutzergruppen"
 
@@ -5458,8 +6096,8 b' msgid "Change owner of this user group."'
 msgstr "Besitzer dieser Benutzergruppe ändern"
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:59
-#: rhodecode/templates/base/base.html:257
-#: rhodecode/templates/base/base.html:399
+#: rhodecode/templates/base/base.html:258
+#: rhodecode/templates/base/base.html:400
 #: rhodecode/templates/search/search.html:64
 msgid "Search"
 msgstr "Suche"
@@ -5503,7 +6141,7 b' msgstr "Benutzer hinzuf\xc3\xbcgen"'
 
 #: rhodecode/templates/admin/users/user_add.html:13
 #: rhodecode/templates/admin/users/user_edit.html:14
-#: rhodecode/templates/base/base.html:81
+#: rhodecode/templates/base/base.html:80
 msgid "Users"
 msgstr "Benutzer"
 
@@ -5566,7 +6204,7 b' msgid "Source of Record"'
 msgstr "Quelle des Eintrags"
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:8
-#: rhodecode/templates/admin/users/users.html:98
+#: rhodecode/templates/admin/users/users.html:97
 msgid "Last login"
 msgstr "Letzte Anmeldung"
 
@@ -5666,7 +6304,7 b' msgid "Detach user groups"'
 msgstr "Benutzergruppen abtrennen"
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:135
-#: rhodecode/templates/data_table/_dt_elements.html:189
+#: rhodecode/templates/data_table/_dt_elements.html:191
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "Bestätigen den Benutzer %s zu löschen"
@@ -5751,21 +6389,21 b' msgstr ""'
 msgid "Users administration"
 msgstr "Benutzerverwaltung"
 
-#: rhodecode/templates/admin/users/users.html:104
+#: rhodecode/templates/admin/users/users.html:103
 msgid "Authentication type"
 msgstr "Autentifizierungstyp"
 
-#: rhodecode/templates/base/base.html:45
+#: rhodecode/templates/base/base.html:44
 #: rhodecode/templates/errors/error_document.html:51
 msgid "Support"
 msgstr "Support"
 
-#: rhodecode/templates/base/base.html:52
+#: rhodecode/templates/base/base.html:51
 #, python-format
 msgid "RhodeCode instance id: %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:84
+#: rhodecode/templates/base/base.html:83
 msgid "Authentication"
 msgstr "Authentifizierung"
 
@@ -5779,40 +6417,40 b' msgstr "Standards"'
 msgid "Show More"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:189
+#: rhodecode/templates/base/base.html:190
 msgid "Fork of"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:206
+#: rhodecode/templates/base/base.html:207
 #, python-format
 msgid "Repository locked by %(user)s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/base/base.html:212
 msgid "Repository not locked. Pull repository to lock it."
 msgstr ""
 
-#: rhodecode/templates/base/base.html:229
+#: rhodecode/templates/base/base.html:230
 #: rhodecode/templates/data_table/_dt_elements.html:12
 #: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/data_table/_dt_elements.html:147
+#: rhodecode/templates/data_table/_dt_elements.html:149
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: rhodecode/templates/base/base.html:230
+#: rhodecode/templates/base/base.html:231
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:18
 msgid "Changelog"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:231
+#: rhodecode/templates/base/base.html:232
 #: 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 "Dateien"
 
-#: rhodecode/templates/base/base.html:233
+#: rhodecode/templates/base/base.html:234
 #: rhodecode/templates/bookmarks/bookmarks.html:68
 #: rhodecode/templates/branches/branches.html:67
 #: rhodecode/templates/files/file_diff.html:11
@@ -5821,29 +6459,29 b' msgstr "Dateien"'
 msgid "Compare"
 msgstr "Vergleiche"
 
-#: rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:239
 #, python-format
 msgid "Show Pull Requests for %s"
 msgstr "Zeige Pullrequests für %s"
 
-#: rhodecode/templates/base/base.html:247
+#: rhodecode/templates/base/base.html:248
 msgid "Options"
 msgstr "Optionen"
 
-#: rhodecode/templates/base/base.html:254
+#: rhodecode/templates/base/base.html:255
 #: rhodecode/templates/forks/forks_data.html:30
 msgid "Compare fork"
 msgstr "Vergleiche Fork"
 
-#: rhodecode/templates/base/base.html:261
+#: rhodecode/templates/base/base.html:262
 msgid "Unlock"
 msgstr "Entsperren"
 
-#: rhodecode/templates/base/base.html:263
+#: rhodecode/templates/base/base.html:264
 msgid "Lock"
 msgstr "Sperren"
 
-#: rhodecode/templates/base/base.html:268
+#: 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
@@ -5853,73 +6491,73 b' msgid_plural "Forks"'
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/base/base.html:269
+#: rhodecode/templates/base/base.html:270
 msgid "Create Pull Request"
 msgstr "Pullrequest erstellen"
 
-#: rhodecode/templates/base/base.html:291
+#: rhodecode/templates/base/base.html:292
 msgid "Sign in"
 msgstr "Anmelden"
 
-#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:300
 #: rhodecode/templates/debug_style/login.html:28
 msgid "Sign in to your account"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:316
 #: rhodecode/templates/debug_style/login.html:46
 msgid "(Forgot password?)"
 msgstr "(Kennwort vergessen?)"
 
-#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:325
 #: rhodecode/templates/debug_style/login.html:56
 msgid "Don't have an account ?"
 msgstr "Kein Account?"
 
-#: rhodecode/templates/base/base.html:345
+#: rhodecode/templates/base/base.html:346
 msgid "Sign Out"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:381
-msgid "Show activity journal"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:382
+msgid "Show activity journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:383
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:14
 msgid "Journal"
 msgstr "Logbuch"
 
-#: rhodecode/templates/base/base.html:387
+#: rhodecode/templates/base/base.html:388
 msgid "Show Public activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:388
+#: rhodecode/templates/base/base.html:389
 msgid "Public journal"
 msgstr "Öffentliches Logbuch"
 
-#: rhodecode/templates/base/base.html:393
-msgid "Show Gists"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:394
+msgid "Show Gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:395
 msgid "Gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:398
+#: rhodecode/templates/base/base.html:399
 msgid "Search in repositories you have access to"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:404
+#: rhodecode/templates/base/base.html:405
 msgid "Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:411
+#: rhodecode/templates/base/base.html:412
 msgid "Delegated Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:421
 #: rhodecode/templates/base/base.html:422
+#: rhodecode/templates/base/base.html:423
 #: rhodecode/templates/debug_style/buttons.html:5
 #: rhodecode/templates/debug_style/code-block.html:6
 #: rhodecode/templates/debug_style/collapsable-content.html:5
@@ -5940,15 +6578,15 b' msgstr ""'
 msgid "Style"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:479
+#: rhodecode/templates/base/base.html:480
 msgid "Go to"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:590
+#: rhodecode/templates/base/base.html:591
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:598
+#: rhodecode/templates/base/base.html:599
 msgid "Site-wide shortcuts"
 msgstr ""
 
@@ -6140,7 +6778,7 b' msgstr ""'
 msgid "No permission defined"
 msgstr ""
 
-#: rhodecode/templates/base/root.html:151
+#: rhodecode/templates/base/root.html:120
 msgid "Please enable JavaScript to use RhodeCode Enterprise"
 msgstr ""
 
@@ -6282,6 +6920,24 b' msgid ""'
 " updated and outdated inline comments will be hidden."
 msgstr ""
 
+#: rhodecode/templates/base/vcs_settings.html:222
+msgid "Labs settings"
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.html:222
+msgid ""
+"These features are considered experimental and may not work as expected."
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.html:229
+msgid "Mercurial server-side merge"
+msgstr "Mercurial merge auf der Serverseite"
+
+#: rhodecode/templates/base/vcs_settings.html:234
+msgid ""
+"Use rebase instead of creating a merge commit when merging via web interface"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
@@ -6296,8 +6952,8 b' msgid "Compare Selected Bookmarks"'
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks_data.html:13
-#: rhodecode/templates/changelog/changelog.html:180
-#: rhodecode/templates/changelog/changelog_summary_data.html:53
+#: rhodecode/templates/changelog/changelog.html:183
+#: rhodecode/templates/changelog/changelog_summary_data.html:62
 #: rhodecode/templates/changeset/changeset.html:92
 #: rhodecode/templates/files/base.html:10
 #, python-format
@@ -6318,8 +6974,8 b' msgid "Compare Selected Branches"'
 msgstr ""
 
 #: rhodecode/templates/branches/branches_data.html:12
-#: rhodecode/templates/changelog/changelog.html:172
-#: rhodecode/templates/changelog/changelog_summary_data.html:67
+#: rhodecode/templates/changelog/changelog.html:175
+#: rhodecode/templates/changelog/changelog_summary_data.html:76
 #: rhodecode/templates/changeset/changeset.html:105
 #: rhodecode/templates/files/base.html:23
 #, python-format
@@ -6349,10 +7005,6 b' msgstr ""'
 msgid "Compare fork with Parent (%s)"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:62
-msgid "Open new pull request"
-msgstr ""
-
 #: rhodecode/templates/changelog/changelog.html:68
 #: rhodecode/templates/changelog/changelog.html:69
 msgid "Clear selection"
@@ -6362,43 +7014,49 b' msgstr ""'
 msgid "Clear filter"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:103
-#: rhodecode/templates/changelog/changelog_summary_data.html:9
-msgid "Age"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:105
+#: rhodecode/templates/changelog/changelog.html:107
 #: rhodecode/templates/files/files_add.html:93
 #: rhodecode/templates/files/files_delete.html:60
 #: rhodecode/templates/files/files_edit.html:96
 msgid "Commit Message"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:108
-#: rhodecode/templates/changelog/changelog_summary_data.html:11
+#: rhodecode/templates/changelog/changelog.html:109
+#: rhodecode/templates/changelog/changelog_summary_data.html:10
+msgid "Age"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:112
+#: rhodecode/templates/changelog/changelog_summary_data.html:12
 msgid "Refs"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:122
-#: rhodecode/templates/changelog/changelog_summary_data.html:22
+#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog_summary_data.html:21
 #, python-format
 msgid ""
 "Commit status: %s\n"
 "Click to open associated pull request #%s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:130
+#: rhodecode/templates/changelog/changelog_summary_data.html:25
 #, python-format
 msgid "Commit status: %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:162
-#: rhodecode/templates/changelog/changelog_summary_data.html:33
+#: rhodecode/templates/changelog/changelog.html:136
+#: rhodecode/templates/changelog/changelog_summary_data.html:31
+msgid "Commit status: Not Reviewed"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:141
+#: rhodecode/templates/changelog/changelog_summary_data.html:36
 msgid "Commit has comments"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:188
-#: rhodecode/templates/changelog/changelog_summary_data.html:60
+#: rhodecode/templates/changelog/changelog.html:191
+#: rhodecode/templates/changelog/changelog_summary_data.html:69
 #: rhodecode/templates/changeset/changeset.html:99
 #: rhodecode/templates/files/base.html:17
 #: rhodecode/templates/tags/tags_data.html:12
@@ -6406,16 +7064,16 b' msgstr ""'
 msgid "Tag %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:338
+#: rhodecode/templates/changelog/changelog.html:341
 msgid "Filter changelog"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:411
+#: rhodecode/templates/changelog/changelog.html:414
 msgid "There are no changes yet"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/pullrequests/pullrequest_show.html:358
+#: rhodecode/templates/pullrequests/pullrequest_show.html:362
 msgid "Removed"
 msgstr ""
 
@@ -6446,25 +7104,25 b' msgstr ""'
 msgid "Show File"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:8
+#: rhodecode/templates/changelog/changelog_summary_data.html:9
 #: rhodecode/templates/search/search_commit.html:8
 msgid "Commit message"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:91
+#: rhodecode/templates/changelog/changelog_summary_data.html:100
 msgid "Add or upload files directly via RhodeCode:"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:94
+#: rhodecode/templates/changelog/changelog_summary_data.html:103
 #: rhodecode/templates/files/files_browser.html:25
 msgid "Add New File"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:102
+#: rhodecode/templates/changelog/changelog_summary_data.html:111
 msgid "Push new repo:"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:113
+#: rhodecode/templates/changelog/changelog_summary_data.html:122
 msgid "Existing repository?"
 msgstr ""
 
@@ -6540,7 +7198,7 b' msgstr ""'
 
 #: rhodecode/templates/changeset/changeset.html:145
 #: rhodecode/templates/changeset/changeset.html:147
-#: rhodecode/tests/functional/test_changeset_comments.py:217
+#: rhodecode/tests/functional/test_commit_comments.py:263
 #, python-format
 msgid "%d Commit comment"
 msgid_plural "%d Commit comments"
@@ -6551,22 +7209,22 b' msgstr[1] ""'
 #: rhodecode/templates/changeset/changeset.html:153
 #: rhodecode/templates/pullrequests/pullrequest_show.html:145
 #: rhodecode/templates/pullrequests/pullrequest_show.html:147
-#: rhodecode/tests/functional/test_changeset_comments.py:224
+#: rhodecode/tests/functional/test_commit_comments.py:270
 #, python-format
 msgid "%d Inline Comment"
 msgid_plural "%d Inline Comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:177
+#: 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
-msgid "Browse files"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:179
 #: rhodecode/templates/changeset/changeset_range.html:59
 #: rhodecode/templates/compare/compare_diff.html:255
 #: rhodecode/templates/files/file_diff.html:77
@@ -6574,7 +7232,7 b' msgstr ""'
 msgid "Expand All"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:179
+#: 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
@@ -6582,30 +7240,32 b' msgstr ""'
 msgid "Collapse All"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:190
+#: 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:227
+#: 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:228
+#: 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:245
+#: 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:245
+#: 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
@@ -6615,22 +7275,22 b' msgstr ""'
 msgid "Showing a big diff might take some time and resources, continue?"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:245
+#: 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:386
-#: rhodecode/templates/pullrequests/pullrequest_show.html:392
+#: rhodecode/templates/pullrequests/pullrequest_show.html:390
+#: rhodecode/templates/pullrequests/pullrequest_show.html:396
 msgid "Show full diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:314
+#: rhodecode/templates/changeset/changeset.html:312
 msgid "No Child Commits"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:350
+#: rhodecode/templates/changeset/changeset.html:348
 msgid "No Parent Commits"
 msgstr ""
 
@@ -6684,6 +7344,8 b' 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/email_templates/commit_comment.mako:87
+#: rhodecode/templates/email_templates/pull_request_comment.mako:93
 msgid "Comment"
 msgstr ""
 
@@ -6831,12 +7493,15 b' msgid "Compare Commits"'
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.html:46
+#: rhodecode/templates/email_templates/pull_request_review.mako:50
 #: 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_comment.mako:92
+#: rhodecode/templates/email_templates/pull_request_review.mako:49
 #: rhodecode/templates/files/file_diff.html:62
 #: rhodecode/templates/files/files_source.html:18
 msgid "Source"
@@ -6886,36 +7551,36 b' msgstr "Abonniere den %s RSS Feed"'
 msgid "Subscribe to %s atom feed"
 msgstr "Abonniere den %s ATOM Feed"
 
-#: rhodecode/templates/data_table/_dt_elements.html:127
+#: rhodecode/templates/data_table/_dt_elements.html:129
 msgid "Creating"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:129
+#: rhodecode/templates/data_table/_dt_elements.html:131
 msgid "Created"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:175
+#: rhodecode/templates/data_table/_dt_elements.html:177
 #, 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:201
+#: rhodecode/templates/data_table/_dt_elements.html:203
 #, python-format
 msgid "Confirm to delete this user group: %s"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:218
+#: rhodecode/templates/data_table/_dt_elements.html:220
 msgid "User group"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:262
+#: rhodecode/templates/data_table/_dt_elements.html:264
 #: rhodecode/templates/forks/fork.html:81
 msgid "Private"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:287
+#: rhodecode/templates/data_table/_dt_elements.html:289
 #, python-format
 msgid "Pull request #%(pr_number)s"
 msgstr ""
@@ -7019,85 +7684,138 b' msgstr ""'
 msgid "Form vertical"
 msgstr ""
 
-#: rhodecode/templates/email_templates/base.mako:16
+#: rhodecode/templates/email_templates/base.mako:7
 #, python-format
 msgid "This is a notification from RhodeCode. %(instance_url)s"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:5
-#: rhodecode/templates/email_templates/pull_request_comment.mako:5
+#: rhodecode/templates/email_templates/base.mako:90
+msgid "RhodeCode"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:16
+#: rhodecode/templates/email_templates/pull_request_comment.mako:17
 msgid "[mention]"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:5
-#, python-format
-msgid "%(user)s commented on commit of %(repo_name)s"
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:14
-#: rhodecode/templates/email_templates/commit_comment.mako:41
-#: rhodecode/templates/email_templates/pull_request_comment.mako:15
-#: rhodecode/templates/email_templates/pull_request_comment.mako:51
-msgid "Comment link"
+#: rhodecode/templates/email_templates/commit_comment.mako:19
+#, python-format
+msgid ""
+"%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:19
+#: rhodecode/templates/email_templates/commit_comment.mako:22
+#: rhodecode/templates/email_templates/commit_comment.mako:24
+#, python-format
+msgid "in the %(repo_name)s repository"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:22
+#, python-format
+msgid "%(user)s commented on commit `%(commit_id)s` (status: %(status)s)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:24
+#: rhodecode/templates/email_templates/commit_comment.mako:78
+#, python-format
+msgid "%(user)s commented on commit `%(commit_id)s`"
+msgstr ""
+
 #: rhodecode/templates/email_templates/commit_comment.mako:43
-#: rhodecode/templates/email_templates/pull_request_comment.mako:20
-#: rhodecode/templates/email_templates/pull_request_comment.mako:54
+#: rhodecode/templates/email_templates/pull_request_comment.mako:43
+msgid "Comment link"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:48
+#: rhodecode/templates/email_templates/pull_request_comment.mako:48
 #, python-format
 msgid "File: %(comment_file)s on line %(comment_line)s"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:28
-#: rhodecode/templates/email_templates/commit_comment.mako:56
+#: rhodecode/templates/email_templates/commit_comment.mako:54
 msgid "Commit status was changed to"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:35
-#, python-format
-msgid "%(user)s commented on a file in commit of %(repo_url)s."
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:37
-#, python-format
-msgid "%(user)s commented on a commit of %(repo_url)s."
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:47
-#: rhodecode/templates/files/files_detail.html:5
-#: rhodecode/templates/files/files_detail.html:12
-msgid "Commit Description"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:5
-#, python-format
-msgid "%(user)s commented on pull request #%(pr_id)s: \"%(pr_title)s\""
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:17
-#: rhodecode/templates/email_templates/pull_request_comment.mako:52
+#: rhodecode/templates/email_templates/commit_comment.mako:76
+#, python-format
+msgid "%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:76
+#: rhodecode/templates/email_templates/commit_comment.mako:78
+#, python-format
+msgid "in the %(repo)s repository"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:85
+msgid "Status"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:85
+msgid "The commit status was changed to"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:87
+#: rhodecode/templates/email_templates/pull_request_comment.mako:93
+#, python-format
+msgid "Comment on line: %(comment_line)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/password_reset.mako:30
+msgid "Generate new password here"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:20
+#, python-format
+msgid ""
+"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: "
+"`%(comment_file)s`)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:23
+#, python-format
+msgid ""
+"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: "
+"%(status)s)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:25
+#: rhodecode/templates/email_templates/pull_request_comment.mako:82
+#, python-format
+msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\""
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:45
 msgid "Source repository"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_comment.mako:29
-#: rhodecode/templates/email_templates/pull_request_comment.mako:63
-msgid "Pull request status was changed to"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:31
-#: rhodecode/templates/email_templates/pull_request_comment.mako:65
-msgid "Pull request was closed with status"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:37
-#, python-format
-msgid "%(user)s commented on a file on pull request #%(pr_id)s: \"%(pr_title)s\"."
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:43
-#, python-format
-msgid "%(user)s commented on a pull request #%(pr_id)s \"%(pr_title)s\"."
+#: rhodecode/templates/email_templates/pull_request_comment.mako:54
+#, python-format
+msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:56
+#, python-format
+msgid ""
+"%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:80
+#, python-format
+msgid ""
+"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" "
+"(file:`%(comment_file)s`)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:86
+#, python-format
+msgid "submitted pull request status: %(status)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:88
+#, python-format
+msgid "submitted pull request status: %(status)s and closed"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:5
@@ -7106,7 +7824,6 b' msgid "%(user)s wants you to review pull'
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:17
-#: rhodecode/templates/email_templates/pull_request_review.mako:54
 #, python-format
 msgid ""
 "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s "
@@ -7114,12 +7831,10 b' msgid ""'
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:26
-#: rhodecode/templates/email_templates/pull_request_review.mako:63
 msgid "Link"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:35
-#: rhodecode/templates/email_templates/pull_request_review.mako:72
 #, python-format
 msgid "Commit (%(num)s)"
 msgid_plural "Commits (%(num)s)"
@@ -7131,6 +7846,25 b' msgstr[1] ""'
 msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"."
 msgstr ""
 
+#: rhodecode/templates/email_templates/pull_request_review.mako:49
+#, python-format
+msgid "%(source_ref_type)s of %(source_repo_url)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_review.mako:50
+#, python-format
+msgid "%(target_ref_type)s of %(target_repo_url)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_review.mako:52
+#: rhodecode/templates/summary/components.html:95
+#: rhodecode/templates/summary/components.html:98
+#, python-format
+msgid "%(num)s Commit"
+msgid_plural "%(num)s Commits"
+msgstr[0] ""
+msgstr[1] ""
+
 #: rhodecode/templates/email_templates/test.mako:5
 msgid "hello \"world\""
 msgstr ""
@@ -7139,6 +7873,21 b' msgstr ""'
 msgid "Translation"
 msgstr ""
 
+#: rhodecode/templates/email_templates/user_registration.mako:22
+#, python-format
+msgid "New user %(user)s has registered on %(date)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/user_registration.mako:24
+msgid "Full Name"
+msgstr ""
+
+#: rhodecode/templates/email_templates/user_registration.mako:26
+#: rhodecode/templates/users/user.html:29
+#: rhodecode/templates/users/user_profile.html:5
+msgid "Profile"
+msgstr ""
+
 #: rhodecode/templates/errors/error_document.html:39
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
@@ -7150,8 +7899,8 b' msgid "%(user)s commited on %(date)s UTC'
 msgstr ""
 
 #: rhodecode/templates/feed/atom_feed_entry.mako:26
-#: rhodecode/templates/pullrequests/pullrequest_show.html:386
-#: rhodecode/templates/pullrequests/pullrequest_show.html:392
+#: rhodecode/templates/pullrequests/pullrequest_show.html:390
+#: rhodecode/templates/pullrequests/pullrequest_show.html:396
 msgid "Commit was too big and was cut off..."
 msgstr ""
 
@@ -7195,7 +7944,7 b' msgstr[1] ""'
 msgid "Show All"
 msgstr ""
 
-#: rhodecode/templates/files/file_authors_box.html:26
+#: rhodecode/templates/files/file_authors_box.html:25
 msgid "last author"
 msgstr ""
 
@@ -7230,7 +7979,7 b' msgstr ""'
 msgid "%s Files"
 msgstr ""
 
-#: rhodecode/templates/files/files.html:143
+#: rhodecode/templates/files/files.html:131
 msgid "Switch To Commit"
 msgstr ""
 
@@ -7326,22 +8075,18 b' msgstr ""'
 msgid "Loading file list..."
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:50
+#: rhodecode/templates/files/files_browser_tree.html:6
 msgid "Size"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:51
+#: rhodecode/templates/files/files_browser_tree.html:7
 msgid "Modified"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:52
+#: rhodecode/templates/files/files_browser_tree.html:8
 msgid "Last Commit"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:89
-msgid "Loading..."
-msgstr "Lade..."
-
 #: rhodecode/templates/files/files_delete.html:4
 #, python-format
 msgid "%s Files Delete"
@@ -7366,6 +8111,11 b' msgstr ""'
 msgid "Delete File"
 msgstr ""
 
+#: rhodecode/templates/files/files_detail.html:5
+#: rhodecode/templates/files/files_detail.html:12
+msgid "Commit Description"
+msgstr ""
+
 #: rhodecode/templates/files/files_detail.html:35
 msgid "File last commit"
 msgstr ""
@@ -7524,7 +8274,7 b' msgstr ""'
 msgid "Forked"
 msgstr ""
 
-#: rhodecode/templates/forks/forks_data.html:48
+#: rhodecode/templates/forks/forks_data.html:46
 msgid "There are no forks yet"
 msgstr ""
 
@@ -7540,7 +8290,7 b' msgstr "ATOM Logbuch Feed"'
 msgid "RSS journal feed"
 msgstr "RSS Logbuch Feed"
 
-#: rhodecode/templates/journal/journal_data.html:53
+#: rhodecode/templates/journal/journal_data.html:51
 msgid "No entries yet"
 msgstr ""
 
@@ -7718,13 +8468,13 b' msgid_plural "Compare View: %s commits"'
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:330
-#: rhodecode/templates/pullrequests/pullrequest_show.html:365
+#: 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:386
-#: rhodecode/templates/pullrequests/pullrequest_show.html:392
+#: 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 ""
 
@@ -7903,14 +8653,6 b' msgstr ""'
 msgid "Information"
 msgstr ""
 
-#: rhodecode/templates/summary/components.html:95
-#: rhodecode/templates/summary/components.html:98
-#, python-format
-msgid "%(num)s Commit"
-msgid_plural "%(num)s Commits"
-msgstr[0] ""
-msgstr[1] ""
-
 #: rhodecode/templates/summary/components.html:102
 msgid "Number of Repository Forks"
 msgstr ""
@@ -7974,11 +8716,6 b' msgstr ""'
 msgid "Compare Selected Tags"
 msgstr ""
 
-#: rhodecode/templates/users/user.html:29
-#: rhodecode/templates/users/user_profile.html:5
-msgid "Profile"
-msgstr ""
-
 #: rhodecode/templates/users/user_profile.html:35
 msgid "First name"
 msgstr ""

rhodecode/i18n/es/LC_MESSAGES/rhodecode.po

@@ -8,8 +8,8 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2016-06-28 10:55+0000\n"
-"PO-Revision-Date: 2016-06-28 10:56+0000\n"
+"POT-Creation-Date: 2016-08-02 20:55+0000\n"
+"PO-Revision-Date: 2016-08-02 20:57+0000\n"
 "Last-Translator: Marcin Kuzminski <[e-mail]>\n"
 "Language-Team: Spanish (http://www.transifex.com/rhodecode/RhodeCode/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -19,17 +19,81 b' msgstr ""'
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: rhodecode/authentication/routes.py:60
-#: rhodecode/controllers/admin/settings.py:844
+#: rhodecode/admin/navigation.py:74 rhodecode/authentication/routes.py:60
+#: rhodecode/integrations/views.py:126
 #: rhodecode/templates/admin/permissions/permissions.html:36
 msgid "Global"
 msgstr ""
 
+#: rhodecode/admin/navigation.py:75
+#: rhodecode/templates/admin/repos/repo_edit.html:52
+msgid "VCS"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:76
+msgid "Visual"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:77
+msgid "Remap and Rescan"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:78
+#: rhodecode/templates/admin/repos/repo_edit.html:58
+msgid "Issue Tracker"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:80 rhodecode/templates/register.html:76
+#: 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/email_templates/user_registration.mako:25
+#: rhodecode/templates/users/user_profile.html:51
+msgid "Email"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:81
+msgid "Hooks"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:82
+msgid "Full Text Search"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:83
+#: rhodecode/templates/admin/integrations/base.html:21
+#: rhodecode/templates/admin/integrations/edit.html:8
+#: rhodecode/templates/admin/integrations/edit.html:19
+#: rhodecode/templates/admin/integrations/list.html:15
+#: rhodecode/templates/admin/integrations/list.html:19
+#: rhodecode/templates/admin/integrations/list.html:26
+#: rhodecode/templates/admin/repos/repo_edit.html:72
+#: rhodecode/templates/base/base.html:84
+msgid "Integrations"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:85
+#: rhodecode/templates/admin/settings/settings_system.html:47
+msgid "System Info"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:86
+msgid "Open Source Licenses"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:93
+msgid "Labs"
+msgstr ""
+
 #: rhodecode/authentication/schema.py:35
 msgid "Enable or disable this authentication plugin."
 msgstr ""
 
-#: rhodecode/authentication/schema.py:37
+#: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:37
+#: rhodecode/templates/admin/integrations/list.html:62
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:14
 msgid "Enabled"
 msgstr ""
 
@@ -44,20 +108,20 b' msgstr ""'
 msgid "Auth Cache TTL"
 msgstr ""
 
-#: rhodecode/authentication/views.py:88
+#: rhodecode/authentication/views.py:90
 msgid ""
 "Errors exist when saving plugin settings. Please check the form inputs."
 msgstr ""
 
-#: rhodecode/authentication/views.py:101 rhodecode/authentication/views.py:170
+#: rhodecode/authentication/views.py:103 rhodecode/authentication/views.py:172
 msgid "Auth settings updated successfully."
 msgstr ""
 
-#: rhodecode/authentication/views.py:175
+#: rhodecode/authentication/views.py:177
 msgid "Errors exist when saving plugin setting. Please check the form inputs."
 msgstr ""
 
-#: rhodecode/authentication/views.py:185
+#: rhodecode/authentication/views.py:187
 msgid "Error occurred during update of auth settings."
 msgstr ""
 
@@ -180,7 +244,7 b' msgstr ""'
 #: rhodecode/templates/login.html:50 rhodecode/templates/register.html:48
 #: rhodecode/templates/admin/my_account/my_account.html:30
 #: rhodecode/templates/admin/users/user_add.html:44
-#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:315
 #: rhodecode/templates/debug_style/login.html:45
 msgid "Password"
 msgstr ""
@@ -229,12 +293,12 b' msgstr ""'
 msgid "LDAP Attribute to map to user name"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:144
-msgid "The LDAP Login attribute of the CN must be specified"
+#: rhodecode/authentication/plugins/auth_ldap.py:145
+msgid "Login Attribute"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:146
-msgid "Login Attribute"
+msgid "The LDAP Login attribute of the CN must be specified"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:151
@@ -261,7 +325,7 b' msgstr ""'
 msgid "Email Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:348
+#: rhodecode/authentication/plugins/auth_ldap.py:351
 msgid "LDAP"
 msgstr ""
 
@@ -295,7 +359,7 b' msgid "Rhodecode Token Auth"'
 msgstr ""
 
 #: rhodecode/controllers/changelog.py:90 rhodecode/controllers/compare.py:63
-#: rhodecode/controllers/pullrequests.py:279
+#: rhodecode/controllers/pullrequests.py:280
 msgid "There are no commits yet"
 msgstr "No hay cometidos todavía"
 
@@ -331,8 +395,8 b' msgid "No such commit exists for this re'
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:335
-#: rhodecode/controllers/pullrequests.py:746
-#: rhodecode/model/pull_request.py:836
+#: rhodecode/controllers/pullrequests.py:750
+#: rhodecode/model/pull_request.py:843
 #, python-format
 msgid "Status change %(transition_icon)s %(status)s"
 msgstr "Cambio de estado %(transition_icon)s %(status)s"
@@ -391,102 +455,102 b' msgstr ""'
 msgid "There are no files yet. %s"
 msgstr "No hay archivos todavía. %s"
 
-#: rhodecode/controllers/files.py:390 rhodecode/controllers/files.py:443
-#: rhodecode/controllers/files.py:474 rhodecode/controllers/files.py:549
-#: rhodecode/controllers/files.py:594 rhodecode/controllers/files.py:685
+#: 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
 #, python-format
 msgid "This repository has been locked by %s on %s"
 msgstr "El repositorio ha sido bloqueado por %s en %s"
 
-#: rhodecode/controllers/files.py:398 rhodecode/controllers/files.py:451
+#: rhodecode/controllers/files.py:389 rhodecode/controllers/files.py:442
 msgid "You can only delete files with revision being a valid branch "
 msgstr "Sólo puede eliminar archivos con revisión siendo una rama válida"
 
-#: rhodecode/controllers/files.py:407 rhodecode/controllers/files.py:460
+#: rhodecode/controllers/files.py:398 rhodecode/controllers/files.py:451
 #, python-format
 msgid "Deleted file %s via RhodeCode Enterprise"
 msgstr "Se eliminó archivo %s vía RhodeCode Enterprise"
 
-#: rhodecode/controllers/files.py:427
+#: rhodecode/controllers/files.py:418
 #, python-format
 msgid "Successfully deleted file %s"
 msgstr "Se eliminó archivo %s exitosamente"
 
-#: rhodecode/controllers/files.py:430 rhodecode/controllers/files.py:536
-#: rhodecode/controllers/files.py:673
+#: rhodecode/controllers/files.py:421 rhodecode/controllers/files.py:527
+#: rhodecode/controllers/files.py:664
 msgid "Error occurred during commit"
 msgstr "Error occurrido durante cometido"
 
-#: rhodecode/controllers/files.py:482 rhodecode/controllers/files.py:557
+#: rhodecode/controllers/files.py:473 rhodecode/controllers/files.py:548
 msgid "You can only edit files with revision being a valid branch "
 msgstr "Usted puede editar solamente archivos con revision siendo una rama válida"
 
-#: rhodecode/controllers/files.py:494 rhodecode/controllers/files.py:569
+#: rhodecode/controllers/files.py:485 rhodecode/controllers/files.py:560
 #, python-format
 msgid "Edited file %s via RhodeCode Enterprise"
 msgstr "Se editó archivo %s vía RhodeCode Enterprise"
 
-#: rhodecode/controllers/files.py:511
+#: rhodecode/controllers/files.py:502
 msgid "No changes"
 msgstr "Sin cambios"
 
-#: rhodecode/controllers/files.py:533 rhodecode/controllers/files.py:662
+#: rhodecode/controllers/files.py:524 rhodecode/controllers/files.py:653
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Se cometió a %s exitosamente"
 
-#: rhodecode/controllers/files.py:607 rhodecode/controllers/files.py:696
+#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:687
 msgid "Added file via RhodeCode Enterprise"
 msgstr "Se agregó archivo vía RhodeCode Enterprise"
 
-#: rhodecode/controllers/files.py:632
+#: rhodecode/controllers/files.py:623
 msgid "No filename"
 msgstr "Sin nombre de archivo"
 
-#: rhodecode/controllers/files.py:665
+#: rhodecode/controllers/files.py:656
 msgid ""
 "The location specified must be a relative path and must not contain .. in "
 "the path"
 msgstr "La localización específica debe ser una ruta relativa y no deve contener .. en la ruta"
 
-#: rhodecode/controllers/files.py:719
+#: rhodecode/controllers/files.py:710
 msgid "Downloads disabled"
 msgstr "Descargas deshabilitadas"
 
-#: rhodecode/controllers/files.py:725
+#: rhodecode/controllers/files.py:716
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Revision desconocida %s"
 
-#: rhodecode/controllers/files.py:727
+#: rhodecode/controllers/files.py:718
 msgid "Empty repository"
 msgstr "Repositorio vacío"
 
-#: rhodecode/controllers/files.py:729 rhodecode/controllers/files.py:763
+#: rhodecode/controllers/files.py:720 rhodecode/controllers/files.py:754
 msgid "Unknown archive type"
 msgstr "Typo de archivo desconocido"
 
-#: rhodecode/controllers/files.py:930
+#: rhodecode/controllers/files.py:921
 #, python-format
 msgid "Commit %(commit)s does not exist."
 msgstr ""
 
-#: rhodecode/controllers/files.py:947
+#: rhodecode/controllers/files.py:938
 #, python-format
 msgid "%(file_path)s has not changed between %(commit_1)s and %(commit_2)s."
 msgstr ""
 
-#: rhodecode/controllers/files.py:1014
+#: rhodecode/controllers/files.py:1005
 msgid "Changesets"
 msgstr "Conjuntos de cambios"
 
-#: rhodecode/controllers/files.py:1035 rhodecode/controllers/summary.py:256
-#: rhodecode/model/pull_request.py:1051 rhodecode/model/scm.py:783
+#: rhodecode/controllers/files.py:1026 rhodecode/controllers/summary.py:251
+#: rhodecode/model/pull_request.py:1059 rhodecode/model/scm.py:780
 #: rhodecode/templates/base/vcs_settings.html:138
 msgid "Branches"
 msgstr "Ramas"
 
-#: rhodecode/controllers/files.py:1039 rhodecode/model/scm.py:798
+#: rhodecode/controllers/files.py:1030 rhodecode/model/scm.py:795
 #: rhodecode/templates/base/vcs_settings.html:163
 msgid "Tags"
 msgstr "Etiquetas"
@@ -501,14 +565,14 b' msgid "Groups"'
 msgstr "Grupos"
 
 #: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247
-#: rhodecode/controllers/pullrequests.py:382
+#: rhodecode/controllers/pullrequests.py:383
 #: 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:79
-#: rhodecode/templates/base/base.html:149
-#: rhodecode/templates/base/base.html:626
+#: rhodecode/templates/base/base.html:78
+#: rhodecode/templates/base/base.html:150
+#: rhodecode/templates/base/base.html:627
 msgid "Repositories"
 msgstr "Repositorios"
 
@@ -525,98 +589,98 b' msgstr "diario p\xc3\xbablico"'
 msgid "journal"
 msgstr "diario"
 
-#: rhodecode/controllers/pullrequests.py:293
+#: rhodecode/controllers/pullrequests.py:294
 msgid "Commit does not exist"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:405
+#: rhodecode/controllers/pullrequests.py:406
 msgid "Pull request requires a title with min. 3 chars"
 msgstr "La solicitud de extracción requiere un título con un mínimo de 3 caracteres"
 
-#: rhodecode/controllers/pullrequests.py:407
+#: rhodecode/controllers/pullrequests.py:408
 msgid "Error creating pull request: {}"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:454
+#: rhodecode/controllers/pullrequests.py:455
 msgid "Successfully opened new pull request"
 msgstr "Se abrió nueva solicitud de extracción exitosamente"
 
-#: rhodecode/controllers/pullrequests.py:457
+#: rhodecode/controllers/pullrequests.py:458
 msgid "Error occurred during sending pull request"
 msgstr "Error ocurrido durante envío de solicitud de extracción"
 
-#: rhodecode/controllers/pullrequests.py:497
+#: rhodecode/controllers/pullrequests.py:498
 msgid "Cannot update closed pull requests."
 msgstr "No se pueden actualizar solicitudes de extracción cerradas."
 
-#: rhodecode/controllers/pullrequests.py:503
+#: rhodecode/controllers/pullrequests.py:504
 msgid "Pull request title & description updated."
 msgstr "Título de solicitud de extracción & descripción actualizados."
 
-#: rhodecode/controllers/pullrequests.py:513
+#: rhodecode/controllers/pullrequests.py:514
 msgid ""
 "Pull request updated to \"{source_commit_id}\" with {count_added} added, "
 "{count_removed} removed commits."
 msgstr "Solicitud de extracción actualizada a \"{source_commit_id}\" con {count_added} cometidos agregados, {count_removed} removidos."
 
-#: rhodecode/controllers/pullrequests.py:523
+#: rhodecode/controllers/pullrequests.py:524
 msgid "Nothing changed in pull request."
 msgstr "Nada cambió en solicitud de extracción"
 
-#: rhodecode/controllers/pullrequests.py:526
+#: rhodecode/controllers/pullrequests.py:527
 msgid ""
 "Skipping update of pull request due to reference type: {reference_type}"
 msgstr "Omitiendo actualización de solicitud de extracción debido a tipo de referencia: {reference_type}"
 
-#: rhodecode/controllers/pullrequests.py:533
+#: rhodecode/controllers/pullrequests.py:534
 msgid "Update failed due to missing commits."
 msgstr "La actualización falló debido a cometidos faltantes"
 
-#: rhodecode/controllers/pullrequests.py:579
+#: rhodecode/controllers/pullrequests.py:580
 msgid "Pull request reviewer approval is pending."
 msgstr "La aprobacion del revisador de la solicitud de extracción está pendiente"
 
-#: rhodecode/controllers/pullrequests.py:593
+#: rhodecode/controllers/pullrequests.py:594
 msgid "Pull request was successfully merged and closed."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:631
+#: rhodecode/controllers/pullrequests.py:632
 msgid "Successfully deleted pull request"
 msgstr "Se eliminó la solicitud de extracción exitosamente"
 
-#: rhodecode/controllers/pullrequests.py:664
+#: rhodecode/controllers/pullrequests.py:668
 msgid "Reviewer approval is pending."
 msgstr "La aprobación del revisador está pendiente."
 
-#: rhodecode/controllers/pullrequests.py:706
+#: rhodecode/controllers/pullrequests.py:710
 msgid "Close Pull Request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:750
-#: rhodecode/model/pull_request.py:840
+#: rhodecode/controllers/pullrequests.py:754
+#: rhodecode/model/pull_request.py:847
 msgid "Closing with"
 msgstr "Cerrando con"
 
-#: rhodecode/controllers/pullrequests.py:795
+#: rhodecode/controllers/pullrequests.py:802
 #, python-format
 msgid ""
 "Closing pull request on other statuses than rejected or approved is "
 "forbidden. Calculated status from all reviewers is currently: %s"
 msgstr "Está prohibido el cerrar solicitudes de extracción otros estados que no sean rechazado o aprobado. El estado calculado por parte de todos los revisadores es actualmente: %s"
 
-#: rhodecode/controllers/summary.py:240
+#: rhodecode/controllers/summary.py:235
 msgid "Branch"
 msgstr "Rama"
 
-#: rhodecode/controllers/summary.py:241
+#: rhodecode/controllers/summary.py:236
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: rhodecode/controllers/summary.py:242
+#: rhodecode/controllers/summary.py:237
 msgid "Bookmark"
 msgstr "Marcador"
 
-#: rhodecode/controllers/summary.py:257
+#: rhodecode/controllers/summary.py:252
 msgid "Closed branches"
 msgstr "Ramas cerradas"
 
@@ -628,83 +692,87 b' msgstr "Ajustes por defecto actualizados'
 msgid "Error occurred during update of default values"
 msgstr "Error ocurrido durante actalización de valores por defecto"
 
-#: rhodecode/controllers/admin/gists.py:59
+#: rhodecode/controllers/admin/gists.py:63
 #: rhodecode/controllers/admin/my_account.py:307
-#: rhodecode/controllers/admin/users.py:436
+#: rhodecode/controllers/admin/users.py:431
 msgid "forever"
 msgstr "para siempre"
 
-#: rhodecode/controllers/admin/gists.py:60
+#: rhodecode/controllers/admin/gists.py:64
 #: rhodecode/controllers/admin/my_account.py:308
-#: rhodecode/controllers/admin/users.py:437
+#: rhodecode/controllers/admin/users.py:432
 msgid "5 minutes"
 msgstr "5 minutos"
 
-#: rhodecode/controllers/admin/gists.py:61
+#: rhodecode/controllers/admin/gists.py:65
 #: rhodecode/controllers/admin/my_account.py:309
-#: rhodecode/controllers/admin/users.py:438
+#: rhodecode/controllers/admin/users.py:433
 msgid "1 hour"
 msgstr "1 hora"
 
-#: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/gists.py:66
 #: rhodecode/controllers/admin/my_account.py:310
-#: rhodecode/controllers/admin/users.py:439
+#: rhodecode/controllers/admin/users.py:434
 msgid "1 day"
 msgstr "1 día"
 
-#: rhodecode/controllers/admin/gists.py:63
+#: rhodecode/controllers/admin/gists.py:67
 #: rhodecode/controllers/admin/my_account.py:311
-#: rhodecode/controllers/admin/users.py:440
+#: rhodecode/controllers/admin/users.py:435
 msgid "1 month"
 msgstr "1 mes"
 
-#: rhodecode/controllers/admin/gists.py:67
+#: rhodecode/controllers/admin/gists.py:71
 #: rhodecode/controllers/admin/my_account.py:313
-#: rhodecode/controllers/admin/users.py:442
+#: rhodecode/controllers/admin/users.py:437
 msgid "Lifetime"
 msgstr "De por vida"
 
-#: rhodecode/controllers/admin/gists.py:69
+#: rhodecode/controllers/admin/gists.py:73
 msgid "Requires registered account"
 msgstr "Requiere cuenta registrada"
 
-#: rhodecode/controllers/admin/gists.py:70
+#: rhodecode/controllers/admin/gists.py:74
 msgid "Can be accessed by anonymous users"
 msgstr "Puede ser accesado por usuarios anónimos"
 
-#: rhodecode/controllers/admin/gists.py:180
+#: rhodecode/controllers/admin/gists.py:200
 msgid "Error occurred during gist creation"
 msgstr "Error ocurrido durante creación de quid"
 
-#: rhodecode/controllers/admin/gists.py:211
+#: rhodecode/controllers/admin/gists.py:231
 #, python-format
 msgid "Deleted gist %s"
 msgstr "Se eliminó quid %s"
 
-#: rhodecode/controllers/admin/gists.py:284
+#: rhodecode/controllers/admin/gists.py:308
 msgid "Successfully updated gist content"
 msgstr "Se actualizó exitosamente el contenido de quid"
 
-#: rhodecode/controllers/admin/gists.py:289
+#: rhodecode/controllers/admin/gists.py:313
 msgid "Successfully updated gist data"
 msgstr "Se actualizaron exitosamente los datos de quid"
 
-#: rhodecode/controllers/admin/gists.py:292
+#: rhodecode/controllers/admin/gists.py:316
+msgid "Error occurred during update of gist {}: {}"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:320
 #, python-format
 msgid "Error occurred during update of gist %s"
 msgstr "Error ocurrido durante actualización de quid %s"
 
-#: rhodecode/controllers/admin/gists.py:315
+#: rhodecode/controllers/admin/gists.py:343
 #: 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:253
+#: rhodecode/templates/data_table/_dt_elements.html:255
 msgid "never"
 msgstr "nunca"
 
-#: rhodecode/controllers/admin/gists.py:320
+#: rhodecode/controllers/admin/gists.py:348
 #, python-format
 msgid "%(expiry)s - current value"
 msgstr "%(expiry)s - valor actual"
@@ -718,7 +786,7 b' msgid "Your account was updated successf'
 msgstr "Su cuenta fue actualizada exitosamente"
 
 #: rhodecode/controllers/admin/my_account.py:143
-#: rhodecode/controllers/admin/users.py:223
+#: rhodecode/controllers/admin/users.py:218
 #, python-format
 msgid "Error occurred during update of user %s"
 msgstr "Error ocurrido durante actualización de usuario %s"
@@ -732,38 +800,38 b' msgid "Error occurred during update of u'
 msgstr "Error ocurrido durante actualización de contraseña de usuario"
 
 #: rhodecode/controllers/admin/my_account.py:261
-#: rhodecode/controllers/admin/users.py:616
+#: rhodecode/controllers/admin/users.py:611
 #, python-format
 msgid "Added new email address `%s` for user account"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:268
-#: rhodecode/controllers/admin/users.py:623
+#: rhodecode/controllers/admin/users.py:618
 msgid "An error occurred during email saving"
 msgstr "Ocurrió un error durante guardado de correo electrónico"
 
 #: rhodecode/controllers/admin/my_account.py:278
-#: rhodecode/controllers/admin/users.py:638
+#: rhodecode/controllers/admin/users.py:633
 msgid "Removed email address from user account"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:316
-#: rhodecode/controllers/admin/users.py:445
+#: rhodecode/controllers/admin/users.py:440
 msgid "Role"
 msgstr "Rol"
 
 #: rhodecode/controllers/admin/my_account.py:329
-#: rhodecode/controllers/admin/users.py:469
+#: rhodecode/controllers/admin/users.py:464
 msgid "Auth token successfully created"
 msgstr "Ficha de autenticación creada exitosamente"
 
 #: rhodecode/controllers/admin/my_account.py:342
-#: rhodecode/controllers/admin/users.py:488
+#: rhodecode/controllers/admin/users.py:483
 msgid "Auth token successfully reset"
 msgstr "Ficha de autenticación reiniciada exitosamente"
 
 #: rhodecode/controllers/admin/my_account.py:346
-#: rhodecode/controllers/admin/users.py:492
+#: rhodecode/controllers/admin/users.py:487
 msgid "Auth token successfully deleted"
 msgstr "Ficha de autenticación eliminada exitosamente"
 
@@ -838,309 +906,250 b' msgstr "No puede cambiar el permiso para'
 msgid "Repository Group permissions updated"
 msgstr "Permisos de Grupo de Repositorio actualizados"
 
-#: rhodecode/controllers/admin/repos.py:128
+#: rhodecode/controllers/admin/repos.py:129
 #, python-format
 msgid "Error creating repository %s: invalid certificate"
 msgstr "Error al crear repositorio %s: certificado inválido"
 
-#: rhodecode/controllers/admin/repos.py:132
+#: rhodecode/controllers/admin/repos.py:133
 #, python-format
 msgid "Error creating repository %s"
 msgstr "Error al crear repositorio %s"
 
-#: rhodecode/controllers/admin/repos.py:264
+#: rhodecode/controllers/admin/repos.py:265
 #, python-format
 msgid "Created repository %s from %s"
 msgstr "Se creó repositorio %s a base de %s"
 
-#: rhodecode/controllers/admin/repos.py:273
+#: rhodecode/controllers/admin/repos.py:274
 #, python-format
 msgid "Forked repository %s as %s"
 msgstr "Se bifurcó repositorio %s como %s"
 
-#: rhodecode/controllers/admin/repos.py:276
+#: rhodecode/controllers/admin/repos.py:277
 #, python-format
 msgid "Created repository %s"
 msgstr "Se creó repositorio %s"
 
-#: rhodecode/controllers/admin/repos.py:318
+#: rhodecode/controllers/admin/repos.py:319
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Repositorio %s actualizado exitosamente"
 
-#: rhodecode/controllers/admin/repos.py:337
+#: rhodecode/controllers/admin/repos.py:338
 #, python-format
 msgid "Error occurred during update of repository %s"
 msgstr "Error ocurrido durante actualización de repositorio %s"
 
-#: rhodecode/controllers/admin/repos.py:365
+#: rhodecode/controllers/admin/repos.py:366
 #, python-format
 msgid "Detached %s forks"
 msgstr "Se despegaron %s bifurcaciones"
 
-#: rhodecode/controllers/admin/repos.py:368
+#: rhodecode/controllers/admin/repos.py:369
 #, python-format
 msgid "Deleted %s forks"
 msgstr "Se eliminaron %s bifurcaciones"
 
-#: rhodecode/controllers/admin/repos.py:373
+#: rhodecode/controllers/admin/repos.py:374
 #, python-format
 msgid "Deleted repository %s"
 msgstr "Se eliminó repositorio %s"
 
-#: rhodecode/controllers/admin/repos.py:376
+#: rhodecode/controllers/admin/repos.py:377
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr "No se puede eliminar %s todavía contiene bifurcaciones adjuntas"
 
-#: rhodecode/controllers/admin/repos.py:381
+#: rhodecode/controllers/admin/repos.py:382
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Ocurrió un error durante eliminación de %s"
 
-#: rhodecode/controllers/admin/repos.py:435
+#: rhodecode/controllers/admin/repos.py:436
 msgid "Repository permissions updated"
 msgstr "Permisos de repositorio actualizados"
 
-#: rhodecode/controllers/admin/repos.py:466
+#: rhodecode/controllers/admin/repos.py:467
 msgid "An error occurred during creation of field"
 msgstr "Ocurrió un error durante creación de campo"
 
-#: rhodecode/controllers/admin/repos.py:481
+#: rhodecode/controllers/admin/repos.py:482
 msgid "An error occurred during removal of field"
 msgstr "Ocurrió un error durante remoción de campo"
 
-#: rhodecode/controllers/admin/repos.py:520
+#: rhodecode/controllers/admin/repos.py:521
 msgid "Updated repository visibility in public journal"
 msgstr "Se actualizó visibilidad de repositorio en diario público"
 
-#: rhodecode/controllers/admin/repos.py:524
+#: rhodecode/controllers/admin/repos.py:525
 msgid "An error occurred during setting this repository in public journal"
 msgstr "Ocurrió un error al ajustar este repositorio en diario público"
 
-#: rhodecode/controllers/admin/repos.py:548
+#: rhodecode/controllers/admin/repos.py:549
 msgid "Nothing"
 msgstr "Nada"
 
-#: rhodecode/controllers/admin/repos.py:550
+#: rhodecode/controllers/admin/repos.py:551
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "Se marcó repositorio %s como bifurcación de %s"
 
-#: rhodecode/controllers/admin/repos.py:557
+#: rhodecode/controllers/admin/repos.py:558
 msgid "An error occurred during this operation"
 msgstr "Ocurrió un error durante esta operación"
 
-#: rhodecode/controllers/admin/repos.py:575
+#: rhodecode/controllers/admin/repos.py:576
 msgid "Locked repository"
 msgstr "Repositorio blockeado"
 
-#: rhodecode/controllers/admin/repos.py:578
+#: rhodecode/controllers/admin/repos.py:579
 msgid "Unlocked repository"
 msgstr "Repositorio desbloqueado"
 
-#: rhodecode/controllers/admin/repos.py:581
-#: rhodecode/controllers/admin/repos.py:610
+#: rhodecode/controllers/admin/repos.py:582
+#: rhodecode/controllers/admin/repos.py:611
 msgid "An error occurred during unlocking"
 msgstr "Ocurrió un error durante desbloqueo"
 
-#: rhodecode/controllers/admin/repos.py:600
+#: rhodecode/controllers/admin/repos.py:601
 msgid "Unlocked"
 msgstr "Desbloqueado"
 
-#: rhodecode/controllers/admin/repos.py:604
+#: rhodecode/controllers/admin/repos.py:605
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: rhodecode/controllers/admin/repos.py:606
+#: rhodecode/controllers/admin/repos.py:607
 #, python-format
 msgid "Repository has been %s"
 msgstr "El repositorio ha sido %s"
 
-#: rhodecode/controllers/admin/repos.py:621
+#: rhodecode/controllers/admin/repos.py:622
 msgid "Cache invalidation successful"
 msgstr "Invalidación de caché exitosa"
 
-#: rhodecode/controllers/admin/repos.py:625
+#: rhodecode/controllers/admin/repos.py:626
 msgid "An error occurred during cache invalidation"
 msgstr "Ocurrió un error durante invalidación de caché"
 
-#: rhodecode/controllers/admin/repos.py:645
+#: rhodecode/controllers/admin/repos.py:646
 msgid "Pulled from remote location"
 msgstr "Extraído de localidad remota"
 
-#: rhodecode/controllers/admin/repos.py:648
+#: rhodecode/controllers/admin/repos.py:649
 msgid "An error occurred during pull from remote location"
 msgstr "Ocurrió un error durante extracción de localidad remota"
 
-#: rhodecode/controllers/admin/repos.py:670
+#: rhodecode/controllers/admin/repos.py:671
 msgid "An error occurred during deletion of repository stats"
 msgstr "Ocurrió un error durante eliminacion de estadísticas de repositorio"
 
-#: rhodecode/controllers/admin/repos.py:717
+#: rhodecode/controllers/admin/repos.py:718
 msgid "Error occurred during deleting issue tracker entry"
 msgstr "Error ocurrido al eliminar entrada en el seguidor de incidencias"
 
-#: rhodecode/controllers/admin/repos.py:720
-#: rhodecode/controllers/admin/settings.py:362
+#: rhodecode/controllers/admin/repos.py:721
+#: rhodecode/controllers/admin/settings.py:363
 msgid "Removed issue tracker entry"
 msgstr "Se eliminó entrada en el seguidor de incidencias"
 
-#: rhodecode/controllers/admin/repos.py:750
-#: rhodecode/controllers/admin/settings.py:408
+#: rhodecode/controllers/admin/repos.py:751
+#: rhodecode/controllers/admin/settings.py:409
 msgid "Updated issue tracker entries"
 msgstr "Se actualizaron entradas en el seguidor de incidencias"
 
-#: rhodecode/controllers/admin/repos.py:809
-#: rhodecode/controllers/admin/settings.py:141
-#: rhodecode/controllers/admin/settings.py:718
+#: rhodecode/controllers/admin/repos.py:812
+#: rhodecode/controllers/admin/settings.py:142
+#: rhodecode/controllers/admin/settings.py:719
 msgid "Some form inputs contain invalid data."
 msgstr "Algunos campos de entrada contienen datos inválidos"
 
-#: rhodecode/controllers/admin/repos.py:827
+#: rhodecode/controllers/admin/repos.py:830
 msgid "Error occurred during updating repository VCS settings"
 msgstr "Error ocurrido al actualizar ajustes VCS del repositorio"
 
-#: rhodecode/controllers/admin/repos.py:831
-#: rhodecode/controllers/admin/settings.py:167
+#: rhodecode/controllers/admin/repos.py:834
+#: rhodecode/controllers/admin/settings.py:168
 msgid "Updated VCS settings"
 msgstr "Se actualizaron ajustes VCS"
 
-#: rhodecode/controllers/admin/settings.py:163
-#: rhodecode/controllers/admin/settings.py:266
+#: rhodecode/controllers/admin/settings.py:164
+#: rhodecode/controllers/admin/settings.py:267
 msgid "Error occurred during updating application settings"
 msgstr "Error ocurrido durante actualización de ajustes de aplicación"
 
-#: rhodecode/controllers/admin/settings.py:210
+#: rhodecode/controllers/admin/settings.py:211
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr "Repositorios reescaneados exitosamente agregados: %s ; eliminados: %s"
 
-#: rhodecode/controllers/admin/settings.py:262
+#: rhodecode/controllers/admin/settings.py:263
 msgid "Updated application settings"
 msgstr "Se actualizaron los ajustes de aplicación"
 
-#: rhodecode/controllers/admin/settings.py:326
+#: rhodecode/controllers/admin/settings.py:327
 msgid "Updated visualisation settings"
 msgstr "Se actualizaron los ajustes de visualización"
 
-#: rhodecode/controllers/admin/settings.py:329
+#: rhodecode/controllers/admin/settings.py:330
 msgid "Error occurred during updating visualisation settings"
 msgstr "Error ocurrido al actualizar ajustes de visualización"
 
-#: rhodecode/controllers/admin/settings.py:421
+#: rhodecode/controllers/admin/settings.py:422
 msgid "Please enter email address"
 msgstr "Por favor ingrese una dirección de correo electrónico"
 
-#: rhodecode/controllers/admin/settings.py:439
+#: rhodecode/controllers/admin/settings.py:440
 msgid "Send email task created"
 msgstr "Tarea de envío de correo electrónico creada"
 
-#: rhodecode/controllers/admin/settings.py:472
+#: rhodecode/controllers/admin/settings.py:473
 msgid "Added new hook"
 msgstr "Se agregó nuevo gancho"
 
-#: rhodecode/controllers/admin/settings.py:487
+#: rhodecode/controllers/admin/settings.py:488
 msgid "Updated hooks"
 msgstr "Se actualizaron ganchos"
 
-#: rhodecode/controllers/admin/settings.py:491
+#: rhodecode/controllers/admin/settings.py:492
 msgid "Error occurred during hook creation"
 msgstr "Error ocurrido durante creación de gancho"
 
-#: rhodecode/controllers/admin/settings.py:539
+#: rhodecode/controllers/admin/settings.py:540
 #, python-format
 msgid "Critical: your disk space is very low <b>%s%%</b> usedpercent"
 msgstr "Crítico: su espacio en disco está demasiado bajo <b>%s%%</b> usedpercent"
 
-#: rhodecode/controllers/admin/settings.py:543
+#: rhodecode/controllers/admin/settings.py:544
 #, python-format
 msgid "Warning: your disk space is running low <b>%s%%</b> usedpercent"
 msgstr "Advertencia: su espacio en disco está bajo <b>%s%%</b> usedpercent"
 
-#: rhodecode/controllers/admin/settings.py:739
+#: rhodecode/controllers/admin/settings.py:740
 msgid "Error occurred during updating labs settings"
 msgstr "Error ocurrido al actiualizar ajustes de laboratorios"
 
-#: rhodecode/controllers/admin/settings.py:744
+#: rhodecode/controllers/admin/settings.py:745
 msgid "Updated Labs settings"
 msgstr "Se Actualizaron Ajustes de Laboratorios"
 
-#: rhodecode/controllers/admin/settings.py:794
-msgid "Mercurial server-side merge"
-msgstr "Unión de lado de servidor Mercurial"
-
 #: rhodecode/controllers/admin/settings.py:795
-msgid ""
-"Use rebase instead of creating a merge commit when merging via web interface"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:801
 msgid "Subversion HTTP Support"
 msgstr "Soporte Subversion HTTP"
 
+#: rhodecode/controllers/admin/settings.py:796
+msgid "Proxy subversion HTTP requests"
+msgstr "Solicitudes por proxy HTTP subversion"
+
 #: rhodecode/controllers/admin/settings.py:802
-msgid "Proxy subversion HTTP requests"
-msgstr "Solicitudes por proxy HTTP subversion"
-
-#: rhodecode/controllers/admin/settings.py:808
 msgid "Subversion HTTP Server URL"
 msgstr "URL de Servidor HTTP Subversion"
 
-#: rhodecode/controllers/admin/settings.py:810
+#: rhodecode/controllers/admin/settings.py:804
 msgid "e.g. http://localhost:8080/"
 msgstr "p.e. http://localhost:8080/"
 
-#: rhodecode/controllers/admin/settings.py:845
-#: rhodecode/templates/admin/repos/repo_edit.html:48
-msgid "VCS"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:846
-msgid "Visual"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:847
-msgid "Remap and Rescan"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:849
-#: rhodecode/templates/admin/repos/repo_edit.html:54
-msgid "Issue Tracker"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:851
-#: rhodecode/templates/register.html:76
-#: 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:91
-#: rhodecode/templates/users/user_profile.html:51
-msgid "Email"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:852
-msgid "Hooks"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:853
-msgid "Full Text Search"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:855
-#: rhodecode/templates/admin/settings/settings_system.html:47
-msgid "System Info"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:857
-msgid "Open Source Licenses"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:875
-msgid "Labs"
-msgstr ""
-
 #: rhodecode/controllers/admin/user_groups.py:168
 #, python-format
 msgid "Created user group %(user_group_link)s"
@@ -1182,123 +1191,286 b' msgid "User Group global permissions upd'
 msgstr "Permisos globales para Grupo de Usuario actualizados exitosamente"
 
 #: rhodecode/controllers/admin/user_groups.py:440
-#: rhodecode/controllers/admin/users.py:566
+#: rhodecode/controllers/admin/users.py:561
 msgid "An error occurred during permissions saving"
 msgstr "Ocurrió un error al guardar permisos"
 
-#: rhodecode/controllers/admin/users.py:147
+#: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "Created user %(user_link)s"
 msgstr "Se creó usuario %(user_link)s"
 
-#: rhodecode/controllers/admin/users.py:162
+#: rhodecode/controllers/admin/users.py:157
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr "Error ocurrido durante creación de usuario %s"
 
-#: rhodecode/controllers/admin/users.py:206
+#: rhodecode/controllers/admin/users.py:201
 msgid "User updated successfully"
 msgstr "Usuario actualizado exitosamente"
 
+#: rhodecode/controllers/admin/users.py:252
+#, python-format
+msgid "Detached %s repositories"
+msgstr ""
+
 #: rhodecode/controllers/admin/users.py:257
 #, python-format
-msgid "Detached %s repositories"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:262
-#, python-format
 msgid "Deleted %s repositories"
 msgstr ""
 
+#: rhodecode/controllers/admin/users.py:265
+#, python-format
+msgid "Detached %s repository groups"
+msgstr ""
+
 #: rhodecode/controllers/admin/users.py:270
 #, python-format
-msgid "Detached %s repository groups"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:275
-#, python-format
 msgid "Deleted %s repository groups"
 msgstr "Se elminaron %s grupos de repositorio"
 
-#: rhodecode/controllers/admin/users.py:283
+#: rhodecode/controllers/admin/users.py:278
 #, python-format
 msgid "Detached %s user groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:288
+#: rhodecode/controllers/admin/users.py:283
 #, python-format
 msgid "Deleted %s user groups"
 msgstr "Se eliminaron %s grupos de usuario"
 
-#: rhodecode/controllers/admin/users.py:299
+#: rhodecode/controllers/admin/users.py:294
 msgid "Successfully deleted user"
 msgstr "Se eliminó usuario exitosamente"
 
-#: rhodecode/controllers/admin/users.py:305
+#: rhodecode/controllers/admin/users.py:300
 msgid "An error occurred during deletion of user"
 msgstr "Ocurrió un error durante eliminación de usuario"
 
-#: rhodecode/controllers/admin/users.py:324
+#: rhodecode/controllers/admin/users.py:319
 msgid "Force password change disabled for user"
 msgstr "Forzar cambio de contraseña deshabilitado para usuario"
 
-#: rhodecode/controllers/admin/users.py:326
+#: rhodecode/controllers/admin/users.py:321
 msgid "Force password change enabled for user"
 msgstr "Forzar cambio de contraseña habilitado para usuario"
 
-#: rhodecode/controllers/admin/users.py:330
+#: rhodecode/controllers/admin/users.py:325
 msgid "An error occurred during password reset for user"
 msgstr "Ocurrió un error durante reinicio de contraseña para usuario"
 
-#: rhodecode/controllers/admin/users.py:356
+#: rhodecode/controllers/admin/users.py:351
 #, python-format
 msgid "Created repository group `%s`"
 msgstr "Se creó grupo de repositorio `%s`"
 
-#: rhodecode/controllers/admin/users.py:360
+#: rhodecode/controllers/admin/users.py:355
 msgid "An error occurred during repository group creation for user"
 msgstr "Ocurrió un error durante creación de grupo de repositorio para usuario"
 
-#: rhodecode/controllers/admin/users.py:379
-#: rhodecode/controllers/admin/users.py:400
-#: rhodecode/controllers/admin/users.py:430
-#: rhodecode/controllers/admin/users.py:461
-#: rhodecode/controllers/admin/users.py:478
-#: rhodecode/controllers/admin/users.py:501
-#: rhodecode/controllers/admin/users.py:575
-#: rhodecode/controllers/admin/users.py:588
-#: rhodecode/controllers/admin/users.py:646
+#: 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
 msgid "You can't edit this user"
 msgstr "Usted no puede editar este usuario"
 
-#: rhodecode/controllers/admin/users.py:414
+#: rhodecode/controllers/admin/users.py:409
 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:550
+#: rhodecode/controllers/admin/users.py:545
 msgid "User global permissions updated successfully"
 msgstr "Permisos globales de usario actualizados exitosamente"
 
-#: rhodecode/controllers/admin/users.py:678
+#: rhodecode/controllers/admin/users.py:673
 #, python-format
 msgid "An error occurred during ip saving:%s"
 msgstr "Ocurrió un error al guardar ip:%s"
 
-#: rhodecode/controllers/admin/users.py:693
+#: rhodecode/controllers/admin/users.py:688
 msgid "An error occurred during ip saving"
 msgstr "Ocurrió un error al guardar ip"
 
-#: rhodecode/controllers/admin/users.py:697
+#: rhodecode/controllers/admin/users.py:692
 #, python-format
 msgid "Added ips %s to user whitelist"
 msgstr "Se agregaron ips %s a la lista blanca de usuario"
 
-#: rhodecode/controllers/admin/users.py:715
+#: rhodecode/controllers/admin/users.py:710
 msgid "Removed ip address from user whitelist"
 msgstr "Se eliminó dirección ip de lista blanca de usuario"
 
+#: rhodecode/events/pullrequest.py:65
+msgid "pullrequest created"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:74
+msgid "pullrequest closed"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:83
+msgid "pullrequest commits updated"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:92
+msgid "pullrequest review changed"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:101
+msgid "pullrequest merged"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:110
+msgid "pullrequest commented"
+msgstr ""
+
+#: rhodecode/events/repo.py:135
+msgid "repository pre create"
+msgstr ""
+
+#: rhodecode/events/repo.py:144
+msgid "repository created"
+msgstr ""
+
+#: rhodecode/events/repo.py:153
+msgid "repository pre delete"
+msgstr ""
+
+#: rhodecode/events/repo.py:162
+msgid "repository deleted"
+msgstr ""
+
+#: rhodecode/events/repo.py:193
+msgid "repository pre pull"
+msgstr ""
+
+#: rhodecode/events/repo.py:202
+msgid "repository pull"
+msgstr ""
+
+#: rhodecode/events/repo.py:211
+msgid "repository pre push"
+msgstr ""
+
+#: rhodecode/events/repo.py:222
+msgid "repository push"
+msgstr ""
+
+#: rhodecode/events/user.py:34
+msgid "user registered"
+msgstr ""
+
+#: rhodecode/events/user.py:48
+msgid "user pre create"
+msgstr ""
+
+#: rhodecode/events/user.py:61
+msgid "user pre update"
+msgstr ""
+
+#: rhodecode/integrations/schema.py:35
+msgid "Enable or disable this integration."
+msgstr ""
+
+#: rhodecode/integrations/schema.py:42
+msgid "Short name for this integration."
+msgstr ""
+
+#: rhodecode/integrations/schema.py:44
+msgid "Integration name"
+msgstr ""
+
+#: rhodecode/integrations/views.py:172
+msgid "Integration {integration_name} deleted successfully."
+msgstr ""
+
+#: rhodecode/integrations/views.py:200
+msgid ""
+"Errors exist when saving integration settings. Please check the form inputs."
+msgstr ""
+
+#: rhodecode/integrations/views.py:220
+msgid "Integration {integration_name} updated successfully."
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:45
+msgid "Slack service URL"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:46
+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:59 rhodecode/templates/login.html:43
+#: rhodecode/templates/register.html:41
+#: 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/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/debug_style/login.html:36
+#: rhodecode/templates/email_templates/user_registration.mako:23
+#: rhodecode/templates/users/user_profile.html:27
+msgid "Username"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:60
+msgid "Username to show notifications coming from."
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:69
+msgid "Channel"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:70
+msgid "Channel to send notifications to."
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:79
+msgid "Emoji"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:80
+msgid "Emoji to use eg. :studio_microphone:"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:107
+msgid "Slack"
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:41
+msgid "Webhook URL"
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:42
+msgid "URL of the webhook to receive POST event."
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:51
+msgid "Secret Token"
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:52
+msgid "String used to validate received payloads."
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:62
+msgid "Webhook"
+msgstr ""
+
 #: rhodecode/lib/action_parser.py:89
 msgid "[deleted] repository"
 msgstr "[deleted] repositorio"
@@ -1440,11 +1612,15 b' msgstr "Acci\xc3\xb3n no soportada para %s"'
 msgid "You need to be signed in to view this page"
 msgstr "Usted necesita estar en sesión para ver esta página"
 
-#: rhodecode/lib/base.py:511
+#: rhodecode/lib/base.py:545
 #, python-format
 msgid "The repository at %(repo_name)s cannot be located."
 msgstr ""
 
+#: rhodecode/lib/diffs.py:56
+msgid "Click to comment"
+msgstr ""
+
 #: rhodecode/lib/diffs.py:71
 msgid "Binary file"
 msgstr ""
@@ -1458,36 +1634,40 b' msgstr ""'
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1434
+#: rhodecode/lib/diffs.py:631
+msgid "Click to select line"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1481
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1438
+#: rhodecode/lib/helpers.py:1485
 msgid "No Files"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1511
+#: rhodecode/lib/helpers.py:1558
 msgid "new file"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1514
+#: rhodecode/lib/helpers.py:1561
 msgid "mod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1517
+#: rhodecode/lib/helpers.py:1564
 msgid "del"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1520
+#: rhodecode/lib/helpers.py:1567
 msgid "rename"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1525
+#: rhodecode/lib/helpers.py:1572
 msgid "chmod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1767
+#: rhodecode/lib/helpers.py:1819
 msgid ""
 "Example filter terms:\n"
 "     repository:vcs\n"
@@ -1506,91 +1686,93 b' msgid ""'
 "     \"username:test AND repository:test*\"\n"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1787
+#: rhodecode/lib/helpers.py:1839
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from the"
 " filesystem please run the application again in order to rescan repositories"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:453
+#: rhodecode/lib/utils2.py:454
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:454
+#: rhodecode/lib/utils2.py:455
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:455
+#: rhodecode/lib/utils2.py:456
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:456
+#: rhodecode/lib/utils2.py:457
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:457
+#: rhodecode/lib/utils2.py:458
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:458
+#: rhodecode/lib/utils2.py:459
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:476
+#: rhodecode/lib/utils2.py:477
 #, python-format
 msgid "in %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:482
+#: rhodecode/lib/utils2.py:483
 #, python-format
 msgid "%s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:492
+#: rhodecode/lib/utils2.py:493
 #, python-format
 msgid "%s, %s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:494
+#: rhodecode/lib/utils2.py:495
 #, python-format
 msgid "in %s, %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:496
+#: rhodecode/lib/utils2.py:497
 #, python-format
 msgid "%s and %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:498
+#: rhodecode/lib/utils2.py:499
 #, python-format
 msgid "%s and %s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:500
+#: rhodecode/lib/utils2.py:501
 #, python-format
 msgid "in %s and %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:504
+#: rhodecode/lib/utils2.py:505 rhodecode/public/js/scripts.js:25035
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174
 msgid "just now"
 msgstr ""
 
@@ -1616,7 +1798,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 rhodecode/model/db.py:2291
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293
+#: rhodecode/model/db.py:2285
 msgid "Repository no access"
 msgstr ""
 
@@ -1642,7 +1826,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 rhodecode/model/db.py:2292
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294
+#: rhodecode/model/db.py:2286
 msgid "Repository read access"
 msgstr ""
 
@@ -1668,7 +1854,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 rhodecode/model/db.py:2293
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295
+#: rhodecode/model/db.py:2287
 msgid "Repository write access"
 msgstr ""
 
@@ -1694,7 +1882,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 rhodecode/model/db.py:2294
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296
+#: rhodecode/model/db.py:2288
 msgid "Repository admin access"
 msgstr ""
 
@@ -1760,7 +1950,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 rhodecode/model/db.py:2312
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314
+#: rhodecode/model/db.py:2306
 msgid "Repository creation disabled"
 msgstr ""
 
@@ -1786,7 +1978,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 rhodecode/model/db.py:2313
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315
+#: rhodecode/model/db.py:2307
 msgid "Repository creation enabled"
 msgstr ""
 
@@ -1812,7 +2006,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 rhodecode/model/db.py:2317
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319
+#: rhodecode/model/db.py:2311
 msgid "Repository forking disabled"
 msgstr ""
 
@@ -1838,7 +2034,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 rhodecode/model/db.py:2318
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320
+#: rhodecode/model/db.py:2312
 msgid "Repository forking enabled"
 msgstr ""
 
@@ -1886,7 +2084,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343
-#: rhodecode/model/db.py:2950
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952
+#: rhodecode/model/db.py:2944
 msgid "Not Reviewed"
 msgstr ""
 
@@ -1913,7 +2112,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344
-#: rhodecode/model/db.py:2951
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953
+#: rhodecode/model/db.py:2945
 msgid "Approved"
 msgstr ""
 
@@ -1940,7 +2140,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345
-#: rhodecode/model/db.py:2952
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954
+#: rhodecode/model/db.py:2946
 msgid "Rejected"
 msgstr ""
 
@@ -1967,7 +2168,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346
-#: rhodecode/model/db.py:2953
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955
+#: rhodecode/model/db.py:2947
 msgid "Under Review"
 msgstr ""
 
@@ -1990,7 +2192,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 rhodecode/model/db.py:2296
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298
+#: rhodecode/model/db.py:2290
 msgid "Repository group no access"
 msgstr ""
 
@@ -2013,7 +2217,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 rhodecode/model/db.py:2297
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299
+#: rhodecode/model/db.py:2291
 msgid "Repository group read access"
 msgstr ""
 
@@ -2036,7 +2242,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 rhodecode/model/db.py:2298
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300
+#: rhodecode/model/db.py:2292
 msgid "Repository group write access"
 msgstr ""
 
@@ -2059,7 +2267,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 rhodecode/model/db.py:2299
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301
+#: rhodecode/model/db.py:2293
 msgid "Repository group admin access"
 msgstr ""
 
@@ -2081,7 +2291,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 rhodecode/model/db.py:2301
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303
+#: rhodecode/model/db.py:2295
 msgid "User group no access"
 msgstr ""
 
@@ -2103,7 +2315,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 rhodecode/model/db.py:2302
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304
+#: rhodecode/model/db.py:2296
 msgid "User group read access"
 msgstr ""
 
@@ -2125,7 +2339,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 rhodecode/model/db.py:2303
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305
+#: rhodecode/model/db.py:2297
 msgid "User group write access"
 msgstr ""
 
@@ -2147,7 +2363,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 rhodecode/model/db.py:2304
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306
+#: rhodecode/model/db.py:2298
 msgid "User group admin access"
 msgstr ""
 
@@ -2169,7 +2387,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 rhodecode/model/db.py:2306
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308
+#: rhodecode/model/db.py:2300
 msgid "Repository Group creation disabled"
 msgstr ""
 
@@ -2191,7 +2411,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 rhodecode/model/db.py:2307
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309
+#: rhodecode/model/db.py:2301
 msgid "Repository Group creation enabled"
 msgstr ""
 
@@ -2213,7 +2435,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 rhodecode/model/db.py:2309
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311
+#: rhodecode/model/db.py:2303
 msgid "User Group creation disabled"
 msgstr ""
 
@@ -2235,7 +2459,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 rhodecode/model/db.py:2310
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312
+#: rhodecode/model/db.py:2304
 msgid "User Group creation enabled"
 msgstr ""
 
@@ -2258,7 +2484,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000
-#: rhodecode/model/db.py:2320
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322
+#: rhodecode/model/db.py:2314
 msgid "Registration disabled"
 msgstr ""
 
@@ -2281,7 +2508,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001
-#: rhodecode/model/db.py:2321
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323
+#: rhodecode/model/db.py:2315
 msgid "User Registration with manual account activation"
 msgstr ""
 
@@ -2304,7 +2532,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002
-#: rhodecode/model/db.py:2322
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324
+#: rhodecode/model/db.py:2316
 msgid "User Registration with automatic account activation"
 msgstr ""
 
@@ -2327,7 +2556,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004
-#: rhodecode/model/db.py:2324
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326
+#: rhodecode/model/db.py:2318
 msgid "Manual activation of external account"
 msgstr ""
 
@@ -2350,7 +2580,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005
-#: rhodecode/model/db.py:2325
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327
+#: rhodecode/model/db.py:2319
 msgid "Automatic activation of external account"
 msgstr ""
 
@@ -2366,7 +2597,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 rhodecode/model/db.py:2314
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316
+#: rhodecode/model/db.py:2308
 msgid ""
 "Repository creation enabled with write permission to a repository group"
 msgstr ""
@@ -2383,7 +2616,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 rhodecode/model/db.py:2315
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317
+#: rhodecode/model/db.py:2309
 msgid ""
 "Repository creation disabled with write permission to a repository group"
 msgstr ""
@@ -2397,7 +2632,9 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 rhodecode/model/db.py:2289
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291
+#: rhodecode/model/db.py:2283
 msgid "RhodeCode Super Administrator"
 msgstr ""
 
@@ -2409,7 +2646,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007
-#: rhodecode/model/db.py:2327
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329
+#: rhodecode/model/db.py:2321
 msgid "Inherit object permissions from default user disabled"
 msgstr ""
 
@@ -2421,10 +2659,36 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008
-#: rhodecode/model/db.py:2328
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330
+#: rhodecode/model/db.py:2322
 msgid "Inherit object permissions from default user enabled"
 msgstr ""
 
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 rhodecode/model/db.py:910
+msgid "all"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 rhodecode/model/db.py:911
+msgid "http/web interface"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 rhodecode/model/db.py:912
+msgid "vcs (git/hg/svn protocol)"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 rhodecode/model/db.py:913
+msgid "api calls"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 rhodecode/model/db.py:914
+msgid "feed access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069
+#: rhodecode/model/db.py:2061
+msgid "No parent"
+msgstr ""
+
 #: rhodecode/lib/index/whoosh.py:148
 msgid "Invalid search query. Try quoting it."
 msgstr "Consulta de búsqueda inválidad. Intente agregar comillas."
@@ -2469,50 +2733,34 b' msgstr "Se ha registrado exitosamente co'
 msgid "Your password reset link was sent"
 msgstr "Su liga de reinicio de contraseña fue enviada"
 
-#: rhodecode/login/views.py:333
+#: rhodecode/login/views.py:336
 msgid ""
 "Your password reset was successful, a new password has been sent to your "
 "email"
 msgstr "Su reinicio de contraseña fue exitoso, una nueva contraseña ha sido enviada a su correo electrónico"
 
-#: rhodecode/model/db.py:909
-msgid "all"
-msgstr ""
-
-#: rhodecode/model/db.py:910
-msgid "http/web interface"
-msgstr ""
-
-#: rhodecode/model/db.py:911
-msgid "vcs (git/hg protocol)"
-msgstr ""
-
-#: rhodecode/model/db.py:912
-msgid "api calls"
-msgstr ""
-
-#: rhodecode/model/db.py:913
-msgid "feed access"
-msgstr ""
-
-#: rhodecode/model/db.py:2067
-msgid "No parent"
-msgstr ""
-
-#: rhodecode/model/forms.py:66
+#: rhodecode/model/comment.py:263
+msgid "made a comment"
+msgstr ""
+
+#: rhodecode/model/comment.py:264
+msgid "Refresh page"
+msgstr ""
+
+#: rhodecode/model/forms.py:85
 msgid "Please enter a login"
 msgstr ""
 
-#: rhodecode/model/forms.py:67
+#: rhodecode/model/forms.py:86
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
-#: rhodecode/model/forms.py:76
+#: rhodecode/model/forms.py:95
 msgid "Please enter a password"
 msgstr ""
 
-#: rhodecode/model/forms.py:77
+#: rhodecode/model/forms.py:96
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
@@ -2627,43 +2875,43 b' msgid ""'
 " %(pr_title)s"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:448
+#: rhodecode/model/pull_request.py:449
 msgid "Pull request merged and closed"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:867
+#: rhodecode/model/pull_request.py:874
 msgid "Server-side pull request merging is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:869
+#: rhodecode/model/pull_request.py:876
 msgid "This pull request is closed."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:880
+#: rhodecode/model/pull_request.py:887
 msgid "Pull request merging is not supported."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:898
+#: rhodecode/model/pull_request.py:905
 msgid "Target repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:901
+#: rhodecode/model/pull_request.py:908
 msgid "Source repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1050 rhodecode/model/scm.py:791
+#: rhodecode/model/pull_request.py:1058 rhodecode/model/scm.py:788
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1055
+#: rhodecode/model/pull_request.py:1063
 msgid "Commit IDs"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1058
+#: rhodecode/model/pull_request.py:1066
 msgid "Closed Branches"
 msgstr ""
 
-#: rhodecode/model/scm.py:773
+#: rhodecode/model/scm.py:770
 msgid "latest tip"
 msgstr ""
 
@@ -2879,6 +3127,7 b' msgid "Revisions %(revs)s are already pa'
 msgstr ""
 
 #: rhodecode/model/validators.py:933
+#: rhodecode/model/validation_schema/validators.py:14
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
@@ -2893,31 +3142,391 b' msgid "Key name can only consist of lett'
 msgstr ""
 
 #: rhodecode/model/validators.py:976
-msgid "Filename cannot be inside a directory"
-msgstr ""
-
-#: rhodecode/model/validators.py:992
 #, python-format
 msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
 msgstr ""
 
-#: rhodecode/model/validators.py:995
+#: rhodecode/model/validators.py:979
 #, python-format
 msgid "The plugin \"%(plugin_id)s\" is missing an includeme function."
 msgstr ""
 
-#: rhodecode/model/validators.py:998
+#: rhodecode/model/validators.py:982
 #, python-format
 msgid "Can not load plugin \"%(plugin_id)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:1000
+#: rhodecode/model/validators.py:984
 #, python-format
 msgid "No plugin available with ID \"%(plugin_id)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:1067
-msgid "This gistid is already in use"
+#: rhodecode/model/validation_schema/schemas/gist_schema.py:89
+msgid "Gist with name {} already exists"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/gist_schema.py:95
+msgid "Filename {} cannot be inside a directory"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/gist_schema.py:132
+msgid "Duplicated value for filename found: `{}`"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:23039
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
+#: 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/src/rhodecode/comments.js:235
+msgid "Add another comment"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41526
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
+#: rhodecode/public/js/src/rhodecode/comments.js:453
+msgid "Status Review"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41540
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:3
+#: rhodecode/public/js/src/rhodecode/comments.js:467
+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/src/rhodecode/comments.js:580
+msgid "Submitting..."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41703
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
+#: rhodecode/public/js/src/rhodecode/comments.js:630
+#: rhodecode/templates/files/files_browser_tree.html:47
+msgid "Loading ..."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41903
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
+#: 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/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/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/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/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/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/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/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/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/src/rhodecode.js:162
+msgid "Show more"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
+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."
+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."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
+msgid "No tags available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18
+msgid "No user groups available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19
+msgid "No users available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
+#: rhodecode/templates/changelog/changelog.html:62
+msgid "Open new pull request"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22
+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
+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"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
+msgid "files"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
+msgid "specify commit"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
+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} years"
 msgstr ""
 
 #: rhodecode/templates/index.html:5
@@ -2978,7 +3587,7 b' msgstr ""'
 #: rhodecode/templates/base/perms_summary.html:102
 #: rhodecode/templates/bookmarks/bookmarks.html:59
 #: rhodecode/templates/branches/branches.html:58
-#: rhodecode/templates/files/files_browser.html:49
+#: rhodecode/templates/files/files_browser_tree.html:5
 #: rhodecode/templates/pullrequests/pullrequests.html:100
 #: rhodecode/templates/tags/tags.html:59
 msgid "Name"
@@ -2987,6 +3596,7 b' msgstr ""'
 #: rhodecode/templates/index_base.html:100
 #: rhodecode/templates/index_base.html:125
 #: rhodecode/templates/admin/gists/index.html:114
+#: rhodecode/templates/admin/integrations/list.html:63
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:77
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:45
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42
@@ -3002,8 +3612,9 b' msgstr ""'
 #: rhodecode/templates/base/issue_tracker_settings.html:10
 #: rhodecode/templates/changeset/changeset.html:53
 #: rhodecode/templates/compare/compare_commits.html:24
+#: rhodecode/templates/email_templates/commit_comment.mako:82
 #: rhodecode/templates/email_templates/pull_request_review.mako:30
-#: rhodecode/templates/email_templates/pull_request_review.mako:67
+#: rhodecode/templates/email_templates/pull_request_review.mako:51
 #: rhodecode/templates/files/file_tree_detail.html:5
 #: rhodecode/templates/files/file_tree_detail.html:12
 #: rhodecode/templates/forks/fork.html:48
@@ -3041,12 +3652,12 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:63
 #: rhodecode/templates/bookmarks/bookmarks.html:66
 #: rhodecode/templates/branches/branches.html:65
-#: rhodecode/templates/changelog/changelog.html:106
-#: rhodecode/templates/changelog/changelog_summary_data.html:6
+#: 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/email_templates/commit_comment.mako:16
 #: rhodecode/templates/email_templates/commit_comment.mako:45
+#: rhodecode/templates/email_templates/commit_comment.mako:81
 #: rhodecode/templates/search/search_commit.html:6
 #: rhodecode/templates/tags/tags.html:66
 msgid "Commit"
@@ -3062,7 +3673,7 b' msgid "Home"'
 msgstr ""
 
 #: rhodecode/templates/login.html:5 rhodecode/templates/login.html:35
-#: rhodecode/templates/login.html:64 rhodecode/templates/base/base.html:328
+#: rhodecode/templates/login.html:64 rhodecode/templates/base/base.html:329
 #: rhodecode/templates/debug_style/login.html:60
 msgid "Sign In"
 msgstr ""
@@ -3071,20 +3682,6 b' msgstr ""'
 msgid "Go to the registration page to create a new account."
 msgstr ""
 
-#: rhodecode/templates/login.html:43 rhodecode/templates/register.html:41
-#: rhodecode/templates/admin/admin_log.html:5
-#: 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/users/user_add.html:35
-#: rhodecode/templates/admin/users/user_edit_profile.html:39
-#: rhodecode/templates/admin/users/users.html:89
-#: rhodecode/templates/base/base.html:305
-#: rhodecode/templates/debug_style/login.html:36
-#: rhodecode/templates/users/user_profile.html:27
-msgid "Username"
-msgstr ""
-
 #: rhodecode/templates/login.html:58
 msgid "Remember me"
 msgstr ""
@@ -3120,7 +3717,7 b' msgid "Send password reset email"'
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:60
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr ""
 
 #: rhodecode/templates/register.html:35
@@ -3141,7 +3738,7 b' msgstr ""'
 #: 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:93
+#: rhodecode/templates/admin/users/users.html:92
 msgid "First Name"
 msgstr ""
 
@@ -3151,7 +3748,7 b' msgstr ""'
 #: 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:95
+#: rhodecode/templates/admin/users/users.html:94
 msgid "Last Name"
 msgstr ""
 
@@ -3165,7 +3762,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:15
-#: rhodecode/templates/base/base.html:78
+#: rhodecode/templates/base/base.html:77
 msgid "Admin journal"
 msgstr ""
 
@@ -3190,17 +3787,17 b' msgstr[1] ""'
 msgid "Example Queries"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:6
+#: rhodecode/templates/admin/admin_log.html:8
 #: rhodecode/templates/admin/my_account/my_account_repos.html:37
 #: 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_groups.html:66
-#: rhodecode/templates/admin/users/users.html:106
+#: rhodecode/templates/admin/users/users.html:105
 msgid "Action"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:7
+#: rhodecode/templates/admin/admin_log.html:9
 #: rhodecode/templates/admin/defaults/defaults.html:31
 #: rhodecode/templates/admin/permissions/permissions_objects.html:13
 #: rhodecode/templates/search/search_commit.html:5
@@ -3208,18 +3805,18 b' msgstr ""'
 msgid "Repository"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:8
+#: rhodecode/templates/admin/admin_log.html:10
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:60
 #: rhodecode/templates/tags/tags.html:61
 msgid "Date"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:9
+#: rhodecode/templates/admin/admin_log.html:11
 msgid "From IP"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:44
+#: rhodecode/templates/admin/admin_log.html:46
 msgid "No actions yet"
 msgstr ""
 
@@ -3231,6 +3828,9 b' 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:19
+#: rhodecode/templates/admin/integrations/edit.html:15
+#: rhodecode/templates/admin/integrations/list.html:8
 #: 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
@@ -3248,9 +3848,9 b' msgstr ""'
 #: 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:102
-#: rhodecode/templates/base/base.html:405
-#: rhodecode/templates/base/base.html:412
+#: rhodecode/templates/admin/users/users.html:101
+#: rhodecode/templates/base/base.html:406
+#: rhodecode/templates/base/base.html:413
 msgid "Admin"
 msgstr ""
 
@@ -3277,14 +3877,6 b' msgstr ""'
 msgid "Available Built-in Plugins"
 msgstr ""
 
-#: rhodecode/templates/admin/auth/auth_settings.html:71
-msgid "enabled"
-msgstr ""
-
-#: rhodecode/templates/admin/auth/auth_settings.html:71
-msgid "disabled"
-msgstr ""
-
 #: rhodecode/templates/admin/auth/auth_settings.html:81
 #: rhodecode/templates/admin/auth/plugin_settings.html:87
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:63
@@ -3325,6 +3917,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:14
 #: rhodecode/templates/admin/gists/index.html:110
+#: rhodecode/templates/admin/integrations/list.html:64
 #: rhodecode/templates/admin/repos/repo_add_base.html:62
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:12
 msgid "Type"
@@ -3397,18 +3990,18 b' msgstr ""'
 msgid "Gist access level"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.html:59
+#: rhodecode/templates/admin/gists/edit.html:62
 #: 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:103
+#: rhodecode/templates/admin/gists/edit.html:107
 msgid "Update Gist"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.html:104
+#: rhodecode/templates/admin/gists/edit.html:108
 #: rhodecode/templates/base/issue_tracker_settings.html:74
 #: rhodecode/templates/changeset/changeset_file_comment.html:139
 #: rhodecode/templates/files/files_add.html:102
@@ -3469,14 +4062,14 b' 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:87
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:89
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:62
-#: rhodecode/templates/changelog/changelog.html:102
-#: rhodecode/templates/changelog/changelog_summary_data.html:10
+#: 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/files/files_browser.html:53
+#: rhodecode/templates/files/files_browser_tree.html:9
 #: rhodecode/templates/pullrequests/pullrequest_show.html:169
 #: rhodecode/templates/pullrequests/pullrequests.html:102
 #: rhodecode/templates/search/search_commit.html:16
@@ -3559,9 +4152,10 b' msgid "Gist"'
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:49
+#: rhodecode/templates/admin/integrations/list.html:110
 #: 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:61
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:63
 #: 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
@@ -3573,10 +4167,10 b' msgstr ""'
 #: rhodecode/templates/base/vcs_settings.html:172
 #: rhodecode/templates/changeset/changeset_file_comment.html:49
 #: rhodecode/templates/changeset/changeset_file_comment.html:99
-#: rhodecode/templates/data_table/_dt_elements.html:117
-#: rhodecode/templates/data_table/_dt_elements.html:174
-#: rhodecode/templates/data_table/_dt_elements.html:188
-#: rhodecode/templates/data_table/_dt_elements.html:200
+#: 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/debug_style/buttons.html:132
 #: rhodecode/templates/files/files_source.html:33
 #: rhodecode/templates/files/files_source.html:37
@@ -3589,14 +4183,15 b' msgid "Confirm to delete this Gist"'
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:56
+#: rhodecode/templates/admin/integrations/list.html:103
 #: 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:112
-#: rhodecode/templates/data_table/_dt_elements.html:170
-#: rhodecode/templates/data_table/_dt_elements.html:183
-#: rhodecode/templates/data_table/_dt_elements.html:196
+#: 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/debug_style/buttons.html:128
 #: rhodecode/templates/files/files_add.html:204
 #: rhodecode/templates/files/files_edit.html:165
@@ -3626,8 +4221,45 b' msgstr ""'
 msgid "Show as raw"
 msgstr ""
 
+#: rhodecode/templates/admin/integrations/base.html:12
+msgid "Integrations settings"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/edit.html:17
+#: rhodecode/templates/admin/integrations/list.html:10
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44
+#: rhodecode/templates/admin/repos/repo_edit.html:15
+#: 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
+msgid "Settings"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/edit.html:36
+#, python-format
+msgid "Create new %(integration_type)s integration"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:31
+msgid "Create new integration"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:56
+msgid "Current integrations"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:65
+msgid "Actions"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:89
+msgid "unknown integration"
+msgstr ""
+
 #: rhodecode/templates/admin/my_account/my_account.html:5
-#: rhodecode/templates/base/base.html:342
+#: rhodecode/templates/base/base.html:343
 msgid "My account"
 msgstr ""
 
@@ -3663,7 +4295,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/my_account/my_account.html:40
 #: rhodecode/templates/admin/notifications/notifications.html:33
-#: rhodecode/templates/base/base.html:242
+#: rhodecode/templates/base/base.html:243
 msgid "Pull Requests"
 msgstr ""
 
@@ -3671,6 +4303,10 b' msgstr ""'
 msgid "My Permissions"
 msgstr ""
 
+#: rhodecode/templates/admin/my_account/my_account.html:42
+msgid "My Live Notifications"
+msgstr ""
+
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:3
 msgid "Authentication Tokens"
 msgstr ""
@@ -3682,7 +4318,7 b' msgstr ""'
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:8
 msgid ""
 "Each token can have a role. VCS tokens can be used together with the "
-"authtoken auth plugin for git/hg operations."
+"authtoken auth plugin for git/hg/svn operations."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:14
@@ -3759,6 +4395,19 b' msgstr ""'
 msgid "New email address"
 msgstr ""
 
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:3
+msgid "Your live notification settings"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:14
+#: rhodecode/templates/admin/notifications/show_notification.html:12
+msgid "Notifications"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:14
+msgid "Disabled"
+msgstr ""
+
 #: rhodecode/templates/admin/my_account/my_account_password.html:3
 msgid "Change Your Account Password"
 msgstr ""
@@ -3815,35 +4464,35 b' 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:86
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:88
 msgid "Target Repo"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:26
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:89
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:91
 #: rhodecode/templates/admin/settings/settings_global.html:9
 #: rhodecode/templates/email_templates/pull_request_review.mako:28
-#: rhodecode/templates/email_templates/pull_request_review.mako:65
+#: rhodecode/templates/email_templates/pull_request_review.mako:48
 #: rhodecode/templates/pullrequests/pullrequest.html:38
 #: rhodecode/templates/pullrequests/pullrequests.html:104
 msgid "Title"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:27
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:90
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:92
 msgid "Opened On"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:41
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:103
-#: rhodecode/templates/changelog/changelog.html:141
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:43
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:107
+#: 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:50
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:112
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:52
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:116
 #: rhodecode/templates/changeset/changeset_file_comment.html:284
 #: rhodecode/templates/pullrequests/pullrequest_show.html:14
 #: rhodecode/templates/pullrequests/pullrequest_show.html:112
@@ -3851,19 +4500,19 b' msgstr ""'
 msgid "Closed"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:62
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:64
 msgid "Confirm to delete this pull request"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:69
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:71
 msgid "You currently have no open pull requests."
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:77
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:79
 msgid "Pull Requests You Participate In"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:125
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:129
 msgid ""
 "There are currently no open pull requests requiring your participation."
 msgstr ""
@@ -3904,19 +4553,15 b' msgstr ""'
 msgid "Show notification"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/show_notification.html:12
-msgid "Notifications"
-msgstr ""
-
 #: rhodecode/templates/admin/permissions/permissions.html:5
 msgid "Permissions Administration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:14
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:45
-#: rhodecode/templates/admin/repos/repo_edit.html:42
+#: rhodecode/templates/admin/repos/repo_edit.html:46
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:34
-#: rhodecode/templates/base/base.html:83
+#: rhodecode/templates/base/base.html:82
 msgid "Permissions"
 msgstr ""
 
@@ -4062,8 +4707,8 b' 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:80
-#: rhodecode/templates/base/base.html:152
+#: rhodecode/templates/base/base.html:79
+#: rhodecode/templates/base/base.html:153
 msgid "Repository groups"
 msgstr ""
 
@@ -4094,18 +4739,8 b' msgstr ""'
 msgid "Add Child Group"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44
-#: rhodecode/templates/admin/repos/repo_edit.html:15
-#: rhodecode/templates/admin/repos/repo_edit.html:39
-#: 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:250
-msgid "Settings"
-msgstr ""
-
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:46
-#: rhodecode/templates/admin/repos/repo_edit.html:45
+#: rhodecode/templates/admin/repos/repo_edit.html:49
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:35
 #: rhodecode/templates/admin/users/user_edit.html:35
 msgid "Advanced"
@@ -4283,7 +4918,7 b' msgid "Import Existing Repository ?"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:23
-#: rhodecode/templates/base/base.html:197
+#: rhodecode/templates/base/base.html:198
 msgid "Clone from"
 msgstr ""
 
@@ -4355,19 +4990,19 b' msgstr ""'
 msgid "%s repository settings"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:51
+#: rhodecode/templates/admin/repos/repo_edit.html:55
 msgid "Extra Fields"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:57
-msgid "Caches"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:61
-msgid "Remote"
+msgid "Caches"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:65
+msgid "Remote"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:69
 #: rhodecode/templates/summary/components.html:135
 msgid "Statistics"
 msgstr ""
@@ -4474,7 +5109,7 b' msgid "Delete forks"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:139
-#: rhodecode/templates/data_table/_dt_elements.html:118
+#: rhodecode/templates/data_table/_dt_elements.html:120
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
@@ -4541,7 +5176,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:100
+#: rhodecode/templates/admin/users/users.html:99
 msgid "Active"
 msgstr ""
 
@@ -4701,7 +5336,7 b' msgid ""'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.html:56
-#: rhodecode/templates/data_table/_dt_elements.html:158
+#: rhodecode/templates/data_table/_dt_elements.html:160
 #: rhodecode/templates/forks/fork.html:58
 msgid "Repository group"
 msgstr ""
@@ -4956,12 +5591,11 b' msgid "Server Announcement"'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:80
-msgid "Custom js/css code added at the end of the <header> tag."
+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:103
-msgid "Use <script> or <css> tags to define custom styling or scripting"
+msgid "Use <script/> or <css/> tags to define custom styling or scripting"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:88
@@ -4972,6 +5606,10 b' msgstr ""'
 msgid "Custom js/css code added at the end of the <body> tag."
 msgstr ""
 
+#: rhodecode/templates/admin/settings/settings_global.html:103
+msgid "Use <script> or <css> tags to define custom styling or scripting"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings_hooks.html:3
 msgid "Built in Mercurial hooks - read only"
 msgstr ""
@@ -5364,8 +6002,8 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:82
-#: rhodecode/templates/base/base.html:155
+#: rhodecode/templates/base/base.html:81
+#: rhodecode/templates/base/base.html:156
 msgid "User groups"
 msgstr ""
 
@@ -5457,8 +6095,8 b' msgid "Change owner of this user group."'
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:59
-#: rhodecode/templates/base/base.html:257
-#: rhodecode/templates/base/base.html:399
+#: rhodecode/templates/base/base.html:258
+#: rhodecode/templates/base/base.html:400
 #: rhodecode/templates/search/search.html:64
 msgid "Search"
 msgstr ""
@@ -5502,7 +6140,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/users/user_add.html:13
 #: rhodecode/templates/admin/users/user_edit.html:14
-#: rhodecode/templates/base/base.html:81
+#: rhodecode/templates/base/base.html:80
 msgid "Users"
 msgstr ""
 
@@ -5565,7 +6203,7 b' msgid "Source of Record"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:8
-#: rhodecode/templates/admin/users/users.html:98
+#: rhodecode/templates/admin/users/users.html:97
 msgid "Last login"
 msgstr ""
 
@@ -5665,7 +6303,7 b' msgid "Detach user groups"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:135
-#: rhodecode/templates/data_table/_dt_elements.html:189
+#: rhodecode/templates/data_table/_dt_elements.html:191
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
@@ -5750,21 +6388,21 b' msgstr ""'
 msgid "Users administration"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:104
+#: rhodecode/templates/admin/users/users.html:103
 msgid "Authentication type"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:45
+#: rhodecode/templates/base/base.html:44
 #: rhodecode/templates/errors/error_document.html:51
 msgid "Support"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:52
+#: rhodecode/templates/base/base.html:51
 #, python-format
 msgid "RhodeCode instance id: %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:84
+#: rhodecode/templates/base/base.html:83
 msgid "Authentication"
 msgstr ""
 
@@ -5778,40 +6416,40 b' msgstr ""'
 msgid "Show More"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:189
+#: rhodecode/templates/base/base.html:190
 msgid "Fork of"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:206
+#: rhodecode/templates/base/base.html:207
 #, python-format
 msgid "Repository locked by %(user)s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/base/base.html:212
 msgid "Repository not locked. Pull repository to lock it."
 msgstr ""
 
-#: rhodecode/templates/base/base.html:229
-#: rhodecode/templates/data_table/_dt_elements.html:12
-#: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/data_table/_dt_elements.html:147
-msgid "Summary"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:230
+#: rhodecode/templates/data_table/_dt_elements.html:12
+#: rhodecode/templates/data_table/_dt_elements.html:13
+#: rhodecode/templates/data_table/_dt_elements.html:149
+msgid "Summary"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:231
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:18
 msgid "Changelog"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:231
+#: rhodecode/templates/base/base.html:232
 #: 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:233
+#: rhodecode/templates/base/base.html:234
 #: rhodecode/templates/bookmarks/bookmarks.html:68
 #: rhodecode/templates/branches/branches.html:67
 #: rhodecode/templates/files/file_diff.html:11
@@ -5820,29 +6458,29 b' msgstr ""'
 msgid "Compare"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:239
 #, python-format
 msgid "Show Pull Requests for %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:247
+#: rhodecode/templates/base/base.html:248
 msgid "Options"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:254
+#: rhodecode/templates/base/base.html:255
 #: rhodecode/templates/forks/forks_data.html:30
 msgid "Compare fork"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:261
+#: rhodecode/templates/base/base.html:262
 msgid "Unlock"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:263
+#: rhodecode/templates/base/base.html:264
 msgid "Lock"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:268
+#: 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
@@ -5852,73 +6490,73 b' msgid_plural "Forks"'
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/base/base.html:269
+#: rhodecode/templates/base/base.html:270
 msgid "Create Pull Request"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:291
+#: rhodecode/templates/base/base.html:292
 msgid "Sign in"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:300
 #: rhodecode/templates/debug_style/login.html:28
 msgid "Sign in to your account"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:316
 #: rhodecode/templates/debug_style/login.html:46
 msgid "(Forgot password?)"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:325
 #: rhodecode/templates/debug_style/login.html:56
 msgid "Don't have an account ?"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:345
+#: rhodecode/templates/base/base.html:346
 msgid "Sign Out"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:381
-msgid "Show activity journal"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:382
+msgid "Show activity journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:383
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:14
 msgid "Journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:387
+#: rhodecode/templates/base/base.html:388
 msgid "Show Public activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:388
+#: rhodecode/templates/base/base.html:389
 msgid "Public journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:393
-msgid "Show Gists"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:394
+msgid "Show Gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:395
 msgid "Gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:398
+#: rhodecode/templates/base/base.html:399
 msgid "Search in repositories you have access to"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:404
+#: rhodecode/templates/base/base.html:405
 msgid "Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:411
+#: rhodecode/templates/base/base.html:412
 msgid "Delegated Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:421
 #: rhodecode/templates/base/base.html:422
+#: rhodecode/templates/base/base.html:423
 #: rhodecode/templates/debug_style/buttons.html:5
 #: rhodecode/templates/debug_style/code-block.html:6
 #: rhodecode/templates/debug_style/collapsable-content.html:5
@@ -5939,15 +6577,15 b' msgstr ""'
 msgid "Style"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:479
+#: rhodecode/templates/base/base.html:480
 msgid "Go to"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:590
+#: rhodecode/templates/base/base.html:591
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:598
+#: rhodecode/templates/base/base.html:599
 msgid "Site-wide shortcuts"
 msgstr ""
 
@@ -6139,7 +6777,7 b' msgstr ""'
 msgid "No permission defined"
 msgstr ""
 
-#: rhodecode/templates/base/root.html:151
+#: rhodecode/templates/base/root.html:120
 msgid "Please enable JavaScript to use RhodeCode Enterprise"
 msgstr ""
 
@@ -6281,6 +6919,24 b' msgid ""'
 " updated and outdated inline comments will be hidden."
 msgstr ""
 
+#: rhodecode/templates/base/vcs_settings.html:222
+msgid "Labs settings"
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.html:222
+msgid ""
+"These features are considered experimental and may not work as expected."
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.html:229
+msgid "Mercurial server-side merge"
+msgstr "Unión de lado de servidor Mercurial"
+
+#: rhodecode/templates/base/vcs_settings.html:234
+msgid ""
+"Use rebase instead of creating a merge commit when merging via web interface"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
@@ -6295,8 +6951,8 b' msgid "Compare Selected Bookmarks"'
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks_data.html:13
-#: rhodecode/templates/changelog/changelog.html:180
-#: rhodecode/templates/changelog/changelog_summary_data.html:53
+#: rhodecode/templates/changelog/changelog.html:183
+#: rhodecode/templates/changelog/changelog_summary_data.html:62
 #: rhodecode/templates/changeset/changeset.html:92
 #: rhodecode/templates/files/base.html:10
 #, python-format
@@ -6317,8 +6973,8 b' msgid "Compare Selected Branches"'
 msgstr ""
 
 #: rhodecode/templates/branches/branches_data.html:12
-#: rhodecode/templates/changelog/changelog.html:172
-#: rhodecode/templates/changelog/changelog_summary_data.html:67
+#: rhodecode/templates/changelog/changelog.html:175
+#: rhodecode/templates/changelog/changelog_summary_data.html:76
 #: rhodecode/templates/changeset/changeset.html:105
 #: rhodecode/templates/files/base.html:23
 #, python-format
@@ -6348,10 +7004,6 b' msgstr ""'
 msgid "Compare fork with Parent (%s)"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:62
-msgid "Open new pull request"
-msgstr ""
-
 #: rhodecode/templates/changelog/changelog.html:68
 #: rhodecode/templates/changelog/changelog.html:69
 msgid "Clear selection"
@@ -6361,43 +7013,49 b' msgstr ""'
 msgid "Clear filter"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:103
-#: rhodecode/templates/changelog/changelog_summary_data.html:9
-msgid "Age"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:105
+#: rhodecode/templates/changelog/changelog.html:107
 #: rhodecode/templates/files/files_add.html:93
 #: rhodecode/templates/files/files_delete.html:60
 #: rhodecode/templates/files/files_edit.html:96
 msgid "Commit Message"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:108
-#: rhodecode/templates/changelog/changelog_summary_data.html:11
+#: rhodecode/templates/changelog/changelog.html:109
+#: rhodecode/templates/changelog/changelog_summary_data.html:10
+msgid "Age"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:112
+#: rhodecode/templates/changelog/changelog_summary_data.html:12
 msgid "Refs"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:122
-#: rhodecode/templates/changelog/changelog_summary_data.html:22
+#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog_summary_data.html:21
 #, python-format
 msgid ""
 "Commit status: %s\n"
 "Click to open associated pull request #%s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:130
+#: rhodecode/templates/changelog/changelog_summary_data.html:25
 #, python-format
 msgid "Commit status: %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:162
-#: rhodecode/templates/changelog/changelog_summary_data.html:33
+#: rhodecode/templates/changelog/changelog.html:136
+#: rhodecode/templates/changelog/changelog_summary_data.html:31
+msgid "Commit status: Not Reviewed"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:141
+#: rhodecode/templates/changelog/changelog_summary_data.html:36
 msgid "Commit has comments"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:188
-#: rhodecode/templates/changelog/changelog_summary_data.html:60
+#: rhodecode/templates/changelog/changelog.html:191
+#: rhodecode/templates/changelog/changelog_summary_data.html:69
 #: rhodecode/templates/changeset/changeset.html:99
 #: rhodecode/templates/files/base.html:17
 #: rhodecode/templates/tags/tags_data.html:12
@@ -6405,16 +7063,16 b' msgstr ""'
 msgid "Tag %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:338
+#: rhodecode/templates/changelog/changelog.html:341
 msgid "Filter changelog"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:411
+#: rhodecode/templates/changelog/changelog.html:414
 msgid "There are no changes yet"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/pullrequests/pullrequest_show.html:358
+#: rhodecode/templates/pullrequests/pullrequest_show.html:362
 msgid "Removed"
 msgstr ""
 
@@ -6445,25 +7103,25 b' msgstr ""'
 msgid "Show File"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:8
+#: rhodecode/templates/changelog/changelog_summary_data.html:9
 #: rhodecode/templates/search/search_commit.html:8
 msgid "Commit message"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:91
+#: rhodecode/templates/changelog/changelog_summary_data.html:100
 msgid "Add or upload files directly via RhodeCode:"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:94
+#: rhodecode/templates/changelog/changelog_summary_data.html:103
 #: rhodecode/templates/files/files_browser.html:25
 msgid "Add New File"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:102
+#: rhodecode/templates/changelog/changelog_summary_data.html:111
 msgid "Push new repo:"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:113
+#: rhodecode/templates/changelog/changelog_summary_data.html:122
 msgid "Existing repository?"
 msgstr ""
 
@@ -6539,7 +7197,7 b' msgstr ""'
 
 #: rhodecode/templates/changeset/changeset.html:145
 #: rhodecode/templates/changeset/changeset.html:147
-#: rhodecode/tests/functional/test_changeset_comments.py:217
+#: rhodecode/tests/functional/test_commit_comments.py:263
 #, python-format
 msgid "%d Commit comment"
 msgid_plural "%d Commit comments"
@@ -6550,22 +7208,22 b' msgstr[1] ""'
 #: rhodecode/templates/changeset/changeset.html:153
 #: rhodecode/templates/pullrequests/pullrequest_show.html:145
 #: rhodecode/templates/pullrequests/pullrequest_show.html:147
-#: rhodecode/tests/functional/test_changeset_comments.py:224
+#: rhodecode/tests/functional/test_commit_comments.py:270
 #, python-format
 msgid "%d Inline Comment"
 msgid_plural "%d Inline Comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:177
+#: 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
-msgid "Browse files"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:179
 #: rhodecode/templates/changeset/changeset_range.html:59
 #: rhodecode/templates/compare/compare_diff.html:255
 #: rhodecode/templates/files/file_diff.html:77
@@ -6573,7 +7231,7 b' msgstr ""'
 msgid "Expand All"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:179
+#: 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
@@ -6581,30 +7239,32 b' msgstr ""'
 msgid "Collapse All"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:190
+#: 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:227
+#: 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:228
+#: 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:245
+#: 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:245
+#: 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
@@ -6614,22 +7274,22 b' msgstr ""'
 msgid "Showing a big diff might take some time and resources, continue?"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:245
+#: 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:386
-#: rhodecode/templates/pullrequests/pullrequest_show.html:392
+#: rhodecode/templates/pullrequests/pullrequest_show.html:390
+#: rhodecode/templates/pullrequests/pullrequest_show.html:396
 msgid "Show full diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:314
+#: rhodecode/templates/changeset/changeset.html:312
 msgid "No Child Commits"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:350
+#: rhodecode/templates/changeset/changeset.html:348
 msgid "No Parent Commits"
 msgstr ""
 
@@ -6683,6 +7343,8 b' 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/email_templates/commit_comment.mako:87
+#: rhodecode/templates/email_templates/pull_request_comment.mako:93
 msgid "Comment"
 msgstr ""
 
@@ -6830,12 +7492,15 b' msgid "Compare Commits"'
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.html:46
+#: rhodecode/templates/email_templates/pull_request_review.mako:50
 #: 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_comment.mako:92
+#: rhodecode/templates/email_templates/pull_request_review.mako:49
 #: rhodecode/templates/files/file_diff.html:62
 #: rhodecode/templates/files/files_source.html:18
 msgid "Source"
@@ -6885,36 +7550,36 b' msgstr ""'
 msgid "Subscribe to %s atom feed"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:127
+#: rhodecode/templates/data_table/_dt_elements.html:129
 msgid "Creating"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:129
+#: rhodecode/templates/data_table/_dt_elements.html:131
 msgid "Created"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:175
+#: rhodecode/templates/data_table/_dt_elements.html:177
 #, 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:201
+#: rhodecode/templates/data_table/_dt_elements.html:203
 #, python-format
 msgid "Confirm to delete this user group: %s"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:218
+#: rhodecode/templates/data_table/_dt_elements.html:220
 msgid "User group"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:262
+#: rhodecode/templates/data_table/_dt_elements.html:264
 #: rhodecode/templates/forks/fork.html:81
 msgid "Private"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:287
+#: rhodecode/templates/data_table/_dt_elements.html:289
 #, python-format
 msgid "Pull request #%(pr_number)s"
 msgstr ""
@@ -7018,85 +7683,138 b' msgstr ""'
 msgid "Form vertical"
 msgstr ""
 
-#: rhodecode/templates/email_templates/base.mako:16
+#: rhodecode/templates/email_templates/base.mako:7
 #, python-format
 msgid "This is a notification from RhodeCode. %(instance_url)s"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:5
-#: rhodecode/templates/email_templates/pull_request_comment.mako:5
+#: rhodecode/templates/email_templates/base.mako:90
+msgid "RhodeCode"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:16
+#: rhodecode/templates/email_templates/pull_request_comment.mako:17
 msgid "[mention]"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:5
-#, python-format
-msgid "%(user)s commented on commit of %(repo_name)s"
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:14
-#: rhodecode/templates/email_templates/commit_comment.mako:41
-#: rhodecode/templates/email_templates/pull_request_comment.mako:15
-#: rhodecode/templates/email_templates/pull_request_comment.mako:51
-msgid "Comment link"
+#: rhodecode/templates/email_templates/commit_comment.mako:19
+#, python-format
+msgid ""
+"%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:19
+#: rhodecode/templates/email_templates/commit_comment.mako:22
+#: rhodecode/templates/email_templates/commit_comment.mako:24
+#, python-format
+msgid "in the %(repo_name)s repository"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:22
+#, python-format
+msgid "%(user)s commented on commit `%(commit_id)s` (status: %(status)s)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:24
+#: rhodecode/templates/email_templates/commit_comment.mako:78
+#, python-format
+msgid "%(user)s commented on commit `%(commit_id)s`"
+msgstr ""
+
 #: rhodecode/templates/email_templates/commit_comment.mako:43
-#: rhodecode/templates/email_templates/pull_request_comment.mako:20
-#: rhodecode/templates/email_templates/pull_request_comment.mako:54
+#: rhodecode/templates/email_templates/pull_request_comment.mako:43
+msgid "Comment link"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:48
+#: rhodecode/templates/email_templates/pull_request_comment.mako:48
 #, python-format
 msgid "File: %(comment_file)s on line %(comment_line)s"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:28
-#: rhodecode/templates/email_templates/commit_comment.mako:56
+#: rhodecode/templates/email_templates/commit_comment.mako:54
 msgid "Commit status was changed to"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:35
-#, python-format
-msgid "%(user)s commented on a file in commit of %(repo_url)s."
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:37
-#, python-format
-msgid "%(user)s commented on a commit of %(repo_url)s."
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:47
-#: rhodecode/templates/files/files_detail.html:5
-#: rhodecode/templates/files/files_detail.html:12
-msgid "Commit Description"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:5
-#, python-format
-msgid "%(user)s commented on pull request #%(pr_id)s: \"%(pr_title)s\""
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:17
-#: rhodecode/templates/email_templates/pull_request_comment.mako:52
+#: rhodecode/templates/email_templates/commit_comment.mako:76
+#, python-format
+msgid "%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:76
+#: rhodecode/templates/email_templates/commit_comment.mako:78
+#, python-format
+msgid "in the %(repo)s repository"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:85
+msgid "Status"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:85
+msgid "The commit status was changed to"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:87
+#: rhodecode/templates/email_templates/pull_request_comment.mako:93
+#, python-format
+msgid "Comment on line: %(comment_line)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/password_reset.mako:30
+msgid "Generate new password here"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:20
+#, python-format
+msgid ""
+"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: "
+"`%(comment_file)s`)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:23
+#, python-format
+msgid ""
+"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: "
+"%(status)s)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:25
+#: rhodecode/templates/email_templates/pull_request_comment.mako:82
+#, python-format
+msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\""
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:45
 msgid "Source repository"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_comment.mako:29
-#: rhodecode/templates/email_templates/pull_request_comment.mako:63
-msgid "Pull request status was changed to"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:31
-#: rhodecode/templates/email_templates/pull_request_comment.mako:65
-msgid "Pull request was closed with status"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:37
-#, python-format
-msgid "%(user)s commented on a file on pull request #%(pr_id)s: \"%(pr_title)s\"."
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:43
-#, python-format
-msgid "%(user)s commented on a pull request #%(pr_id)s \"%(pr_title)s\"."
+#: rhodecode/templates/email_templates/pull_request_comment.mako:54
+#, python-format
+msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:56
+#, python-format
+msgid ""
+"%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:80
+#, python-format
+msgid ""
+"%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" "
+"(file:`%(comment_file)s`)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:86
+#, python-format
+msgid "submitted pull request status: %(status)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:88
+#, python-format
+msgid "submitted pull request status: %(status)s and closed"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:5
@@ -7105,7 +7823,6 b' msgid "%(user)s wants you to review pull'
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:17
-#: rhodecode/templates/email_templates/pull_request_review.mako:54
 #, python-format
 msgid ""
 "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s "
@@ -7113,12 +7830,10 b' msgid ""'
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:26
-#: rhodecode/templates/email_templates/pull_request_review.mako:63
 msgid "Link"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:35
-#: rhodecode/templates/email_templates/pull_request_review.mako:72
 #, python-format
 msgid "Commit (%(num)s)"
 msgid_plural "Commits (%(num)s)"
@@ -7130,6 +7845,25 b' msgstr[1] ""'
 msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"."
 msgstr ""
 
+#: rhodecode/templates/email_templates/pull_request_review.mako:49
+#, python-format
+msgid "%(source_ref_type)s of %(source_repo_url)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_review.mako:50
+#, python-format
+msgid "%(target_ref_type)s of %(target_repo_url)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_review.mako:52
+#: rhodecode/templates/summary/components.html:95
+#: rhodecode/templates/summary/components.html:98
+#, python-format
+msgid "%(num)s Commit"
+msgid_plural "%(num)s Commits"
+msgstr[0] ""
+msgstr[1] ""
+
 #: rhodecode/templates/email_templates/test.mako:5
 msgid "hello \"world\""
 msgstr ""
@@ -7138,6 +7872,21 b' msgstr ""'
 msgid "Translation"
 msgstr ""
 
+#: rhodecode/templates/email_templates/user_registration.mako:22
+#, python-format
+msgid "New user %(user)s has registered on %(date)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/user_registration.mako:24
+msgid "Full Name"
+msgstr ""
+
+#: rhodecode/templates/email_templates/user_registration.mako:26
+#: rhodecode/templates/users/user.html:29
+#: rhodecode/templates/users/user_profile.html:5
+msgid "Profile"
+msgstr ""
+
 #: rhodecode/templates/errors/error_document.html:39
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
@@ -7149,8 +7898,8 b' msgid "%(user)s commited on %(date)s UTC'
 msgstr ""
 
 #: rhodecode/templates/feed/atom_feed_entry.mako:26
-#: rhodecode/templates/pullrequests/pullrequest_show.html:386
-#: rhodecode/templates/pullrequests/pullrequest_show.html:392
+#: rhodecode/templates/pullrequests/pullrequest_show.html:390
+#: rhodecode/templates/pullrequests/pullrequest_show.html:396
 msgid "Commit was too big and was cut off..."
 msgstr ""
 
@@ -7194,7 +7943,7 b' msgstr[1] ""'
 msgid "Show All"
 msgstr ""
 
-#: rhodecode/templates/files/file_authors_box.html:26
+#: rhodecode/templates/files/file_authors_box.html:25
 msgid "last author"
 msgstr ""
 
@@ -7229,7 +7978,7 b' msgstr ""'
 msgid "%s Files"
 msgstr ""
 
-#: rhodecode/templates/files/files.html:143
+#: rhodecode/templates/files/files.html:131
 msgid "Switch To Commit"
 msgstr ""
 
@@ -7325,22 +8074,18 b' msgstr ""'
 msgid "Loading file list..."
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:50
+#: rhodecode/templates/files/files_browser_tree.html:6
 msgid "Size"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:51
+#: rhodecode/templates/files/files_browser_tree.html:7
 msgid "Modified"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:52
+#: rhodecode/templates/files/files_browser_tree.html:8
 msgid "Last Commit"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:89
-msgid "Loading..."
-msgstr ""
-
 #: rhodecode/templates/files/files_delete.html:4
 #, python-format
 msgid "%s Files Delete"
@@ -7365,6 +8110,11 b' msgstr ""'
 msgid "Delete File"
 msgstr ""
 
+#: rhodecode/templates/files/files_detail.html:5
+#: rhodecode/templates/files/files_detail.html:12
+msgid "Commit Description"
+msgstr ""
+
 #: rhodecode/templates/files/files_detail.html:35
 msgid "File last commit"
 msgstr ""
@@ -7523,7 +8273,7 b' msgstr ""'
 msgid "Forked"
 msgstr ""
 
-#: rhodecode/templates/forks/forks_data.html:48
+#: rhodecode/templates/forks/forks_data.html:46
 msgid "There are no forks yet"
 msgstr ""
 
@@ -7539,7 +8289,7 b' msgstr ""'
 msgid "RSS journal feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal_data.html:53
+#: rhodecode/templates/journal/journal_data.html:51
 msgid "No entries yet"
 msgstr ""
 
@@ -7717,13 +8467,13 b' msgid_plural "Compare View: %s commits"'
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:330
-#: rhodecode/templates/pullrequests/pullrequest_show.html:365
+#: 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:386
-#: rhodecode/templates/pullrequests/pullrequest_show.html:392
+#: 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 ""
 
@@ -7902,14 +8652,6 b' msgstr ""'
 msgid "Information"
 msgstr ""
 
-#: rhodecode/templates/summary/components.html:95
-#: rhodecode/templates/summary/components.html:98
-#, python-format
-msgid "%(num)s Commit"
-msgid_plural "%(num)s Commits"
-msgstr[0] ""
-msgstr[1] ""
-
 #: rhodecode/templates/summary/components.html:102
 msgid "Number of Repository Forks"
 msgstr ""
@@ -7973,11 +8715,6 b' msgstr ""'
 msgid "Compare Selected Tags"
 msgstr ""
 
-#: rhodecode/templates/users/user.html:29
-#: rhodecode/templates/users/user_profile.html:5
-msgid "Profile"
-msgstr ""
-
 #: rhodecode/templates/users/user_profile.html:35
 msgid "First name"
 msgstr ""