diff --git a/rhodecode/i18n/rhodecode.pot b/rhodecode/i18n/rhodecode.pot
--- a/rhodecode/i18n/rhodecode.pot
+++ b/rhodecode/i18n/rhodecode.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: RhodeCode 1.6.0b\n"
+"Project-Id-Version: RhodeCode 1.7.0dev\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-04-05 10:19-0700\n"
+"POT-Creation-Date: 2013-06-01 18:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,36 +17,35 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: rhodecode/controllers/changelog.py:95
+#: rhodecode/controllers/changelog.py:149
 msgid "All Branches"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:83
+#: rhodecode/controllers/changeset.py:84
 msgid "Show white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
+#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
 msgid "Ignore white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:163
+#: rhodecode/controllers/changeset.py:164
 #, python-format
 msgid "%s line context"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:329 rhodecode/controllers/pullrequests.py:438
+#: rhodecode/controllers/changeset.py:345 rhodecode/controllers/pullrequests.py:481
 #, python-format
 msgid "Status change -> %s"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:360
+#: rhodecode/controllers/changeset.py:376
 msgid ""
 "Changing status on a changeset associated with a closed pull request is not "
 "allowed"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:74 rhodecode/controllers/pullrequests.py:167
-#: rhodecode/controllers/shortlog.py:100
+#: rhodecode/controllers/compare.py:74 rhodecode/controllers/pullrequests.py:259
 msgid "There are no changesets yet"
 msgstr ""
 
@@ -87,8 +86,8 @@ msgid "%s %s feed"
 msgstr ""
 
 #: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:134
-#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/changeset/changeset.html:141
+#: rhodecode/templates/changeset/changeset.html:153
 #: rhodecode/templates/compare/compare_diff.html:58
 #: rhodecode/templates/compare/compare_diff.html:69
 #: rhodecode/templates/pullrequests/pullrequest_show.html:131
@@ -96,115 +95,115 @@ msgstr ""
 msgid "Changeset was too big and was cut off..."
 msgstr ""
 
-#: rhodecode/controllers/feed.py:91
+#: rhodecode/controllers/feed.py:90
 #, python-format
 msgid "%s committed on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:88
-msgid "Click here to add new file"
-msgstr ""
-
 #: rhodecode/controllers/files.py:89
+msgid "Click here to add new file"
+msgstr ""
+
+#: rhodecode/controllers/files.py:90
 #, python-format
 msgid "There are no files yet %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335
+#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:279
+#: rhodecode/controllers/files.py:283
 msgid "You can only edit files with revision being a valid branch "
 msgstr ""
 
-#: rhodecode/controllers/files.py:293
+#: rhodecode/controllers/files.py:297
 #, python-format
 msgid "Edited file %s via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:309
+#: rhodecode/controllers/files.py:313
 msgid "No changes"
 msgstr ""
 
-#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388
+#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394
 #, python-format
 msgid "Successfully committed to %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394
+#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/controllers/files.py:347
+#: rhodecode/controllers/files.py:351
 msgid "Added file via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:364
-msgid "No content"
-msgstr ""
-
 #: rhodecode/controllers/files.py:368
-msgid "No filename"
+msgid "No content"
 msgstr ""
 
 #: rhodecode/controllers/files.py:372
+msgid "No filename"
+msgstr ""
+
+#: rhodecode/controllers/files.py:397
 msgid "Location must be relative path and must not contain .. in path"
 msgstr ""
 
-#: rhodecode/controllers/files.py:420
-msgid "Downloads disabled"
-msgstr ""
-
 #: rhodecode/controllers/files.py:431
+msgid "Downloads disabled"
+msgstr ""
+
+#: rhodecode/controllers/files.py:442
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:433
+#: rhodecode/controllers/files.py:444
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/controllers/files.py:435
+#: rhodecode/controllers/files.py:446
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/controllers/files.py:617
+#: rhodecode/controllers/files.py:631
 #: rhodecode/templates/changeset/changeset_range.html:9
+#: rhodecode/templates/email_templates/pull_request.html:12
+#: rhodecode/templates/pullrequests/pullrequest.html:124
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131
-#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606
+#: rhodecode/controllers/files.py:632 rhodecode/controllers/pullrequests.py:152
+#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682
 #: rhodecode/templates/switch_to_list.html:3
 #: rhodecode/templates/branches/branches.html:10
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132
-#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617
-#: rhodecode/templates/switch_to_list.html:15
-#: rhodecode/templates/shortlog/shortlog_data.html:10
-#: rhodecode/templates/tags/tags.html:10
+#: rhodecode/controllers/files.py:633 rhodecode/controllers/pullrequests.py:153
+#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693
+#: rhodecode/templates/switch_to_list.html:15 rhodecode/templates/tags/tags.html:10
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:175
+#: rhodecode/controllers/forks.py:176
 #, python-format
 msgid "Forked repository %s as %s"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:189
+#: rhodecode/controllers/forks.py:190
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318
+#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153
 msgid "public journal"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322
+#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157
 #: rhodecode/templates/journal/journal.html:12
 msgid "journal"
 msgstr ""
@@ -221,71 +220,71 @@ msgstr ""
 msgid "Your password reset was successful, new password has been sent to your email"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:118
+#: rhodecode/controllers/pullrequests.py:139
 #: rhodecode/templates/changeset/changeset.html:10
-#: rhodecode/templates/email_templates/changeset_comment.html:15
+#: rhodecode/templates/email_templates/changeset_comment.html:8
 msgid "Changeset"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:128
+#: rhodecode/controllers/pullrequests.py:149
 msgid "Special"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:129
+#: rhodecode/controllers/pullrequests.py:150
 msgid "Peer branches"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612
+#: rhodecode/controllers/pullrequests.py:151 rhodecode/model/scm.py:688
 #: rhodecode/templates/switch_to_list.html:28
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:228
+#: rhodecode/controllers/pullrequests.py:324
 msgid "Pull request requires a title with min. 3 chars"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:230
+#: rhodecode/controllers/pullrequests.py:326
 msgid "Error creating pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:251
+#: rhodecode/controllers/pullrequests.py:346
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:254
+#: rhodecode/controllers/pullrequests.py:349
 msgid "Error occurred during sending pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:287
+#: rhodecode/controllers/pullrequests.py:388
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:441
+#: rhodecode/controllers/pullrequests.py:484
 msgid "Closing with"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:478
+#: rhodecode/controllers/pullrequests.py:521
 msgid "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr ""
 
-#: rhodecode/controllers/search.py:134
+#: rhodecode/controllers/search.py:132
 msgid "Invalid search query. Try quoting it."
 msgstr ""
 
-#: rhodecode/controllers/search.py:139
+#: rhodecode/controllers/search.py:137
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr ""
 
-#: rhodecode/controllers/search.py:143
+#: rhodecode/controllers/search.py:141
 msgid "An error occurred during this search operation"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:141
+#: rhodecode/controllers/summary.py:182
 msgid "No data loaded yet"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:147
+#: rhodecode/controllers/summary.py:188
 #: rhodecode/templates/summary/summary.html:149
 msgid "Statistics are disabled for this repository"
 msgstr ""
@@ -298,6 +297,39 @@ msgstr ""
 msgid "Error occurred during update of defaults"
 msgstr ""
 
+#: rhodecode/controllers/admin/gists.py:56
+msgid "forever"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:57
+msgid "5 minutes"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:58
+msgid "1 hour"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:59
+msgid "1 day"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:60
+msgid "1 month"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:62
+msgid "Lifetime"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:127
+msgid "Error occurred during gist creation"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:165
+#, python-format
+msgid "Deleted gist %s"
+msgstr ""
+
 #: rhodecode/controllers/admin/ldap_settings.py:50
 msgid "BASE"
 msgstr ""
@@ -342,35 +374,39 @@ msgstr ""
 msgid "START_TLS on LDAP connection"
 msgstr ""
 
-#: rhodecode/controllers/admin/ldap_settings.py:126
+#: rhodecode/controllers/admin/ldap_settings.py:124
 msgid "LDAP settings updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/ldap_settings.py:130
+#: rhodecode/controllers/admin/ldap_settings.py:128
 msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
 msgstr ""
 
-#: rhodecode/controllers/admin/ldap_settings.py:147
+#: rhodecode/controllers/admin/ldap_settings.py:145
 msgid "Error occurred during update of ldap settings"
 msgstr ""
 
+#: rhodecode/controllers/admin/permissions.py:58
+#: rhodecode/controllers/admin/permissions.py:62
+#: rhodecode/controllers/admin/permissions.py:66
+msgid "None"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:59
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
+msgid "Read"
+msgstr ""
+
 #: rhodecode/controllers/admin/permissions.py:60
 #: rhodecode/controllers/admin/permissions.py:64
-msgid "None"
+#: rhodecode/controllers/admin/permissions.py:68
+msgid "Write"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
-msgid "Read"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:62
-#: rhodecode/controllers/admin/permissions.py:66
-msgid "Write"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:63
-#: rhodecode/controllers/admin/permissions.py:67
+#: rhodecode/controllers/admin/permissions.py:69
 #: rhodecode/templates/admin/defaults/defaults.html:9
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
@@ -391,39 +427,53 @@ msgstr ""
 #: rhodecode/templates/admin/users_groups/users_group_add.html:8
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:292 rhodecode/templates/base/base.html:293
-#: rhodecode/templates/base/base.html:299 rhodecode/templates/base/base.html:300
+#: rhodecode/templates/base/base.html:317 rhodecode/templates/base/base.html:318
+#: rhodecode/templates/base/base.html:324 rhodecode/templates/base/base.html:325
 msgid "Admin"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:70
-#: rhodecode/controllers/admin/permissions.py:76
-#: rhodecode/controllers/admin/permissions.py:79
-msgid "Disabled"
-msgstr ""
-
 #: rhodecode/controllers/admin/permissions.py:72
-msgid "Allowed with manual account activation"
+#: rhodecode/controllers/admin/permissions.py:83
+#: rhodecode/controllers/admin/permissions.py:86
+#: rhodecode/controllers/admin/permissions.py:89
+#: rhodecode/controllers/admin/permissions.py:92
+msgid "Disabled"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:74
+msgid "Allowed with manual account activation"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:76
 msgid "Allowed with automatic account activation"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:77
+#: rhodecode/controllers/admin/permissions.py:79
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444
+msgid "Manual activation of external account"
+msgstr ""
+
 #: rhodecode/controllers/admin/permissions.py:80
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445
+msgid "Automatic activation of external account"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:84
+#: rhodecode/controllers/admin/permissions.py:87
+#: rhodecode/controllers/admin/permissions.py:90
+#: rhodecode/controllers/admin/permissions.py:93
 msgid "Enabled"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:128
+#: rhodecode/controllers/admin/permissions.py:138
 msgid "Default permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:142
+#: rhodecode/controllers/admin/permissions.py:152
 msgid "Error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:127
+#: rhodecode/controllers/admin/repos.py:128
 msgid "--REMOVE FORK--"
 msgstr ""
 
@@ -442,228 +492,223 @@ msgstr ""
 msgid "Error creating repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:266
+#: rhodecode/controllers/admin/repos.py:270
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:284
+#: rhodecode/controllers/admin/repos.py:288
 #, python-format
 msgid "Error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:311 rhodecode/controllers/api/api.py:877
+#: rhodecode/controllers/admin/repos.py:315
 #, python-format
 msgid "Detached %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:314 rhodecode/controllers/api/api.py:879
+#: rhodecode/controllers/admin/repos.py:318
 #, python-format
 msgid "Deleted %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:319
+#: rhodecode/controllers/admin/repos.py:323
 #, python-format
 msgid "Deleted repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:322
+#: rhodecode/controllers/admin/repos.py:326
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:327
+#: rhodecode/controllers/admin/repos.py:331
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:365
+#: rhodecode/controllers/admin/repos.py:345
 msgid "Repository permissions updated"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:384
-msgid "An error occurred during deletion of repository user"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:403
-msgid "An error occurred during deletion of repository user groups"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:421
+#: rhodecode/controllers/admin/repos.py:375
+#: rhodecode/controllers/admin/repos_groups.py:332
+#: rhodecode/controllers/admin/users_groups.py:312
+msgid "An error occurred during revoking of permission"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:392
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:438
+#: rhodecode/controllers/admin/repos.py:409
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:458
-#: rhodecode/controllers/admin/repos.py:485
+#: rhodecode/controllers/admin/repos.py:429
+#: rhodecode/controllers/admin/repos.py:456
 msgid "An error occurred during unlocking"
 msgstr ""
 
+#: rhodecode/controllers/admin/repos.py:447
+msgid "Unlocked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:450
+msgid "Locked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:452
+#, python-format
+msgid "Repository has been %s"
+msgstr ""
+
 #: rhodecode/controllers/admin/repos.py:476
-msgid "Unlocked"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:479
-msgid "Locked"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:481
-#, python-format
-msgid "Repository has been %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:505
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:509
+#: rhodecode/controllers/admin/repos.py:480
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302
+#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302
 msgid "Token mismatch"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:527
+#: rhodecode/controllers/admin/repos.py:498
 msgid "Pulled from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:529
+#: rhodecode/controllers/admin/repos.py:501
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:545
+#: rhodecode/controllers/admin/repos.py:517
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:547
+#: rhodecode/controllers/admin/repos.py:519
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:551
+#: rhodecode/controllers/admin/repos.py:523
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:590
+#: rhodecode/controllers/admin/repos.py:562
 msgid "An error occurred during creation of field"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:604
+#: rhodecode/controllers/admin/repos.py:576
 msgid "An error occurred during removal of field"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:145
+#: rhodecode/controllers/admin/repos_groups.py:147
 #, python-format
 msgid "Created repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:157
+#: rhodecode/controllers/admin/repos_groups.py:159
 #, python-format
 msgid "Error occurred during creation of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:214
-#: rhodecode/controllers/admin/repos_groups.py:286
-msgid "Cannot revoke permission for yourself as admin"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:220
+#: rhodecode/controllers/admin/repos_groups.py:217
 #, python-format
 msgid "Updated repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:235
+#: rhodecode/controllers/admin/repos_groups.py:232
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:253
+#: rhodecode/controllers/admin/repos_groups.py:250
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:260
+#: rhodecode/controllers/admin/repos_groups.py:257
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:266
+#: rhodecode/controllers/admin/repos_groups.py:263
 #, python-format
 msgid "Removed repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:271
+#: rhodecode/controllers/admin/repos_groups.py:268
 #, python-format
 msgid "Error occurred during deletion of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:297
-msgid "An error occurred during deletion of group user"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:318
-msgid "An error occurred during deletion of group user groups"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:126
+#: rhodecode/controllers/admin/repos_groups.py:279
+#: rhodecode/controllers/admin/repos_groups.py:314
+#: rhodecode/controllers/admin/users_groups.py:300
+msgid "Cannot revoke permission for yourself as admin"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:294
+msgid "Repository Group permissions updated"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:123
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:135
+#: rhodecode/controllers/admin/settings.py:132
 msgid "Whoosh reindex task scheduled"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:166
+#: rhodecode/controllers/admin/settings.py:163
 msgid "Updated application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:170
-#: rhodecode/controllers/admin/settings.py:301
+#: rhodecode/controllers/admin/settings.py:167
+#: rhodecode/controllers/admin/settings.py:304
 msgid "Error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:216
+#: rhodecode/controllers/admin/settings.py:219
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:221
+#: rhodecode/controllers/admin/settings.py:224
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:297
+#: rhodecode/controllers/admin/settings.py:300
 msgid "Updated VCS settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:311
+#: rhodecode/controllers/admin/settings.py:314
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:323
+#: rhodecode/controllers/admin/settings.py:326
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:327
+#: rhodecode/controllers/admin/settings.py:330
 msgid "Error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:346
+#: rhodecode/controllers/admin/settings.py:349
 msgid "Email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:410
+#: rhodecode/controllers/admin/settings.py:413
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:452
+#: rhodecode/controllers/admin/settings.py:455
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:467
+#: rhodecode/controllers/admin/settings.py:470
 #: rhodecode/controllers/admin/users.py:198
 #, python-format
 msgid "Error occurred during update of user %s"
@@ -691,111 +736,92 @@ msgstr ""
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:233
+#: rhodecode/controllers/admin/users.py:234
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:276
-msgid "Granted 'repository create' permission to user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:281
-msgid "Revoked 'repository create' permission to user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:287
-msgid "Granted 'repository fork' permission to user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:292
-msgid "Revoked 'repository fork' permission to user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:298
-#: rhodecode/controllers/admin/users_groups.py:281
+#: rhodecode/controllers/admin/users.py:293
+#: rhodecode/controllers/admin/users_groups.py:372
+msgid "Updated permissions"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:297
+#: rhodecode/controllers/admin/users_groups.py:376
 msgid "An error occurred during permissions saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:312
+#: rhodecode/controllers/admin/users.py:311
 #, python-format
 msgid "Added email %s to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:318
+#: rhodecode/controllers/admin/users.py:317
 msgid "An error occurred during email saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:328
+#: rhodecode/controllers/admin/users.py:327
 msgid "Removed email from user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:341
+#: rhodecode/controllers/admin/users.py:340
 #, python-format
 msgid "Added ip %s to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:347
+#: rhodecode/controllers/admin/users.py:346
 msgid "An error occurred during ip saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:359
+#: rhodecode/controllers/admin/users.py:358
 msgid "Removed ip from user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:86
+#: rhodecode/controllers/admin/users_groups.py:162
 #, python-format
 msgid "Created user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:97
+#: rhodecode/controllers/admin/users_groups.py:173
 #, python-format
 msgid "Error occurred during creation of user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:166
-#, python-format
-msgid "Updated user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:188
-#, python-format
-msgid "Error occurred during update of user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:205
-msgid "Successfully deleted user group"
-msgstr ""
-
 #: rhodecode/controllers/admin/users_groups.py:210
+#, python-format
+msgid "Updated user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:232
+#, python-format
+msgid "Error occurred during update of user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:250
+msgid "Successfully deleted user group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:255
 msgid "An error occurred during deletion of user group"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:259
-msgid "Granted 'repository create' permission to user group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:264
-msgid "Revoked 'repository create' permission to user group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:270
-msgid "Granted 'repository fork' permission to user group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:275
-msgid "Revoked 'repository fork' permission to user group"
-msgstr ""
-
-#: rhodecode/lib/auth.py:530
+#: rhodecode/controllers/admin/users_groups.py:274
+msgid "Target group cannot be the same"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:280
+msgid "User Group permissions updated"
+msgstr ""
+
+#: rhodecode/lib/auth.py:544
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 
-#: rhodecode/lib/auth.py:579
+#: rhodecode/lib/auth.py:593
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: rhodecode/lib/auth.py:620
+#: rhodecode/lib/auth.py:634
 msgid "You need to be a signed in to view this page"
 msgstr ""
 
@@ -811,152 +837,176 @@ msgstr ""
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:394
+#: rhodecode/lib/helpers.py:428
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:506
+#: rhodecode/lib/helpers.py:539
 msgid "True"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:509
+#: rhodecode/lib/helpers.py:542
 msgid "False"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:547
+#: rhodecode/lib/helpers.py:580
 #, python-format
 msgid "Deleted branch: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:550
+#: rhodecode/lib/helpers.py:583
 #, python-format
 msgid "Created tag: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:563
+#: rhodecode/lib/helpers.py:596
 msgid "Changeset not found"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:615
+#: rhodecode/lib/helpers.py:646
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:621
+#: rhodecode/lib/helpers.py:652
 msgid "compare view"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:641
+#: rhodecode/lib/helpers.py:672
 msgid "and"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:642
+#: rhodecode/lib/helpers.py:673
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44
+#: rhodecode/lib/helpers.py:674 rhodecode/templates/changelog/changelog.html:53
 msgid "revisions"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:667
+#: rhodecode/lib/helpers.py:698
 #, python-format
 msgid "fork name %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:684
+#: rhodecode/lib/helpers.py:715
 #: rhodecode/templates/pullrequests/pullrequest_show.html:8
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:690
+#: rhodecode/lib/helpers.py:725
 msgid "[deleted] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702
+#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739
 msgid "[created] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:694
+#: rhodecode/lib/helpers.py:729
 msgid "[created] repository as fork"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704
+#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741
 msgid "[forked] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706
+#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743
 msgid "[updated] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:700
+#: rhodecode/lib/helpers.py:735
+msgid "[downloaded] archive from repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:737
 msgid "[delete] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:708
+#: rhodecode/lib/helpers.py:745
 msgid "[created] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:710
+#: rhodecode/lib/helpers.py:747
 msgid "[updated] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:712
+#: rhodecode/lib/helpers.py:749
 msgid "[created] user group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:714
+#: rhodecode/lib/helpers.py:751
 msgid "[updated] user group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:716
+#: rhodecode/lib/helpers.py:753
 msgid "[commented] on revision in repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:718
+#: rhodecode/lib/helpers.py:755
 msgid "[commented] on pull request for"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:720
+#: rhodecode/lib/helpers.py:757
 msgid "[closed] pull request for"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:722
+#: rhodecode/lib/helpers.py:759
 msgid "[pushed] into"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:724
+#: rhodecode/lib/helpers.py:761
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:726
+#: rhodecode/lib/helpers.py:763
 msgid "[pulled from remote] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:728
+#: rhodecode/lib/helpers.py:765
 msgid "[pulled] from"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:730
+#: rhodecode/lib/helpers.py:767
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:732
+#: rhodecode/lib/helpers.py:769
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:910
+#: rhodecode/lib/helpers.py:1088
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:914
+#: rhodecode/lib/helpers.py:1092
 msgid "No Files"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1198
+#: rhodecode/lib/helpers.py:1158
+msgid "new file"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1161
+msgid "mod"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1164
+msgid "del"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1167
+msgid "rename"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1172
+msgid "chmod"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1404
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from the "
@@ -967,221 +1017,299 @@ msgstr ""
 msgid "cannot create new union repository"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:411
+#: rhodecode/lib/utils2.py:410
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:412
+#: rhodecode/lib/utils2.py:411
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
+#: rhodecode/lib/utils2.py:412
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
 #: rhodecode/lib/utils2.py:413
 #, python-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d hour"
+msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/lib/utils2.py:414
 #, python-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d minute"
+msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/lib/utils2.py:415
 #, python-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rhodecode/lib/utils2.py:416
-#, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:432
+#: rhodecode/lib/utils2.py:431
 #, python-format
 msgid "in %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:434
+#: rhodecode/lib/utils2.py:433
 #, python-format
 msgid "%s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:436
+#: rhodecode/lib/utils2.py:435
 #, python-format
 msgid "in %s and %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:439
+#: rhodecode/lib/utils2.py:438
 #, python-format
 msgid "%s and %s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:442
+#: rhodecode/lib/utils2.py:441
 msgid "just now"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1289 rhodecode/model/db.py:1388
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413
 msgid "Repository no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414
 msgid "Repository read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415
 msgid "Repository write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416
 msgid "Repository admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308
 msgid "Repositories Group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309
 msgid "Repositories Group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310
 msgid "Repositories Group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311
 msgid "Repositories Group admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411
 msgid "RhodeCode Administrator"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434
 msgid "Repository creation disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435
 msgid "Repository creation enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437
 msgid "Repository forking disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438
 msgid "Repository forking enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1403
 msgid "Register disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1404
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1407
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939
 msgid "Not Reviewed"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940
 msgid "Approved"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941
 msgid "Rejected"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942
 msgid "Under Review"
 msgstr ""
 
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275
+msgid "top level"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418
+msgid "Repository group no access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419
+msgid "Repository group read access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420
+msgid "Repository group write access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421
+msgid "Repository group admin access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423
+msgid "User group no access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424
+msgid "User group read access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425
+msgid "User group write access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426
+msgid "User group admin access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428
+msgid "Repository Group creation disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429
+msgid "Repository Group creation enabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431
+msgid "User Group creation disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432
+msgid "User Group creation enabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440
+msgid "Registration disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441
+msgid "User Registration with manual account activation"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442
+msgid "User Registration with automatic account activation"
+msgstr ""
+
 #: rhodecode/model/comment.py:75
 #, python-format
 msgid "on line %s"
 msgstr ""
 
-#: rhodecode/model/comment.py:219
+#: rhodecode/model/comment.py:220
 msgid "[Mention]"
 msgstr ""
 
-#: rhodecode/model/db.py:1252
-msgid "top level"
-msgstr ""
-
-#: rhodecode/model/db.py:1393
-msgid "Repository group no access"
-msgstr ""
-
-#: rhodecode/model/db.py:1394
-msgid "Repository group read access"
-msgstr ""
-
-#: rhodecode/model/db.py:1395
-msgid "Repository group write access"
-msgstr ""
-
-#: rhodecode/model/db.py:1396
-msgid "Repository group admin access"
-msgstr ""
-
 #: rhodecode/model/forms.py:43
 msgid "Please enter a login"
 msgstr ""
@@ -1200,42 +1328,42 @@ msgstr ""
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
-#: rhodecode/model/notification.py:224
+#: rhodecode/model/notification.py:228
 #, python-format
 msgid "%(user)s commented on changeset at %(when)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:225
-#, python-format
-msgid "%(user)s sent message at %(when)s"
-msgstr ""
-
-#: rhodecode/model/notification.py:226
-#, python-format
-msgid "%(user)s mentioned you at %(when)s"
-msgstr ""
-
-#: rhodecode/model/notification.py:227
-#, python-format
-msgid "%(user)s registered in RhodeCode at %(when)s"
-msgstr ""
-
-#: rhodecode/model/notification.py:228
-#, python-format
-msgid "%(user)s opened new pull request at %(when)s"
-msgstr ""
-
 #: rhodecode/model/notification.py:229
 #, python-format
+msgid "%(user)s sent message at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:230
+#, python-format
+msgid "%(user)s mentioned you at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:231
+#, python-format
+msgid "%(user)s registered in RhodeCode at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:232
+#, python-format
+msgid "%(user)s opened new pull request at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:233
+#, python-format
 msgid "%(user)s commented on pull request at %(when)s"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:104
+#: rhodecode/model/pull_request.py:98
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:598
+#: rhodecode/model/scm.py:674
 msgid "latest tip"
 msgstr ""
 
@@ -1288,7 +1416,7 @@ msgstr ""
 #: rhodecode/model/validators.py:89
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or "
-"dashes and must begin with alphanumeric character"
+"dashes and must begin with alphanumeric character or underscore"
 msgstr ""
 
 #: rhodecode/model/validators.py:117
@@ -1389,47 +1517,51 @@ msgstr ""
 msgid "You don't have permissions to create a group in this location"
 msgstr ""
 
-#: rhodecode/model/validators.py:557
+#: rhodecode/model/validators.py:559
 msgid "This username or user group name is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:650
+#: rhodecode/model/validators.py:652
 msgid "This is not a valid path"
 msgstr ""
 
-#: rhodecode/model/validators.py:665
+#: rhodecode/model/validators.py:667
 msgid "This e-mail address is already taken"
 msgstr ""
 
-#: rhodecode/model/validators.py:685
+#: rhodecode/model/validators.py:687
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
-#: rhodecode/model/validators.py:722
+#: rhodecode/model/validators.py:724
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name of "
 "the attribute that is equivalent to \"username\""
 msgstr ""
 
-#: rhodecode/model/validators.py:735
+#: rhodecode/model/validators.py:737
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
-#: rhodecode/model/validators.py:767
+#: rhodecode/model/validators.py:769
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
-#: rhodecode/model/validators.py:768
+#: rhodecode/model/validators.py:770
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 
-#: rhodecode/model/validators.py:800
+#: rhodecode/model/validators.py:803
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 
+#: rhodecode/model/validators.py:817
+msgid "Filename cannot be inside a directory"
+msgstr ""
+
 #: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr ""
@@ -1471,27 +1603,28 @@ msgstr ""
 msgid "You have admin right to this group, and can edit it"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:40 rhodecode/templates/index_base.html:140
+#: rhodecode/templates/index_base.html:40
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43
 #: rhodecode/templates/admin/users_groups/users_group_add.html:32
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33
-#: rhodecode/templates/admin/users_groups/users_groups.html:34
+#: rhodecode/templates/admin/users_groups/users_groups.html:37
 msgid "Group name"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:41 rhodecode/templates/index_base.html:83
-#: rhodecode/templates/index_base.html:142 rhodecode/templates/index_base.html:180
-#: rhodecode/templates/index_base.html:270
+#: rhodecode/templates/index_base.html:41 rhodecode/templates/index_base.html:123
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:75
+#: rhodecode/templates/admin/repos/repo_edit.html:68
 #: rhodecode/templates/admin/repos/repos.html:73
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44
+#: rhodecode/templates/email_templates/changeset_comment.html:9
+#: rhodecode/templates/email_templates/pull_request.html:9
 #: rhodecode/templates/forks/fork.html:56
-#: rhodecode/templates/pullrequests/pullrequest.html:101
+#: rhodecode/templates/pullrequests/pullrequest.html:43
+#: rhodecode/templates/pullrequests/pullrequest_show.html:81
 #: rhodecode/templates/summary/summary.html:106
 msgid "Description"
 msgstr ""
@@ -1499,128 +1632,103 @@ msgstr ""
 #: rhodecode/templates/index_base.html:51
 #: rhodecode/templates/admin/permissions/permissions.html:55
 #: rhodecode/templates/admin/repos/repo_add_base.html:29
-#: rhodecode/templates/admin/repos/repo_edit.html:49
+#: rhodecode/templates/admin/repos/repo_edit.html:50
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57
 #: rhodecode/templates/forks/fork.html:47
 msgid "Repository group"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:82 rhodecode/templates/index_base.html:178
-#: rhodecode/templates/index_base.html:268
+#: rhodecode/templates/index_base.html:121
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
 #: rhodecode/templates/admin/repos/repos.html:71
 #: rhodecode/templates/admin/users/user_edit_my_account.html:172
-#: rhodecode/templates/base/perms_summary.html:14
-#: rhodecode/templates/bookmarks/bookmarks.html:34
+#: rhodecode/templates/base/perms_summary.html:37
+#: rhodecode/templates/bookmarks/bookmarks.html:48
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
 #: rhodecode/templates/branches/branches.html:47
 #: rhodecode/templates/branches/branches_data.html:6
 #: rhodecode/templates/files/files_browser.html:47
 #: rhodecode/templates/journal/journal.html:193
-#: rhodecode/templates/journal/journal.html:296
+#: rhodecode/templates/journal/journal.html:283
 #: rhodecode/templates/summary/summary.html:55
 #: rhodecode/templates/summary/summary.html:124
 #: rhodecode/templates/tags/tags.html:48 rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:84
-msgid "Last change"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:85 rhodecode/templates/index_base.html:183
-#: rhodecode/templates/index_base.html:273
+#: rhodecode/templates/index_base.html:124
+msgid "Last Change"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:126
 #: rhodecode/templates/admin/repos/repos.html:74
 #: rhodecode/templates/admin/users/user_edit_my_account.html:174
 #: rhodecode/templates/journal/journal.html:195
-#: rhodecode/templates/journal/journal.html:298
+#: rhodecode/templates/journal/journal.html:285
 msgid "Tip"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:86 rhodecode/templates/index_base.html:185
-#: rhodecode/templates/index_base.html:275
-#: rhodecode/templates/admin/repos/repo_edit.html:121
+#: rhodecode/templates/index_base.html:128
+#: rhodecode/templates/admin/repos/repo_edit.html:114
 #: rhodecode/templates/admin/repos/repos.html:76
 msgid "Owner"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:87
-msgid "Atom"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:171 rhodecode/templates/index_base.html:209
-#: rhodecode/templates/index_base.html:296
-#: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:196
+#: rhodecode/templates/index_base.html:136
+#: rhodecode/templates/admin/repos/repos.html:84
+#: rhodecode/templates/admin/users/user_edit_my_account.html:183
 #: rhodecode/templates/admin/users/users.html:107
-#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/bookmarks/bookmarks.html:74
 #: rhodecode/templates/branches/branches.html:73
-#: rhodecode/templates/journal/journal.html:217
-#: rhodecode/templates/journal/journal.html:320
+#: rhodecode/templates/journal/journal.html:204
+#: rhodecode/templates/journal/journal.html:294
 #: rhodecode/templates/tags/tags.html:74
 msgid "Click to sort ascending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:172 rhodecode/templates/index_base.html:210
-#: rhodecode/templates/index_base.html:297
-#: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:197
+#: rhodecode/templates/index_base.html:137
+#: rhodecode/templates/admin/repos/repos.html:85
+#: rhodecode/templates/admin/users/user_edit_my_account.html:184
 #: rhodecode/templates/admin/users/users.html:108
-#: rhodecode/templates/bookmarks/bookmarks.html:59
+#: rhodecode/templates/bookmarks/bookmarks.html:75
 #: rhodecode/templates/branches/branches.html:74
-#: rhodecode/templates/journal/journal.html:218
-#: rhodecode/templates/journal/journal.html:321
+#: rhodecode/templates/journal/journal.html:205
+#: rhodecode/templates/journal/journal.html:295
 #: rhodecode/templates/tags/tags.html:75
 msgid "Click to sort descending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:181 rhodecode/templates/index_base.html:271
-msgid "Last Change"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:211
-#: rhodecode/templates/admin/repos/repos.html:99
-#: rhodecode/templates/admin/users/user_edit_my_account.html:198
-#: rhodecode/templates/admin/users/users.html:109
-#: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:75
-#: rhodecode/templates/journal/journal.html:219
-#: rhodecode/templates/journal/journal.html:322
-#: rhodecode/templates/tags/tags.html:76
-msgid "No records found."
-msgstr ""
-
-#: rhodecode/templates/index_base.html:212 rhodecode/templates/index_base.html:299
-#: rhodecode/templates/admin/repos/repos.html:100
-#: rhodecode/templates/admin/users/user_edit_my_account.html:199
+#: rhodecode/templates/index_base.html:138
+msgid "No repositories found."
+msgstr ""
+
+#: rhodecode/templates/index_base.html:139
+#: rhodecode/templates/admin/repos/repos.html:87
+#: rhodecode/templates/admin/users/user_edit_my_account.html:186
 #: rhodecode/templates/admin/users/users.html:110
-#: rhodecode/templates/bookmarks/bookmarks.html:61
+#: rhodecode/templates/bookmarks/bookmarks.html:77
 #: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:220
-#: rhodecode/templates/journal/journal.html:323
+#: rhodecode/templates/journal/journal.html:207
+#: rhodecode/templates/journal/journal.html:297
 #: rhodecode/templates/tags/tags.html:77
 msgid "Data error."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:213 rhodecode/templates/index_base.html:300
-#: rhodecode/templates/admin/repos/repos.html:101
+#: rhodecode/templates/index_base.html:140
+#: rhodecode/templates/admin/repos/repos.html:88
 #: rhodecode/templates/admin/users/user_edit_my_account.html:58
-#: rhodecode/templates/admin/users/user_edit_my_account.html:200
+#: rhodecode/templates/admin/users/user_edit_my_account.html:187
 #: rhodecode/templates/admin/users/users.html:111
-#: rhodecode/templates/bookmarks/bookmarks.html:62
+#: rhodecode/templates/bookmarks/bookmarks.html:78
 #: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:221
-#: rhodecode/templates/journal/journal.html:324
+#: rhodecode/templates/journal/journal.html:208
+#: rhodecode/templates/journal/journal.html:298
 #: rhodecode/templates/tags/tags.html:78
 msgid "Loading..."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:298
-msgid "No repositories found."
-msgstr ""
-
-#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227
+#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239
 msgid "Log In"
 msgstr ""
 
@@ -1635,7 +1743,7 @@ msgstr ""
 #: rhodecode/templates/admin/users/user_edit.html:57
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:31
 #: rhodecode/templates/admin/users/users.html:77
-#: rhodecode/templates/base/base.html:203
+#: rhodecode/templates/base/base.html:215
 #: rhodecode/templates/summary/summary.html:123
 msgid "Username"
 msgstr ""
@@ -1643,7 +1751,7 @@ msgstr ""
 #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
 #: rhodecode/templates/admin/ldap/ldap.html:46
 #: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:212
+#: rhodecode/templates/base/base.html:224
 msgid "Password"
 msgstr ""
 
@@ -1659,7 +1767,7 @@ msgstr ""
 msgid "Forgot your password ?"
 msgstr ""
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235
 msgid "Don't have an account ?"
 msgstr ""
 
@@ -1728,7 +1836,7 @@ msgstr ""
 #: rhodecode/templates/repo_switcher_list.html:10
 #: rhodecode/templates/admin/defaults/defaults.html:44
 #: rhodecode/templates/admin/repos/repo_add_base.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:85
+#: rhodecode/templates/admin/repos/repo_edit.html:78
 #: rhodecode/templates/data_table/_dt_elements.html:61
 #: rhodecode/templates/summary/summary.html:77
 msgid "Private repository"
@@ -1751,12 +1859,12 @@ msgid "There are no tags yet"
 msgstr ""
 
 #: rhodecode/templates/switch_to_list.html:35
-#: rhodecode/templates/bookmarks/bookmarks_data.html:32
+#: rhodecode/templates/bookmarks/bookmarks_data.html:37
 msgid "There are no bookmarks yet"
 msgstr ""
 
 #: rhodecode/templates/admin/admin.html:5 rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/base/base.html:68
+#: rhodecode/templates/base/base.html:73
 msgid "Admin journal"
 msgstr ""
 
@@ -1782,9 +1890,9 @@ msgstr[1] ""
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
 #: rhodecode/templates/admin/users/user_edit_my_account.html:176
 #: rhodecode/templates/admin/users/users.html:87
-#: rhodecode/templates/admin/users_groups/users_groups.html:37
+#: rhodecode/templates/admin/users_groups/users_groups.html:40
 #: rhodecode/templates/journal/journal.html:197
-#: rhodecode/templates/journal/journal.html:300
+#: rhodecode/templates/journal/journal.html:287
 msgid "Action"
 msgstr ""
 
@@ -1794,7 +1902,7 @@ msgid "Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:8
-#: rhodecode/templates/bookmarks/bookmarks.html:35
+#: rhodecode/templates/bookmarks/bookmarks.html:49
 #: rhodecode/templates/bookmarks/bookmarks_data.html:7
 #: rhodecode/templates/branches/branches.html:48
 #: rhodecode/templates/branches/branches_data.html:7
@@ -1816,19 +1924,18 @@ msgid "Repositories defaults"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:11
-#: rhodecode/templates/base/base.html:75
+#: rhodecode/templates/base/base.html:80
 msgid "Defaults"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:35
 #: rhodecode/templates/admin/repos/repo_add_base.html:38
-#: rhodecode/templates/admin/repos/repo_edit.html:58
 msgid "Type"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:48
 #: rhodecode/templates/admin/repos/repo_add_base.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:89
+#: rhodecode/templates/admin/repos/repo_edit.html:82
 #: rhodecode/templates/forks/fork.html:69
 msgid ""
 "Private repositories are only visible to people explicitly added as "
@@ -1836,60 +1943,184 @@ msgid ""
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:55
-#: rhodecode/templates/admin/repos/repo_edit.html:94
+#: rhodecode/templates/admin/repos/repo_edit.html:87
 msgid "Enable statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:59
-#: rhodecode/templates/admin/repos/repo_edit.html:98
+#: rhodecode/templates/admin/repos/repo_edit.html:91
 msgid "Enable statistics window on summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:103
+#: rhodecode/templates/admin/repos/repo_edit.html:96
 msgid "Enable downloads"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:107
+#: rhodecode/templates/admin/repos/repo_edit.html:100
 msgid "Enable download menu on summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:75
-#: rhodecode/templates/admin/repos/repo_edit.html:112
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
+#: rhodecode/templates/admin/repos/repo_edit.html:105
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
 msgid "Enable locking"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:79
-#: rhodecode/templates/admin/repos/repo_edit.html:116
+#: rhodecode/templates/admin/repos/repo_edit.html:109
 msgid "Enable lock-by-pulling on repository."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:84
 #: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/permissions/permissions.html:92
-#: rhodecode/templates/admin/repos/repo_edit.html:148
-#: rhodecode/templates/admin/repos/repo_edit.html:173
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80
+#: rhodecode/templates/admin/permissions/permissions.html:122
+#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos/repo_edit.html:166
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96
 #: rhodecode/templates/admin/settings/hooks.html:73
 #: rhodecode/templates/admin/users/user_add.html:94
 #: rhodecode/templates/admin/users/user_edit.html:140
-#: rhodecode/templates/admin/users/user_edit.html:185
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:88
 #: rhodecode/templates/admin/users_groups/users_group_add.html:49
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:135
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:143
+#: rhodecode/templates/base/default_perms_box.html:53
 msgid "Save"
 msgstr ""
 
+#: rhodecode/templates/admin/gists/index.html:5
+#: rhodecode/templates/base/base.html:299
+msgid "Gists"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:10
+#, python-format
+msgid "Private Gists for user %s"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:12
+#, python-format
+msgid "Public Gists for user %s"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:14
+msgid "Public Gists"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:31
+#: rhodecode/templates/admin/gists/show.html:24
+#: rhodecode/templates/base/base.html:302
+msgid "Create new gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:48
+msgid "Created"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:51
+#: rhodecode/templates/admin/gists/index.html:53
+#: rhodecode/templates/admin/gists/show.html:43
+#: rhodecode/templates/admin/gists/show.html:45
+msgid "Expires"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:51
+#: rhodecode/templates/admin/gists/show.html:43
+msgid "never"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:68
+msgid "There are no gists yet"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:5
+#: rhodecode/templates/admin/gists/new.html:16
+msgid "New gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:37
+msgid "Gist description ..."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:52
+msgid "Create private gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:53
+msgid "Create public gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:54
+#: rhodecode/templates/admin/permissions/permissions.html:123
+#: rhodecode/templates/admin/permissions/permissions.html:185
+#: rhodecode/templates/admin/repos/repo_edit.html:142
+#: rhodecode/templates/admin/repos/repo_edit.html:167
+#: rhodecode/templates/admin/repos/repo_edit.html:381
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97
+#: rhodecode/templates/admin/settings/settings.html:115
+#: rhodecode/templates/admin/settings/settings.html:196
+#: rhodecode/templates/admin/settings/settings.html:288
+#: rhodecode/templates/admin/users/user_edit.html:141
+#: rhodecode/templates/admin/users/user_edit.html:198
+#: rhodecode/templates/admin/users/user_edit.html:246
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:144
+#: rhodecode/templates/base/default_perms_box.html:54
+#: rhodecode/templates/files/files_add.html:80
+#: rhodecode/templates/files/files_edit.html:66
+#: rhodecode/templates/pullrequests/pullrequest.html:86
+msgid "Reset"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:5
+msgid "gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:9
+msgid "Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:36
+msgid "Public gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:38
+msgid "Private gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:54
+#: rhodecode/templates/admin/repos/repo_edit.html:299
+#: rhodecode/templates/changeset/changeset_file_comment.html:40
+msgid "Delete"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:54
+msgid "Confirm to delete this gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:63
+#: rhodecode/templates/admin/gists/show.html:84
+#: rhodecode/templates/files/files_edit.html:48
+#: rhodecode/templates/files/files_source.html:25
+#: rhodecode/templates/files/files_source.html:55
+msgid "Show as raw"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:71
+msgid "created"
+msgstr ""
+
 #: rhodecode/templates/admin/ldap/ldap.html:5
 msgid "LDAP administration"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:11
 #: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:74
+#: rhodecode/templates/base/base.html:79
 msgid "LDAP"
 msgstr ""
 
@@ -1989,7 +2220,7 @@ msgid "Show notification"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/show_notification.html:9
-#: rhodecode/templates/base/base.html:241
+#: rhodecode/templates/base/base.html:253
 msgid "Notifications"
 msgstr ""
 
@@ -1998,12 +2229,14 @@ msgid "Permissions administration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
+#: rhodecode/templates/admin/repos/repo_edit.html:151
 #: rhodecode/templates/admin/repos/repo_edit.html:158
-#: rhodecode/templates/admin/repos/repo_edit.html:165
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88
 #: rhodecode/templates/admin/users/user_edit.html:150
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:100
-#: rhodecode/templates/base/base.html:73
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:129
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
+#: rhodecode/templates/base/base.html:78
 msgid "Permissions"
 msgstr ""
 
@@ -2024,6 +2257,7 @@ msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:50
 #: rhodecode/templates/admin/permissions/permissions.html:63
+#: rhodecode/templates/admin/permissions/permissions.html:77
 msgid "Overwrite existing settings"
 msgstr ""
 
@@ -2035,86 +2269,84 @@ msgid ""
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:69
-msgid "Registration"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:77
+msgid "User group"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:76
+msgid ""
+"All default permissions on each user group will be reset to chosen "
+"permission, note that all custom default permission on repository groups will"
+" be lost"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:83
 msgid "Repository creation"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:85
+#: rhodecode/templates/admin/permissions/permissions.html:91
+msgid "User group creation"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:99
 msgid "Repository forking"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:93
-#: rhodecode/templates/admin/permissions/permissions.html:154
-#: rhodecode/templates/admin/repos/repo_edit.html:149
-#: rhodecode/templates/admin/repos/repo_edit.html:174
-#: rhodecode/templates/admin/repos/repo_edit.html:388
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
-#: rhodecode/templates/admin/settings/settings.html:115
-#: rhodecode/templates/admin/settings/settings.html:187
-#: rhodecode/templates/admin/settings/settings.html:278
-#: rhodecode/templates/admin/users/user_edit.html:141
-#: rhodecode/templates/admin/users/user_edit.html:186
-#: rhodecode/templates/admin/users/user_edit.html:235
-#: rhodecode/templates/admin/users/user_edit.html:283
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/files/files_add.html:80
-#: rhodecode/templates/files/files_edit.html:66
-#: rhodecode/templates/pullrequests/pullrequest.html:110
-msgid "Reset"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:103
+#: rhodecode/templates/admin/permissions/permissions.html:107
+msgid "Registration"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:115
+msgid "External auth account activation"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:133
 msgid "Default User Permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:113
-#: rhodecode/templates/admin/users/user_edit.html:244
+#: rhodecode/templates/admin/permissions/permissions.html:144
+#: rhodecode/templates/admin/users/user_edit.html:207
 msgid "Allowed IP addresses"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:127
-#: rhodecode/templates/admin/repos/repo_edit.html:347
+#: rhodecode/templates/admin/permissions/permissions.html:158
+#: rhodecode/templates/admin/repos/repo_edit.html:340
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
-#: rhodecode/templates/admin/users/user_edit.html:212
-#: rhodecode/templates/admin/users/user_edit.html:257
-#: rhodecode/templates/admin/users_groups/users_groups.html:46
+#: rhodecode/templates/admin/users/user_edit.html:175
+#: rhodecode/templates/admin/users/user_edit.html:220
+#: rhodecode/templates/admin/users_groups/users_groups.html:54
 #: rhodecode/templates/data_table/_dt_elements.html:122
-#: rhodecode/templates/data_table/_dt_elements.html:130
+#: rhodecode/templates/data_table/_dt_elements.html:136
 msgid "delete"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:128
-#: rhodecode/templates/admin/users/user_edit.html:258
+#: rhodecode/templates/admin/permissions/permissions.html:159
+#: rhodecode/templates/admin/users/user_edit.html:221
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:134
-#: rhodecode/templates/admin/users/user_edit.html:264
+#: rhodecode/templates/admin/permissions/permissions.html:165
+#: rhodecode/templates/admin/users/user_edit.html:227
 msgid "All IP addresses are allowed"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:145
-#: rhodecode/templates/admin/users/user_edit.html:275
+#: rhodecode/templates/admin/permissions/permissions.html:176
+#: rhodecode/templates/admin/users/user_edit.html:238
 msgid "New ip address"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:153
+#: rhodecode/templates/admin/permissions/permissions.html:184
 #: rhodecode/templates/admin/repos/repo_add_base.html:73
-#: rhodecode/templates/admin/repos/repo_edit.html:387
-#: rhodecode/templates/admin/users/user_edit.html:234
-#: rhodecode/templates/admin/users/user_edit.html:282
+#: rhodecode/templates/admin/repos/repo_edit.html:380
+#: rhodecode/templates/admin/users/user_edit.html:197
+#: rhodecode/templates/admin/users/user_edit.html:245
 msgid "Add"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add.html:12
 #: rhodecode/templates/admin/repos/repo_add.html:16
-#: rhodecode/templates/base/base.html:69 rhodecode/templates/base/base.html:103
-#: rhodecode/templates/base/base.html:263
+#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88
+#: rhodecode/templates/base/base.html:116 rhodecode/templates/base/base.html:275
 msgid "Repositories"
 msgstr ""
 
@@ -2129,7 +2361,7 @@ msgid "Clone from"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:24
-#: rhodecode/templates/admin/repos/repo_edit.html:44
+#: rhodecode/templates/admin/repos/repo_edit.html:45
 msgid "Optional http[s] url from which repository should be cloned."
 msgstr ""
 
@@ -2143,19 +2375,19 @@ msgid "Type of repository to create."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:47
-#: rhodecode/templates/admin/repos/repo_edit.html:66
+#: rhodecode/templates/admin/repos/repo_edit.html:59
 #: rhodecode/templates/forks/fork.html:38
 msgid "Landing revision"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:51
-#: rhodecode/templates/admin/repos/repo_edit.html:70
+#: rhodecode/templates/admin/repos/repo_edit.html:63
 #: rhodecode/templates/forks/fork.html:42
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:79
+#: rhodecode/templates/admin/repos/repo_edit.html:72
 #: rhodecode/templates/forks/fork.html:60
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
@@ -2167,244 +2399,248 @@ msgstr ""
 #: rhodecode/templates/admin/repos/repo_edit.html:12
 #: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:11
-#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:121
+#: rhodecode/templates/base/base.html:81 rhodecode/templates/base/base.html:134
 #: rhodecode/templates/summary/summary.html:212
 msgid "Settings"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:40
+#: rhodecode/templates/admin/repos/repo_edit.html:36
+msgid "Non-changeable id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:41
 msgid "Clone uri"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:53
+#: rhodecode/templates/admin/repos/repo_edit.html:54
 msgid "Optional select a group to put this repository into."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:126
+#: rhodecode/templates/admin/repos/repo_edit.html:119
 msgid "Change owner of this repository."
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit.html:177
+msgid "Advanced settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:180
+msgid "Statistics"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Advanced settings"
+msgid "Reset current statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:184
+msgid "Confirm to remove current statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:187
-msgid "Statistics"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:191
-msgid "Reset current statistics"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:191
-msgid "Confirm to remove current statistics"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:194
 msgid "Fetched to rev"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:195
+#: rhodecode/templates/admin/repos/repo_edit.html:188
 msgid "Stats gathered"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:203
+#: rhodecode/templates/admin/repos/repo_edit.html:196
 msgid "Remote"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:207
+#: rhodecode/templates/admin/repos/repo_edit.html:200
 msgid "Pull changes from remote location"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:207
+#: rhodecode/templates/admin/repos/repo_edit.html:200
 msgid "Confirm to pull changes from remote side"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit.html:211
+msgid "Cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:215
+msgid "Invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:215
+msgid "Confirm to invalidate repository cache"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit.html:218
-msgid "Cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:222
-msgid "Invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:222
-msgid "Confirm to invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:225
 msgid ""
 "Manually invalidate cache for this repository. On first access repository "
 "will be cached again"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:230
+#: rhodecode/templates/admin/repos/repo_edit.html:223
 msgid "List of cached values"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:233
+#: rhodecode/templates/admin/repos/repo_edit.html:226
 msgid "Prefix"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:234
+#: rhodecode/templates/admin/repos/repo_edit.html:227
 msgid "Key"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:235
+#: rhodecode/templates/admin/repos/repo_edit.html:228
 #: rhodecode/templates/admin/users/user_add.html:86
 #: rhodecode/templates/admin/users/user_edit.html:124
 #: rhodecode/templates/admin/users/users.html:84
 #: rhodecode/templates/admin/users_groups/users_group_add.html:41
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-#: rhodecode/templates/admin/users_groups/users_groups.html:36
+#: rhodecode/templates/admin/users_groups/users_groups.html:39
 msgid "Active"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:250
-#: rhodecode/templates/base/base.html:280 rhodecode/templates/base/base.html:281
+#: rhodecode/templates/admin/repos/repo_edit.html:243
+#: rhodecode/templates/base/base.html:292 rhodecode/templates/base/base.html:293
 msgid "Public journal"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit.html:249
+msgid "Remove from public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:251
+msgid "Add to public journal"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit.html:256
-msgid "Remove from public journal"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:258
-msgid "Add to public journal"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:263
 msgid ""
 "All actions made on this repository will be accessible to everyone in public "
 "journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:270
+#: rhodecode/templates/admin/repos/repo_edit.html:263
 msgid "Locking"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:275
+#: rhodecode/templates/admin/repos/repo_edit.html:268
 msgid "Unlock locked repo"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:275
+#: rhodecode/templates/admin/repos/repo_edit.html:268
 msgid "Confirm to unlock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:278
-msgid "lock repo"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:278
+#: rhodecode/templates/admin/repos/repo_edit.html:271
+msgid "Lock repo"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:271
 msgid "Confirm to lock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:279
+#: rhodecode/templates/admin/repos/repo_edit.html:272
 msgid "Repository is not locked"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit.html:277
+msgid "Force locking on repository. Works only when anonymous access is disabled"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit.html:284
-msgid "Force locking on repository. Works only when anonymous access is disabled"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:291
 msgid "Set as fork of"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:296
-msgid "set"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:300
+#: rhodecode/templates/admin/repos/repo_edit.html:289
+msgid "Set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:293
 msgid "Manually set this repository as a fork of another from the list"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:306
-#: rhodecode/templates/changeset/changeset_file_comment.html:41
-msgid "Delete"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:315
+#: rhodecode/templates/admin/repos/repo_edit.html:308
 msgid "Remove this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:315
+#: rhodecode/templates/admin/repos/repo_edit.html:308
 msgid "Confirm to delete this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:317
+#: rhodecode/templates/admin/repos/repo_edit.html:310
 #, python-format
 msgid "this repository has %s fork"
 msgid_plural "this repository has %s forks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:318
+#: rhodecode/templates/admin/repos/repo_edit.html:311
 msgid "Detach forks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:319
+#: rhodecode/templates/admin/repos/repo_edit.html:312
 msgid "Delete forks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:322
+#: rhodecode/templates/admin/repos/repo_edit.html:315
 msgid ""
 "This repository will be renamed in a special way in order to be unaccesible "
 "for RhodeCode and VCS systems. If you need to fully delete it from file "
 "system please do it manually"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:336
+#: rhodecode/templates/admin/repos/repo_edit.html:329
 msgid "Extra fields"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:348
+#: rhodecode/templates/admin/repos/repo_edit.html:341
 #, python-format
 msgid "Confirm to delete this field: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:362
+#: rhodecode/templates/admin/repos/repo_edit.html:355
 msgid "New field key"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:370
+#: rhodecode/templates/admin/repos/repo_edit.html:363
 msgid "New field label"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:373
+#: rhodecode/templates/admin/repos/repo_edit.html:366
 msgid "Enter short label"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:379
+#: rhodecode/templates/admin/repos/repo_edit.html:372
 msgid "New field description"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:382
+#: rhodecode/templates/admin/repos/repo_edit.html:375
 msgid "Enter description of a field"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3
 msgid "none"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:4
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4
 msgid "read"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:5
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5
 msgid "write"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6
 msgid "admin"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:7
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7
 msgid "member"
 msgstr ""
 
@@ -2416,6 +2652,8 @@ msgstr ""
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35
 msgid "default"
 msgstr ""
 
@@ -2423,33 +2661,37 @@ msgstr ""
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:55
 msgid "revoke"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:83
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81
 msgid "Add another member"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:97
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100
-msgid "Failed to remove user"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:112
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116
-msgid "Failed to remove user group"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repos.html:5
 msgid "Repositories administration"
 msgstr ""
 
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86
-msgid "apply to children"
+#: rhodecode/templates/admin/repos/repos.html:86
+#: rhodecode/templates/admin/users/user_edit_my_account.html:185
+#: rhodecode/templates/admin/users/users.html:109
+#: rhodecode/templates/bookmarks/bookmarks.html:76
+#: rhodecode/templates/branches/branches.html:75
+#: rhodecode/templates/journal/journal.html:206
+#: rhodecode/templates/journal/journal.html:296
+#: rhodecode/templates/tags/tags.html:76
+msgid "No records found."
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
+msgid "apply to children"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88
 msgid ""
 "Set or revoke permission to all children of that group, including non-private"
 " repositories and other groups"
@@ -2475,7 +2717,7 @@ msgstr ""
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16
-#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:82
+#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91
 msgid "Repository groups"
 msgstr ""
 
@@ -2505,7 +2747,7 @@ msgstr ""
 msgid "Add child group"
 msgstr ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68
 msgid ""
 "Enable lock-by-pulling on group. This option will be applied to all other "
 "groups and repositories inside"
@@ -2520,15 +2762,21 @@ msgid "Number of toplevel repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64
+#: rhodecode/templates/admin/users_groups/users_groups.html:48
+#: rhodecode/templates/changeset/changeset_file_comment.html:73
+#: rhodecode/templates/changeset/changeset_file_comment.html:171
 msgid "Edit"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65
+#: rhodecode/templates/admin/users_groups/users_groups.html:49
 #: rhodecode/templates/base/perms_summary.html:29
-#: rhodecode/templates/base/perms_summary.html:48
-#: rhodecode/templates/base/perms_summary.html:50
+#: rhodecode/templates/base/perms_summary.html:60
+#: rhodecode/templates/base/perms_summary.html:62
 #: rhodecode/templates/data_table/_dt_elements.html:116
 #: rhodecode/templates/data_table/_dt_elements.html:117
+#: rhodecode/templates/data_table/_dt_elements.html:130
+#: rhodecode/templates/data_table/_dt_elements.html:131
 msgid "edit"
 msgstr ""
 
@@ -2626,8 +2874,8 @@ msgid "Google Analytics code"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:114
-#: rhodecode/templates/admin/settings/settings.html:186
-#: rhodecode/templates/admin/settings/settings.html:277
+#: rhodecode/templates/admin/settings/settings.html:195
+#: rhodecode/templates/admin/settings/settings.html:287
 msgid "Save settings"
 msgstr ""
 
@@ -2640,133 +2888,152 @@ msgid "General"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:134
-msgid "Use lightweight dashboard"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:140
 msgid "Use repository extra fields"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:147
+#: rhodecode/templates/admin/settings/settings.html:136
+msgid "Allows storing additional customized fields per repository."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:139
+msgid "Show RhodeCode version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:141
+msgid "Shows or hides displayed version of RhodeCode in the footer"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:146
+msgid "Dashboard items"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:150
+msgid "Number of items displayed in lightweight dashboard before pagination is shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:155
 msgid "Icons"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:152
+#: rhodecode/templates/admin/settings/settings.html:160
 msgid "Show public repo icon on repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:156
+#: rhodecode/templates/admin/settings/settings.html:164
 msgid "Show private repo icon on repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:163
+#: rhodecode/templates/admin/settings/settings.html:166
+msgid "Show public/private icons next to repositories names"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:172
 msgid "Meta-Tagging"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:168
+#: rhodecode/templates/admin/settings/settings.html:177
 msgid "Stylify recognised metatags:"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:195
-msgid "VCS settings"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:204
+msgid "VCS settings"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:213
 msgid "Web"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:209
+#: rhodecode/templates/admin/settings/settings.html:218
 msgid "Require SSL for vcs operations"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:211
+#: rhodecode/templates/admin/settings/settings.html:220
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it will "
 "return HTTP Error 406: Not Acceptable"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:217
-msgid "Hooks"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:222
-msgid "Update repository after push (hg update)"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:226
+msgid "Hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:231
+msgid "Update repository after push (hg update)"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:235
 msgid "Show repository size after push"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:230
+#: rhodecode/templates/admin/settings/settings.html:239
 msgid "Log user push commands"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:234
-msgid "Log user pull commands"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:238
-msgid "Advanced setup"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:243
-msgid "Mercurial Extensions"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:248
-msgid "Enable largefiles extension"
+msgid "Log user pull commands"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:247
+msgid "Advanced setup"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:252
+msgid "Mercurial Extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:257
+msgid "Enable largefiles extension"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:261
 msgid "Enable hgsubversion extension"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:254
+#: rhodecode/templates/admin/settings/settings.html:263
 msgid ""
 "Requires hgsubversion library installed. Allows cloning from svn remote "
 "locations"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:264
+#: rhodecode/templates/admin/settings/settings.html:274
 msgid "Repositories location"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:269
+#: rhodecode/templates/admin/settings/settings.html:279
 msgid ""
-"This a crucial application setting. If you are really sure you need to change"
-" this, you must restart application in order to make this setting take "
-"effect. Click this label to unlock."
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:270
-#: rhodecode/templates/base/base.html:131
+"Click to unlock. You must restart RhodeCode in order to make this setting "
+"take effect."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:280
+#: rhodecode/templates/base/base.html:143
 msgid "Unlock"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:272
+#: rhodecode/templates/admin/settings/settings.html:282
 msgid ""
 "Location where repositories are stored. After changing this value a restart, "
 "and rescan is required"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:292
+#: rhodecode/templates/admin/settings/settings.html:303
 msgid "Test Email"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:300
+#: rhodecode/templates/admin/settings/settings.html:311
 msgid "Email to"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:308
+#: rhodecode/templates/admin/settings/settings.html:319
 msgid "Send"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:314
+#: rhodecode/templates/admin/settings/settings.html:325
 msgid "System Info and Packages"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:317
-#: rhodecode/templates/changelog/changelog.html:42
+#: rhodecode/templates/admin/settings/settings.html:328
+#: rhodecode/templates/changelog/changelog.html:51
 msgid "Show"
 msgstr ""
 
@@ -2776,7 +3043,7 @@ msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:10
 #: rhodecode/templates/admin/users/user_edit.html:11
-#: rhodecode/templates/base/base.html:71
+#: rhodecode/templates/base/base.html:76
 msgid "Users"
 msgstr ""
 
@@ -2833,44 +3100,21 @@ msgstr ""
 msgid "New password confirmation"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:158
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:108
-msgid "Inherit default permissions"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit.html:163
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:113
-#, python-format
-msgid ""
-"Select to inherit permissions from %s settings. With this selected below "
-"options does not have any action"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:169
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:119
-msgid "Create repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:177
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:127
-msgid "Fork repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:200
 msgid "Email addresses"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:213
+#: rhodecode/templates/admin/users/user_edit.html:176
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:227
+#: rhodecode/templates/admin/users/user_edit.html:190
 msgid "New email address"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:242
+#: rhodecode/templates/base/base.html:254
 msgid "My account"
 msgstr ""
 
@@ -2907,7 +3151,7 @@ msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45
-#: rhodecode/templates/pullrequests/pullrequest_data.html:7
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
 #: rhodecode/templates/pullrequests/pullrequest_show.html:27
 #: rhodecode/templates/pullrequests/pullrequest_show.html:42
 msgid "Closed"
@@ -2927,7 +3171,7 @@ msgid "I participate in"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42
-#: rhodecode/templates/pullrequests/pullrequest_data.html:11
+#: rhodecode/templates/pullrequests/pullrequest_data.html:8
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
 msgstr ""
@@ -2958,12 +3202,12 @@ msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:10
 #: rhodecode/templates/admin/users_groups/users_groups.html:11
-#: rhodecode/templates/base/base.html:72
+#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94
 msgid "User groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:12
-#: rhodecode/templates/admin/users_groups/users_groups.html:25
+#: rhodecode/templates/admin/users_groups/users_groups.html:26
 msgid "Add new user group"
 msgstr ""
 
@@ -2976,7 +3220,7 @@ msgid "UserGroups"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:50
-#: rhodecode/templates/admin/users_groups/users_groups.html:35
+#: rhodecode/templates/admin/users_groups/users_groups.html:38
 msgid "Members"
 msgstr ""
 
@@ -2996,45 +3240,53 @@ msgstr ""
 msgid "Add all elements"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:150
-msgid "Group members"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:167
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:109
 msgid "No members yet"
 msgstr ""
 
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:117
+msgid "Global Permissions"
+msgstr ""
+
 #: rhodecode/templates/admin/users_groups/users_groups.html:5
 msgid "User groups administration"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_groups.html:47
+#: rhodecode/templates/admin/users_groups/users_groups.html:55
 #, python-format
 msgid "Confirm to delete this user group: %s"
 msgstr ""
 
+#: rhodecode/templates/admin/users_groups/users_groups.html:62
+msgid "There are no user groups yet"
+msgstr ""
+
 #: rhodecode/templates/base/base.html:42
-msgid "Submit a bug"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:108
+#, python-format
+msgid "Server instance: %s"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:52
+msgid "Report a bug"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:121
 #: rhodecode/templates/data_table/_dt_elements.html:9
 #: rhodecode/templates/data_table/_dt_elements.html:11
 #: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/pullrequests/pullrequest_show.html:81
 #: rhodecode/templates/summary/summary.html:8
 msgid "Summary"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:109
-#: rhodecode/templates/changelog/changelog.html:11
+#: rhodecode/templates/base/base.html:122
+#: rhodecode/templates/changelog/changelog.html:15
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
 #: rhodecode/templates/data_table/_dt_elements.html:21
 msgid "Changelog"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:110
+#: rhodecode/templates/base/base.html:123
 #: rhodecode/templates/data_table/_dt_elements.html:25
 #: rhodecode/templates/data_table/_dt_elements.html:27
 #: rhodecode/templates/data_table/_dt_elements.html:29
@@ -3042,46 +3294,42 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:112
+#: rhodecode/templates/base/base.html:125
 msgid "Switch To"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:114 rhodecode/templates/base/base.html:267
+#: rhodecode/templates/base/base.html:127 rhodecode/templates/base/base.html:279
 msgid "loading..."
 msgstr ""
 
-#: rhodecode/templates/base/base.html:118
+#: rhodecode/templates/base/base.html:131
 msgid "Options"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:124
+#: rhodecode/templates/base/base.html:137
 #: rhodecode/templates/forks/forks_data.html:21
 msgid "Compare fork"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:126
-msgid "Lightweight changelog"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:127 rhodecode/templates/base/base.html:287
+#: rhodecode/templates/base/base.html:139 rhodecode/templates/base/base.html:312
 #: rhodecode/templates/search/search.html:14
 #: rhodecode/templates/search/search.html:54
 msgid "Search"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:133
+#: rhodecode/templates/base/base.html:145
 msgid "Lock"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:141
+#: rhodecode/templates/base/base.html:153
 msgid "Follow"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:142
+#: rhodecode/templates/base/base.html:154
 msgid "Unfollow"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:145
+#: rhodecode/templates/base/base.html:157
 #: rhodecode/templates/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 #: rhodecode/templates/data_table/_dt_elements.html:37
@@ -3090,60 +3338,113 @@ msgstr ""
 msgid "Fork"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:147
+#: rhodecode/templates/base/base.html:159
 msgid "Create Pull Request"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:165
 msgid "Show Pull Requests"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:165
 msgid "Pull Requests"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:190
+#: rhodecode/templates/base/base.html:202
 msgid "Not logged in"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:197
+#: rhodecode/templates/base/base.html:209
 msgid "Login to your account"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:220
+#: rhodecode/templates/base/base.html:232
 msgid "Forgot password ?"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:243
+#: rhodecode/templates/base/base.html:255
 msgid "Log Out"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:262
-msgid "Switch repository"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:274
-msgid "Show recent activity"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:275
-#: rhodecode/templates/journal/journal.html:4
-msgid "Journal"
+msgid "Switch repository"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:286
+msgid "Show recent activity"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:287
+#: rhodecode/templates/journal/journal.html:4
+msgid "Journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:298
+msgid "Show public gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:303
+msgid "All public gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:305
+msgid "My public gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:306
+msgid "My private gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:311
 msgid "Search in repositories"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:8
+#: rhodecode/templates/base/default_perms_box.html:14
+msgid "Inherit default permissions"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:18
+#, python-format
+msgid ""
+"Select to inherit permissions from %s settings. With this selected below "
+"options does not apply."
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:26
+msgid "Create repositories"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:30
+msgid "Select this option to allow repository creation for this user"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:35
+msgid "Create user groups"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:39
+msgid "Select this option to allow user group creation for this user"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:44
+msgid "Fork repositories"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:48
+msgid "Select this option to allow repository forking for this user"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:11
 msgid "No permissions defined yet"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:15
+#: rhodecode/templates/base/perms_summary.html:19
+#: rhodecode/templates/base/perms_summary.html:38
 msgid "Permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:16
+#: rhodecode/templates/base/perms_summary.html:20
+#: rhodecode/templates/base/perms_summary.html:39
 msgid "Edit Permission"
 msgstr ""
 
@@ -3152,7 +3453,7 @@ msgid "Add another comment"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:44
-#: rhodecode/templates/data_table/_dt_elements.html:140
+#: rhodecode/templates/data_table/_dt_elements.html:147
 msgid "Stop following this repository"
 msgstr ""
 
@@ -3169,7 +3470,7 @@ msgid "members"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:48
-#: rhodecode/templates/pullrequests/pullrequest.html:181
+#: rhodecode/templates/pullrequests/pullrequest.html:203
 msgid "Loading ..."
 msgstr ""
 
@@ -3182,7 +3483,7 @@ msgid "No matching files"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:51
-#: rhodecode/templates/changelog/changelog.html:36
+#: rhodecode/templates/changelog/changelog.html:45
 msgid "Open new pull request"
 msgstr ""
 
@@ -3211,29 +3512,45 @@ msgstr ""
 msgid "Expand diff"
 msgstr ""
 
+#: rhodecode/templates/base/root.html:58
+msgid "Failed to remoke permission"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr ""
 
-#: rhodecode/templates/bookmarks/bookmarks.html:37
+#: rhodecode/templates/bookmarks/bookmarks.html:26
+msgid "Compare bookmarks"
+msgstr ""
+
+#: rhodecode/templates/bookmarks/bookmarks.html:51
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
 #: rhodecode/templates/branches/branches.html:50
 #: rhodecode/templates/branches/branches_data.html:8
-#: rhodecode/templates/shortlog/shortlog_data.html:8
+#: rhodecode/templates/changelog/changelog_summary_data.html:8
 #: rhodecode/templates/tags/tags.html:51 rhodecode/templates/tags/tags_data.html:8
 msgid "Author"
 msgstr ""
 
-#: rhodecode/templates/bookmarks/bookmarks.html:38
+#: rhodecode/templates/bookmarks/bookmarks.html:52
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
 #: rhodecode/templates/branches/branches.html:51
 #: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/shortlog/shortlog_data.html:5
+#: rhodecode/templates/changelog/changelog_summary_data.html:5
 #: rhodecode/templates/tags/tags.html:52 rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr ""
 
+#: rhodecode/templates/bookmarks/bookmarks.html:54
+#: rhodecode/templates/bookmarks/bookmarks_data.html:10
+#: rhodecode/templates/branches/branches.html:53
+#: rhodecode/templates/branches/branches_data.html:10
+#: rhodecode/templates/tags/tags.html:54 rhodecode/templates/tags/tags_data.html:10
+msgid "Compare"
+msgstr ""
+
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
@@ -3243,64 +3560,68 @@ msgstr ""
 msgid "Compare branches"
 msgstr ""
 
-#: rhodecode/templates/branches/branches.html:53
-#: rhodecode/templates/branches/branches_data.html:10
-#: rhodecode/templates/tags/tags.html:54 rhodecode/templates/tags/tags_data.html:10
-msgid "Compare"
-msgstr ""
-
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:11
+#: rhodecode/templates/changelog/changelog.html:19
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changelog/changelog.html:30
+#: rhodecode/templates/changelog/changelog.html:39
 msgid "Clear selection"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:33
+#: rhodecode/templates/changelog/changelog.html:42
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:33
+#: rhodecode/templates/changelog/changelog.html:42
 msgid "Compare fork with parent"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:76
-#: rhodecode/templates/summary/summary.html:404
+#: rhodecode/templates/changelog/changelog.html:78
+#: rhodecode/templates/changelog/changelog_summary_data.html:28
+#, python-format
+msgid "Click to open associated pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:102
+#: rhodecode/templates/summary/summary.html:403
 msgid "Show more"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:89
+#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changelog/changelog_summary_data.html:50
+#: rhodecode/templates/changeset/changeset.html:107
 #: rhodecode/templates/changeset/changeset_range.html:86
 #, python-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:95
-#: rhodecode/templates/changeset/changeset.html:111
+#: rhodecode/templates/changelog/changelog.html:121
+#: rhodecode/templates/changelog/changelog_summary_data.html:56
+#: rhodecode/templates/changeset/changeset.html:113
 #: rhodecode/templates/changeset/changeset_range.html:92
 #, python-format
 msgid "Tag %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:100
-#: rhodecode/templates/changeset/changeset.html:106
-#: rhodecode/templates/changeset/changeset_range.html:80
+#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog_summary_data.html:61
+#: rhodecode/templates/changeset/changeset.html:117
+#: rhodecode/templates/changeset/changeset_range.html:96
 #, python-format
 msgid "Branch %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:258
+#: rhodecode/templates/changelog/changelog.html:286
 msgid "There are no changes yet"
 msgstr ""
 
@@ -3329,6 +3650,38 @@ msgstr ""
 msgid "Affected %s files"
 msgstr ""
 
+#: rhodecode/templates/changelog/changelog_summary_data.html:6
+#: rhodecode/templates/files/files_add.html:75
+#: rhodecode/templates/files/files_edit.html:61
+msgid "Commit message"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:7
+msgid "Age"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:9
+msgid "Refs"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:86
+msgid "Add or upload files directly via RhodeCode"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:89
+#: rhodecode/templates/files/files_add.html:38
+#: rhodecode/templates/files/files_browser.html:31
+msgid "Add new file"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:95
+msgid "Push new repo"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:103
+msgid "Existing repository?"
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset.html:6
 #, python-format
 msgid "%s Changeset"
@@ -3349,7 +3702,7 @@ msgid "Changeset status"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:67
-#: rhodecode/templates/changeset/diff_block.html:23
+#: rhodecode/templates/changeset/diff_block.html:22
 msgid "Raw diff"
 msgstr ""
 
@@ -3358,12 +3711,12 @@ msgid "Patch diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:69
-#: rhodecode/templates/changeset/diff_block.html:24
+#: rhodecode/templates/changeset/diff_block.html:23
 msgid "Download diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:97
+#: rhodecode/templates/changeset/changeset_file_comment.html:103
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -3371,7 +3724,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:97
+#: rhodecode/templates/changeset/changeset_file_comment.html:103
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
@@ -3379,11 +3732,11 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/changeset/changeset.html:103
-#: rhodecode/templates/changeset/changeset_range.html:77
+#: rhodecode/templates/changeset/changeset_range.html:82
 msgid "merge"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:119
+#: rhodecode/templates/changeset/changeset.html:126
 #: rhodecode/templates/compare/compare_diff.html:40
 #: rhodecode/templates/pullrequests/pullrequest_show.html:113
 #, python-format
@@ -3392,7 +3745,7 @@ msgid_plural "%s files changed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:121
+#: rhodecode/templates/changeset/changeset.html:128
 #: rhodecode/templates/compare/compare_diff.html:42
 #: rhodecode/templates/pullrequests/pullrequest_show.html:115
 #, python-format
@@ -3401,15 +3754,15 @@ msgid_plural "%s files changed with %s i
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:134
-#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/changeset/changeset.html:141
+#: rhodecode/templates/changeset/changeset.html:153
 #: rhodecode/templates/pullrequests/pullrequest_show.html:131
 #: rhodecode/templates/pullrequests/pullrequest_show.html:195
 msgid "Showing a huge diff might take some time and resources"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:134
-#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/changeset/changeset.html:141
+#: rhodecode/templates/changeset/changeset.html:153
 #: rhodecode/templates/compare/compare_diff.html:58
 #: rhodecode/templates/compare/compare_diff.html:69
 #: rhodecode/templates/pullrequests/pullrequest_show.html:131
@@ -3427,51 +3780,63 @@ msgstr ""
 msgid "Comment on pull request #%s"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:57
+#: rhodecode/templates/changeset/changeset_file_comment.html:55
 msgid "Submitting..."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:60
+#: rhodecode/templates/changeset/changeset_file_comment.html:58
 msgid "Commenting on line {1}."
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset_file_comment.html:59
+#: rhodecode/templates/changeset/changeset_file_comment.html:145
+#, python-format
+msgid "Comments parsed using %s syntax with %s support."
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset_file_comment.html:61
-#: rhodecode/templates/changeset/changeset_file_comment.html:139
-#, python-format
-msgid "Comments parsed using %s syntax with %s support."
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:63
-#: rhodecode/templates/changeset/changeset_file_comment.html:141
+#: rhodecode/templates/changeset/changeset_file_comment.html:147
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:74
-#: rhodecode/templates/changeset/changeset_file_comment.html:161
+#: rhodecode/templates/changeset/changeset_file_comment.html:65
+#: rhodecode/templates/changeset/changeset_file_comment.html:152
+msgid "Preview"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:72
+#: rhodecode/templates/changeset/changeset_file_comment.html:170
+msgid "Comment preview"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:80
+#: rhodecode/templates/changeset/changeset_file_comment.html:177
+#: rhodecode/templates/email_templates/changeset_comment.html:16
+#: rhodecode/templates/email_templates/pull_request_comment.html:16
 msgid "Comment"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:75
+#: rhodecode/templates/changeset/changeset_file_comment.html:81
 msgid "Cancel"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:88
 msgid "You need to be logged in to comment."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:88
 msgid "Login now"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:86
+#: rhodecode/templates/changeset/changeset_file_comment.html:92
 msgid "Hide"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:143
+#: rhodecode/templates/changeset/changeset_file_comment.html:149
 msgid "Change status"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:163
+#: rhodecode/templates/changeset/changeset_file_comment.html:179
 msgid "Comment and close"
 msgstr ""
 
@@ -3484,19 +3849,19 @@ msgstr ""
 msgid "Files affected"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:22
+#: rhodecode/templates/changeset/diff_block.html:21
 msgid "Show full diff for this file"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:30
+#: rhodecode/templates/changeset/diff_block.html:29
 msgid "Show inline comments"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:55
+#: rhodecode/templates/changeset/diff_block.html:53
 msgid "Show file at latest version in this repo"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:56
+#: rhodecode/templates/changeset/diff_block.html:54
 msgid "Show file at initial version in this repo"
 msgstr ""
 
@@ -3571,27 +3936,24 @@ msgstr ""
 msgid "Confirm to delete this repository: %s"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:131
+#: rhodecode/templates/data_table/_dt_elements.html:137
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
 
-#: rhodecode/templates/email_templates/changeset_comment.html:9
-#: rhodecode/templates/email_templates/pull_request_comment.html:15
-msgid "New status"
-msgstr ""
-
-#: rhodecode/templates/email_templates/changeset_comment.html:11
-#: rhodecode/templates/email_templates/pull_request_comment.html:9
-msgid "View this comment here"
+#: rhodecode/templates/email_templates/changeset_comment.html:4
+#: rhodecode/templates/email_templates/pull_request.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:4
+msgid "URL"
+msgstr ""
+
+#: rhodecode/templates/email_templates/changeset_comment.html:6
+#, python-format
+msgid "%s commented on a %s changeset."
 msgstr ""
 
 #: rhodecode/templates/email_templates/changeset_comment.html:14
-msgid "Repo"
-msgstr ""
-
-#: rhodecode/templates/email_templates/changeset_comment.html:16
-msgid "desc"
+msgid "The changeset status was changed to"
 msgstr ""
 
 #: rhodecode/templates/email_templates/main.html:8
@@ -3611,45 +3973,36 @@ msgstr ""
 msgid "You can generate it by clicking following URL"
 msgstr ""
 
-#: rhodecode/templates/email_templates/password_reset.html:11
-msgid "If you did not request new password please ignore this email."
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request.html:4
-#, python-format
-msgid "User %s opened pull request for repository %s and wants you to review changes."
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request.html:5
-msgid "View this pull request here"
+#: rhodecode/templates/email_templates/password_reset.html:10
+msgid "Please ignore this email if you did not request a new password ."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:6
-msgid "title"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request.html:7
-msgid "description"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request.html:12
-msgid "revisions for reviewing"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.html:3
+#, python-format
+msgid "%s opened a pull request for repository %s and wants you to review changes."
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request.html:8
+#: rhodecode/templates/pullrequests/pullrequest.html:34
+#: rhodecode/templates/pullrequests/pullrequest_data.html:14
+#: rhodecode/templates/pullrequests/pullrequest_show.html:25
+msgid "Title"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.html:6
 #, python-format
-msgid "Pull request #%s for repository %s"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.html:13
-msgid "Closing pull request with status"
-msgstr ""
-
-#: rhodecode/templates/email_templates/registration.html:4
-msgid "A new user have registered in RhodeCode"
-msgstr ""
-
-#: rhodecode/templates/email_templates/registration.html:9
+msgid "%s commented on pull request \"%s\""
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.html:10
+msgid "Pull request was closed with status"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.html:12
+msgid "Pull request changed status"
+msgstr ""
+
+#: rhodecode/templates/email_templates/registration.html:6
 msgid "View this user here"
 msgstr ""
 
@@ -3675,7 +4028,6 @@ msgstr ""
 #: rhodecode/templates/files/files.html:30
 #: rhodecode/templates/files/files_add.html:31
 #: rhodecode/templates/files/files_edit.html:31
-#: rhodecode/templates/shortlog/shortlog_data.html:9
 msgid "Branch"
 msgstr ""
 
@@ -3688,12 +4040,6 @@ msgstr ""
 msgid "Add file"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:38
-#: rhodecode/templates/files/files_browser.html:31
-#: rhodecode/templates/shortlog/shortlog_data.html:78
-msgid "Add new file"
-msgstr ""
-
 #: rhodecode/templates/files/files_add.html:43
 msgid "File Name"
 msgstr ""
@@ -3722,12 +4068,6 @@ msgstr ""
 msgid "use / to separate directories"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:75
-#: rhodecode/templates/files/files_edit.html:61
-#: rhodecode/templates/shortlog/shortlog_data.html:6
-msgid "Commit message"
-msgstr ""
-
 #: rhodecode/templates/files/files_add.html:79
 #: rhodecode/templates/files/files_edit.html:65
 msgid "Commit changes"
@@ -3791,12 +4131,6 @@ msgstr ""
 msgid "Show annotation"
 msgstr ""
 
-#: rhodecode/templates/files/files_edit.html:48
-#: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:55
-msgid "Show as raw"
-msgstr ""
-
 #: rhodecode/templates/files/files_edit.html:49
 #: rhodecode/templates/files/files_source.html:26
 msgid "Download as raw"
@@ -3985,36 +4319,47 @@ msgstr ""
 msgid "New pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:52
-msgid "Detailed compare view"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.html:56
+#: rhodecode/templates/pullrequests/pullrequest.html:25
+msgid "Create new pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:47
+msgid "Write a short description on this pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:53
+msgid "Changeset flow"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:60
+#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+msgid "Origin repository"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:85
+msgid "Send pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:94
 #: rhodecode/templates/pullrequests/pullrequest_show.html:137
 msgid "Pull request reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:65
+#: rhodecode/templates/pullrequests/pullrequest.html:103
 #: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "owner"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:77
+#: rhodecode/templates/pullrequests/pullrequest.html:115
 msgid "Add reviewer to this pull request."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:83
-msgid "Create new pull request"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.html:92
-#: rhodecode/templates/pullrequests/pullrequest_data.html:14
-#: rhodecode/templates/pullrequests/pullrequest_show.html:25
-msgid "Title"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.html:109
-msgid "Send pull request"
+#: rhodecode/templates/pullrequests/pullrequest.html:129
+msgid "Detailed compare view"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:150
+msgid "Destination repository"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
@@ -4045,10 +4390,6 @@ msgstr[1] ""
 msgid "Pull request was reviewed by all reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
-msgid "Origin repository"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest_show.html:89
 msgid "Created on"
 msgstr ""
@@ -4109,37 +4450,6 @@ msgstr ""
 msgid "Permission denied"
 msgstr ""
 
-#: rhodecode/templates/shortlog/shortlog.html:5
-#, python-format
-msgid "%s Lightweight Changelog"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog.html:11
-#: rhodecode/templates/shortlog/shortlog.html:15
-msgid "Lightweight Changelog"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog_data.html:7
-msgid "Age"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog_data.html:20
-#, python-format
-msgid "Click to open associated pull request #%s"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog_data.html:75
-msgid "Add or upload files directly via RhodeCode"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog_data.html:84
-msgid "Push new repo"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog_data.html:92
-msgid "Existing repository?"
-msgstr ""
-
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
@@ -4178,7 +4488,7 @@ msgstr ""
 msgid "Fork of"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:96
+#: rhodecode/templates/summary/summary.html:97
 msgid "Remote clone"
 msgstr ""
 
@@ -4204,8 +4514,7 @@ msgstr ""
 
 #: rhodecode/templates/summary/summary.html:151
 #: rhodecode/templates/summary/summary.html:167
-#: rhodecode/templates/summary/summary.html:232
-msgid "enable"
+msgid "Enable"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:159
@@ -4220,7 +4529,7 @@ msgstr ""
 msgid "Downloads are disabled for this repository"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:171
+#: rhodecode/templates/summary/summary.html:170
 msgid "Download as zip"
 msgstr ""
 
@@ -4245,6 +4554,10 @@ msgstr ""
 msgid "Commit activity by day / author"
 msgstr ""
 
+#: rhodecode/templates/summary/summary.html:232
+msgid "enable"
+msgstr ""
+
 #: rhodecode/templates/summary/summary.html:235
 msgid "Stats gathered: "
 msgstr ""
@@ -4259,51 +4572,47 @@ msgstr ""
 
 #: rhodecode/templates/summary/summary.html:272
 #, python-format
-msgid "Readme file at revision '%s'"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:275
-msgid "Permalink to this readme"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:333
+msgid "Readme file from revision %s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:332
 #, python-format
 msgid "Download %s as %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:380
+#: rhodecode/templates/summary/summary.html:379
 msgid "files"
 msgstr ""
 
+#: rhodecode/templates/summary/summary.html:689
+msgid "commits"
+msgstr ""
+
 #: rhodecode/templates/summary/summary.html:690
-msgid "commits"
+msgid "files added"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:691
-msgid "files added"
+msgid "files changed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:692
-msgid "files changed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:693
 msgid "files removed"
 msgstr ""
 
+#: rhodecode/templates/summary/summary.html:694
+msgid "commit"
+msgstr ""
+
 #: rhodecode/templates/summary/summary.html:695
-msgid "commit"
+msgid "file added"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:696
-msgid "file added"
+msgid "file changed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:697
-msgid "file changed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:698
 msgid "file removed"
 msgstr ""