diff --git a/rhodecode/i18n/rhodecode.pot b/rhodecode/i18n/rhodecode.pot
--- a/rhodecode/i18n/rhodecode.pot
+++ b/rhodecode/i18n/rhodecode.pot
@@ -6,273 +6,477 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: RhodeCode 1.1.5\n"
+"Project-Id-Version: RhodeCode 1.2.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-03-17 02:38+0100\n"
+"POT-Creation-Date: 2011-09-14 15:50-0300\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.5\n"
-
-#: rhodecode/controllers/changeset.py:87 rhodecode/controllers/changeset.py:113
-#: rhodecode/controllers/changeset.py:159 rhodecode/controllers/changeset.py:171
+"Generated-By: Babel 0.9.6\n"
+
+#: rhodecode/controllers/changeset.py:108 rhodecode/controllers/changeset.py:149
+#: rhodecode/controllers/changeset.py:216 rhodecode/controllers/changeset.py:229
 msgid "binary file"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:95 rhodecode/controllers/changeset.py:122
+#: rhodecode/controllers/changeset.py:123 rhodecode/controllers/changeset.py:168
 msgid "Changeset is to big and was cut off, see raw changeset instead"
 msgstr ""
 
-#: rhodecode/controllers/error.py:70
+#: rhodecode/controllers/changeset.py:159
+msgid "Diff is to big and was cut off, see raw diff instead"
+msgstr ""
+
+#: rhodecode/controllers/error.py:69
 msgid "Home page"
 msgstr ""
 
-#: rhodecode/controllers/error.py:100
+#: rhodecode/controllers/error.py:98
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr ""
 
-#: rhodecode/controllers/error.py:102
+#: rhodecode/controllers/error.py:101
 msgid "Unauthorized access to resource"
 msgstr ""
 
-#: rhodecode/controllers/error.py:104
+#: rhodecode/controllers/error.py:103
 msgid "You don't have permission to view this page"
 msgstr ""
 
-#: rhodecode/controllers/error.py:106
+#: rhodecode/controllers/error.py:105
 msgid "The resource could not be found"
 msgstr ""
 
-#: rhodecode/controllers/error.py:108
+#: rhodecode/controllers/error.py:107
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr ""
 
-#: rhodecode/controllers/files.py:71
+#: rhodecode/controllers/feed.py:48
+#, python-format
+msgid "Changes on %s repository"
+msgstr ""
+
+#: rhodecode/controllers/feed.py:49
+#, python-format
+msgid "%s %s feed"
+msgstr ""
+
+#: rhodecode/controllers/files.py:72
 msgid "There are no files yet"
 msgstr ""
 
-#: rhodecode/controllers/files.py:222 rhodecode/controllers/files.py:228
-msgid "binary file changed"
-msgstr ""
-
-#: rhodecode/controllers/files.py:233 rhodecode/controllers/files.py:241
-msgid "Diff is to big to display"
-msgstr ""
-
-#: rhodecode/controllers/files.py:235 rhodecode/controllers/files.py:243
+#: rhodecode/controllers/files.py:262
+#, python-format
+msgid "Edited %s via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:267 rhodecode/templates/files/file_diff.html:40
+msgid "No changes"
+msgstr ""
+
+#: rhodecode/controllers/files.py:278
+#, python-format
+msgid "Successfully committed to %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:283
+msgid "Error occurred during commit"
+msgstr ""
+
+#: rhodecode/controllers/files.py:308
+msgid "downloads disabled"
+msgstr ""
+
+#: rhodecode/controllers/files.py:313
+#, python-format
+msgid "Unknown revision %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:315
+msgid "Empty repository"
+msgstr ""
+
+#: rhodecode/controllers/files.py:317
+msgid "Unknown archive type"
+msgstr ""
+
+#: rhodecode/controllers/files.py:385 rhodecode/controllers/files.py:398
 msgid "Binary file"
 msgstr ""
 
-#: rhodecode/controllers/files.py:258
+#: rhodecode/controllers/files.py:417
+#: rhodecode/templates/changeset/changeset_range.html:4
+#: rhodecode/templates/changeset/changeset_range.html:12
+#: rhodecode/templates/changeset/changeset_range.html:29
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:259 rhodecode/templates/branches/branches.html:5
-#: rhodecode/templates/summary/summary.html:633
+#: rhodecode/controllers/files.py:418 rhodecode/controllers/summary.py:175
+#: rhodecode/templates/branches/branches.html:5
+#: rhodecode/templates/summary/summary.html:690
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:260 rhodecode/templates/summary/summary.html:622
+#: rhodecode/controllers/files.py:419 rhodecode/controllers/summary.py:176
+#: rhodecode/templates/summary/summary.html:679
 #: rhodecode/templates/tags/tags.html:5
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/controllers/login.py:112
+#: rhodecode/controllers/journal.py:50
+#, python-format
+msgid "%s public journal %s feed"
+msgstr ""
+
+#: rhodecode/controllers/journal.py:178 rhodecode/controllers/journal.py:212
+#: rhodecode/templates/admin/repos/repo_edit.html:171
+#: rhodecode/templates/base/base.html:50
+msgid "Public journal"
+msgstr ""
+
+#: rhodecode/controllers/login.py:111
 msgid "You have successfully registered into rhodecode"
 msgstr ""
 
-#: rhodecode/controllers/login.py:134
-msgid "Your new password was sent"
-msgstr ""
-
-#: rhodecode/controllers/search.py:111
+#: rhodecode/controllers/login.py:133
+msgid "Your password reset link was sent"
+msgstr ""
+
+#: rhodecode/controllers/login.py:155
+msgid "Your password reset was successful, new password has been sent to your email"
+msgstr ""
+
+#: rhodecode/controllers/search.py:109
 msgid "Invalid search query. Try quoting it."
 msgstr ""
 
-#: rhodecode/controllers/search.py:116
+#: rhodecode/controllers/search.py:114
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:59 rhodecode/controllers/settings.py:152
+#: rhodecode/controllers/search.py:118
+msgid "An error occurred during this search operation"
+msgstr ""
+
+#: rhodecode/controllers/settings.py:61 rhodecode/controllers/settings.py:171
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from the "
 "file system please run the application again in order to rescan repositories"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:90 rhodecode/controllers/admin/repos.py:142
+#: rhodecode/controllers/settings.py:109 rhodecode/controllers/admin/repos.py:239
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:107 rhodecode/controllers/admin/repos.py:175
+#: rhodecode/controllers/settings.py:126 rhodecode/controllers/admin/repos.py:257
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:126 rhodecode/controllers/admin/repos.py:193
+#: rhodecode/controllers/settings.py:144 rhodecode/controllers/admin/repos.py:275
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from the "
 "filesystem please run the application again in order to rescan repositories"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:138 rhodecode/controllers/admin/repos.py:205
+#: rhodecode/controllers/settings.py:156 rhodecode/controllers/admin/repos.py:287
 #, python-format
 msgid "deleted repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:140 rhodecode/controllers/admin/repos.py:209
+#: rhodecode/controllers/settings.py:159 rhodecode/controllers/admin/repos.py:297
+#: rhodecode/controllers/admin/repos.py:303
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:174
+#: rhodecode/controllers/settings.py:193
 #, python-format
 msgid "forked %s repository as %s"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:114
+#: rhodecode/controllers/settings.py:211
+#, python-format
+msgid "An error occurred during repository forking %s"
+msgstr ""
+
+#: rhodecode/controllers/summary.py:123
 msgid "No data loaded yet"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:117
-msgid "Statistics update are disabled for this repository"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:84
+#: rhodecode/controllers/summary.py:126
+msgid "Statistics are disabled for this repository"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:49
+msgid "BASE"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:50
+msgid "ONELEVEL"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:51
+msgid "SUBTREE"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:55
+msgid "NEVER"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:56
+msgid "ALLOW"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:57
+msgid "TRY"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:58
+msgid "DEMAND"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:59
+msgid "HARD"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:63
+msgid "No encryption"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:64
+msgid "LDAPS connection"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:65
+msgid "START_TLS on LDAP connection"
+msgstr ""
+
+#: rhodecode/controllers/admin/ldap_settings.py:115
 msgid "Ldap settings updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/ldap_settings.py:89
+#: rhodecode/controllers/admin/ldap_settings.py:120
 msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
 msgstr ""
 
-#: rhodecode/controllers/admin/ldap_settings.py:102
+#: rhodecode/controllers/admin/ldap_settings.py:134
 msgid "error occurred during update of ldap settings"
 msgstr ""
 
+#: rhodecode/controllers/admin/permissions.py:56
+msgid "None"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:57
+msgid "Read"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:58
+msgid "Write"
+msgstr ""
+
 #: rhodecode/controllers/admin/permissions.py:59
-msgid "None"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:60
-msgid "Read"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:61
-msgid "Write"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:62
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
 #: rhodecode/templates/admin/repos/repo_add.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:9
 #: rhodecode/templates/admin/repos/repos.html:10
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
+#: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:9
 #: rhodecode/templates/admin/users/user_add.html:8
 #: rhodecode/templates/admin/users/user_edit.html:9
-#: rhodecode/templates/admin/users/user_edit.html:97
+#: rhodecode/templates/admin/users/user_edit.html:110
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:209 rhodecode/templates/base/base.html:297
-#: rhodecode/templates/base/base.html:299 rhodecode/templates/base/base.html:301
+#: 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:279 rhodecode/templates/base/base.html:366
+#: rhodecode/templates/base/base.html:368 rhodecode/templates/base/base.html:370
 msgid "Admin"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:65
+#: rhodecode/controllers/admin/permissions.py:62
 msgid "disabled"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:67
+#: rhodecode/controllers/admin/permissions.py:64
 msgid "allowed with manual account activation"
 msgstr ""
 
+#: rhodecode/controllers/admin/permissions.py:66
+msgid "allowed with automatic account activation"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:68
+msgid "Disabled"
+msgstr ""
+
 #: rhodecode/controllers/admin/permissions.py:69
-msgid "allowed with automatic account activation"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:71
-msgid "Disabled"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:72
 msgid "Enabled"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:106
+#: rhodecode/controllers/admin/permissions.py:102
 msgid "Default permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:123
+#: rhodecode/controllers/admin/permissions.py:119
 msgid "error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:83
-#, python-format
-msgid "created repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:110
-#, python-format
-msgid "error occurred during creation of repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:225
-msgid "An error occurred during deletion of repository user"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:240
-msgid "An error occurred during deletion of repository stats"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:254
-msgid "An error occurred during cache invalidation"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:272
+#: rhodecode/controllers/admin/repos.py:96
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from the "
 "filesystem please run the application again in order to rescan repositories"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:112
-msgid "Repositories successfully rescanned"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:119
+#: rhodecode/controllers/admin/repos.py:172
+#, python-format
+msgid "created repository %s from %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:176
+#, python-format
+msgid "created repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:205
+#, python-format
+msgid "error occurred during creation of repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:292
+#, python-format
+msgid "Cannot delete %s it still contains attached forks"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:320
+msgid "An error occurred during deletion of repository user"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:335
+msgid "An error occurred during deletion of repository users groups"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:352
+msgid "An error occurred during deletion of repository stats"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:367
+msgid "An error occurred during cache invalidation"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:387
+msgid "Updated repository visibility in public journal"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:390
+msgid "An error occurred during setting this repository in public journal"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:395 rhodecode/model/forms.py:53
+msgid "Token mismatch"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:408
+msgid "Pulled from remote location"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:410
+msgid "An error occurred during pull from remote location"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:83
+#, python-format
+msgid "created repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:96
+#, python-format
+msgid "error occurred during creation of repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:130
+#, python-format
+msgid "updated repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:143
+#, python-format
+msgid "error occurred during update of repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:164
+#, python-format
+msgid "This group contains %s repositores and cannot be deleted"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:171
+#, python-format
+msgid "removed repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:175
+#, python-format
+msgid "error occurred during deletion of repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:109
+#, python-format
+msgid "Repositories successfully rescanned added: %s,removed: %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:118
 msgid "Whoosh reindex task scheduled"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:138
-msgid "Updated application settings"
-msgstr ""
-
 #: rhodecode/controllers/admin/settings.py:143
-#: rhodecode/controllers/admin/settings.py:204
+msgid "Updated application settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:148
+#: rhodecode/controllers/admin/settings.py:215
 msgid "error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:199
+#: rhodecode/controllers/admin/settings.py:210
 msgid "Updated mercurial settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:258
+#: rhodecode/controllers/admin/settings.py:236
+msgid "Added new hook"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:247
+msgid "Updated hooks"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:251
+msgid "error occurred during hook creation"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:310
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:286
+#: rhodecode/controllers/admin/settings.py:339
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:306
-#: rhodecode/controllers/admin/users.py:127
+#: rhodecode/controllers/admin/settings.py:359
+#: rhodecode/controllers/admin/users.py:130
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr ""
@@ -288,442 +492,600 @@ msgid "error occurred during creation of
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:116
-msgid "User updated succesfully"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:143
-msgid "sucessfully deleted user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:147
+msgid "User updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:146
+msgid "successfully deleted user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:150
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:163
+#: rhodecode/controllers/admin/users.py:166
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:383
+#: rhodecode/controllers/admin/users.py:195
+#: rhodecode/controllers/admin/users_groups.py:202
+msgid "Granted 'repository create' permission to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:204
+#: rhodecode/controllers/admin/users_groups.py:211
+msgid "Revoked 'repository create' permission to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:74
+#, python-format
+msgid "created users group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:86
+#, python-format
+msgid "error occurred during creation of users group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:119
+#, python-format
+msgid "updated users group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:138
+#, python-format
+msgid "error occurred during update of users group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:154
+msgid "successfully deleted users group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:158
+msgid "An error occurred during deletion of users group"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:279
+msgid "year"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:280
+msgid "month"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:281
+msgid "day"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:282
+msgid "hour"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:283
+msgid "minute"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:284
+msgid "second"
+msgstr ""
+
+#: rhodecode/lib/__init__.py:293
 msgid "ago"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:386
+#: rhodecode/lib/__init__.py:296
 msgid "just now"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:404
+#: rhodecode/lib/auth.py:377
+msgid "You need to be a registered user to perform this action"
+msgstr ""
+
+#: rhodecode/lib/auth.py:421
+msgid "You need to be a signed in to view this page"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:307
 msgid "True"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:407
+#: rhodecode/lib/helpers.py:311
 msgid "False"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:439
+#: rhodecode/lib/helpers.py:352
+#, python-format
+msgid "Show all combined changesets %s->%s"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:356
+msgid "compare view"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:365
 msgid "and"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:439
+#: rhodecode/lib/helpers.py:365
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:441 rhodecode/templates/changelog/changelog.html:14
-#: rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/lib/helpers.py:367 rhodecode/templates/changelog/changelog.html:14
+#: rhodecode/templates/changelog/changelog.html:39
 msgid "revisions"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:456
+#: rhodecode/lib/helpers.py:385
+msgid "fork name "
+msgstr ""
+
+#: rhodecode/lib/helpers.py:388
 msgid "[deleted] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:457 rhodecode/lib/helpers.py:461
+#: rhodecode/lib/helpers.py:389 rhodecode/lib/helpers.py:393
 msgid "[created] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:458
-msgid "[forked] repository as"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:459 rhodecode/lib/helpers.py:463
+#: rhodecode/lib/helpers.py:390 rhodecode/lib/helpers.py:394
+msgid "[forked] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:391 rhodecode/lib/helpers.py:395
 msgid "[updated] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:460
+#: rhodecode/lib/helpers.py:392
 msgid "[delete] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:462
-msgid "[forked] repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:464
-msgid "[pushed] "
-msgstr ""
-
-#: rhodecode/lib/helpers.py:465
-msgid "[pulled] "
-msgstr ""
-
-#: rhodecode/lib/helpers.py:466
+#: rhodecode/lib/helpers.py:396
+msgid "[pushed] into"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:397
+msgid "[committed via RhodeCode] into"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:398
+msgid "[pulled from remote] into"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:399
+msgid "[pulled] from"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:400
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:467
+#: rhodecode/lib/helpers.py:401
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:554 rhodecode/templates/changelog/changelog.html:68
+#: rhodecode/lib/helpers.py:577
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:557 rhodecode/templates/changelog/changelog.html:71
+#: rhodecode/lib/helpers.py:581
 msgid "No Files"
 msgstr ""
 
-#: rhodecode/model/forms.py:54
-msgid "Token mismatch"
-msgstr ""
-
-#: rhodecode/model/forms.py:67
+#: rhodecode/model/forms.py:66
 msgid "Invalid username"
 msgstr ""
 
-#: rhodecode/model/forms.py:76
+#: rhodecode/model/forms.py:75
 msgid "This username already exists"
 msgstr ""
 
-#: rhodecode/model/forms.py:81
+#: rhodecode/model/forms.py:79
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or "
 "dashes and must begin with alphanumeric character"
 msgstr ""
 
-#: rhodecode/model/forms.py:101 rhodecode/model/forms.py:109
-#: rhodecode/model/forms.py:117
+#: rhodecode/model/forms.py:94
+msgid "Invalid group name"
+msgstr ""
+
+#: rhodecode/model/forms.py:104
+msgid "This users group already exists"
+msgstr ""
+
+#: rhodecode/model/forms.py:110
+msgid ""
+"Group name may only contain alphanumeric characters underscores, periods or "
+"dashes and must begin with alphanumeric character"
+msgstr ""
+
+#: rhodecode/model/forms.py:132
+msgid "Cannot assign this group as parent"
+msgstr ""
+
+#: rhodecode/model/forms.py:148
+msgid "This group already exists"
+msgstr ""
+
+#: rhodecode/model/forms.py:164 rhodecode/model/forms.py:172
+#: rhodecode/model/forms.py:180
 msgid "Invalid characters in password"
 msgstr ""
 
-#: rhodecode/model/forms.py:128
-msgid "Password do not match"
-msgstr ""
-
-#: rhodecode/model/forms.py:133
+#: rhodecode/model/forms.py:191
+msgid "Passwords do not match"
+msgstr ""
+
+#: rhodecode/model/forms.py:196
 msgid "invalid password"
 msgstr ""
 
-#: rhodecode/model/forms.py:134
+#: rhodecode/model/forms.py:197
 msgid "invalid user name"
 msgstr ""
 
-#: rhodecode/model/forms.py:135
+#: rhodecode/model/forms.py:198
 msgid "Your account is disabled"
 msgstr ""
 
-#: rhodecode/model/forms.py:172 rhodecode/model/forms.py:207
+#: rhodecode/model/forms.py:233
 msgid "This username is not valid"
 msgstr ""
 
-#: rhodecode/model/forms.py:185
+#: rhodecode/model/forms.py:245
 msgid "This repository name is disallowed"
 msgstr ""
 
-#: rhodecode/model/forms.py:189
+#: rhodecode/model/forms.py:266
+#, python-format
+msgid "This repository already exists in group \"%s\""
+msgstr ""
+
+#: rhodecode/model/forms.py:274
 msgid "This repository already exists"
 msgstr ""
 
-#: rhodecode/model/forms.py:201
-msgid "Fork have to be the same type as original"
-msgstr ""
-
-#: rhodecode/model/forms.py:256
-msgid "This is not a valid path"
-msgstr ""
-
-#: rhodecode/model/forms.py:270
-msgid "This e-mail address is already taken"
-msgstr ""
-
-#: rhodecode/model/forms.py:286
-msgid "This e-mail address doesn't exist."
-msgstr ""
-
-#: rhodecode/model/forms.py:311
-#, python-format
-msgid ""
-"You need to specify %(user)s in template for example uid=%(user)s "
-",dc=company..."
-msgstr ""
-
-#: rhodecode/model/forms.py:317
-#, python-format
-msgid "Wrong template used, only %(user)s is an valid entry"
+#: rhodecode/model/forms.py:312 rhodecode/model/forms.py:319
+msgid "invalid clone url"
+msgstr ""
+
+#: rhodecode/model/forms.py:322
+msgid "Invalid clone url, provide a valid clone http\\s url"
 msgstr ""
 
 #: rhodecode/model/forms.py:334
+msgid "Fork have to be the same type as original"
+msgstr ""
+
+#: rhodecode/model/forms.py:341
+msgid "This username or users group name is not valid"
+msgstr ""
+
+#: rhodecode/model/forms.py:403
+msgid "This is not a valid path"
+msgstr ""
+
+#: rhodecode/model/forms.py:416
+msgid "This e-mail address is already taken"
+msgstr ""
+
+#: rhodecode/model/forms.py:427
+msgid "This e-mail address doesn't exist."
+msgstr ""
+
+#: rhodecode/model/forms.py:447
+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/forms.py:466
 msgid "Please enter a login"
 msgstr ""
 
-#: rhodecode/model/forms.py:335
+#: rhodecode/model/forms.py:467
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
-#: rhodecode/model/forms.py:343
+#: rhodecode/model/forms.py:475
 msgid "Please enter a password"
 msgstr ""
 
-#: rhodecode/model/forms.py:344
+#: rhodecode/model/forms.py:476
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
-#: rhodecode/model/user.py:126
+#: rhodecode/model/user.py:145
 msgid "[RhodeCode] New User registration"
 msgstr ""
 
-#: rhodecode/model/user.py:138 rhodecode/model/user.py:159
+#: rhodecode/model/user.py:157 rhodecode/model/user.py:179
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:180
+#: rhodecode/model/user.py:201
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:183
+#: rhodecode/model/user.py:204
 #, python-format
 msgid ""
 "This user still owns %s repositories and cannot be removed. Switch owners or "
 "remove those repositories"
 msgstr ""
 
-#: rhodecode/templates/index.html:4 rhodecode/templates/index.html:30
+#: rhodecode/templates/index.html:4
 msgid "Dashboard"
 msgstr ""
 
-#: rhodecode/templates/index.html:31
-#: rhodecode/templates/admin/users/user_edit_my_account.html:101
+#: rhodecode/templates/index_base.html:22
+#: rhodecode/templates/admin/users/user_edit_my_account.html:102
 msgid "quick filter..."
 msgstr ""
 
-#: rhodecode/templates/index.html:37
+#: rhodecode/templates/index_base.html:23 rhodecode/templates/base/base.html:300
+msgid "repositories"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:29
+#: rhodecode/templates/admin/repos/repos.html:22
 msgid "ADD NEW REPOSITORY"
 msgstr ""
 
-#: rhodecode/templates/index.html:48
-#: rhodecode/templates/admin/repos/repo_add.html:31
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:27
+#: rhodecode/templates/index_base.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
+#: rhodecode/templates/admin/users_groups/users_group_add.html:32
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:33
+msgid "Group name"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:42 rhodecode/templates/index_base.html:73
+#: rhodecode/templates/admin/repos/repo_add_base.html:44
+#: rhodecode/templates/admin/repos/repo_edit.html:64
+#: rhodecode/templates/admin/repos/repos.html:31
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
+#: rhodecode/templates/settings/repo_fork.html:40
+#: rhodecode/templates/settings/repo_settings.html:40
+#: rhodecode/templates/summary/summary.html:92
+msgid "Description"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:53
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
+msgid "Repositories group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
 #: rhodecode/templates/admin/repos/repos.html:30
-#: rhodecode/templates/admin/users/user_edit_my_account.html:116
-#: rhodecode/templates/files/files_browser.html:27
-#: rhodecode/templates/settings/repo_settings.html:29
+#: rhodecode/templates/admin/users/user_edit_my_account.html:117
+#: rhodecode/templates/files/files_browser.html:157
+#: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:31
-#: rhodecode/templates/summary/summary.html:92
+#: rhodecode/templates/summary/summary.html:107
 msgid "Name"
 msgstr ""
 
-#: rhodecode/templates/index.html:49
-#: rhodecode/templates/admin/repos/repo_add.html:47
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:44
-#: rhodecode/templates/admin/repos/repo_edit.html:48
-#: rhodecode/templates/admin/repos/repos.html:31
-#: rhodecode/templates/settings/repo_fork.html:38
-#: rhodecode/templates/settings/repo_settings.html:38
-#: rhodecode/templates/summary/summary.html:75
-msgid "Description"
-msgstr ""
-
-#: rhodecode/templates/index.html:50 rhodecode/templates/admin/repos/repos.html:32
-#: rhodecode/templates/summary/summary.html:99
+#: rhodecode/templates/index_base.html:74
+#: rhodecode/templates/admin/repos/repos.html:32
+#: rhodecode/templates/summary/summary.html:114
 msgid "Last change"
 msgstr ""
 
-#: rhodecode/templates/index.html:51 rhodecode/templates/admin/repos/repos.html:33
+#: rhodecode/templates/index_base.html:75
+#: rhodecode/templates/admin/repos/repos.html:33
 msgid "Tip"
 msgstr ""
 
-#: rhodecode/templates/index.html:52
-#: rhodecode/templates/admin/repos/repo_edit.html:73
+#: rhodecode/templates/index_base.html:76
+#: rhodecode/templates/admin/repos/repo_edit.html:97
 msgid "Owner"
 msgstr ""
 
-#: rhodecode/templates/index.html:53 rhodecode/templates/summary/summary.html:236
+#: rhodecode/templates/index_base.html:77
+#: rhodecode/templates/journal/public_journal.html:20
+#: rhodecode/templates/summary/summary.html:180
+#: rhodecode/templates/summary/summary.html:183
 msgid "RSS"
 msgstr ""
 
-#: rhodecode/templates/index.html:54 rhodecode/templates/summary/summary.html:237
+#: rhodecode/templates/index_base.html:78
+#: rhodecode/templates/journal/public_journal.html:23
+#: rhodecode/templates/summary/summary.html:181
+#: rhodecode/templates/summary/summary.html:184
 msgid "Atom"
 msgstr ""
 
-#: rhodecode/templates/index.html:64 rhodecode/templates/admin/repos/repos.html:42
-#: rhodecode/templates/admin/users/user_edit_my_account.html:126
-#: rhodecode/templates/summary/summary.html:35
+#: rhodecode/templates/index_base.html:87 rhodecode/templates/index_base.html:89
+#: rhodecode/templates/index_base.html:91 rhodecode/templates/base/base.html:209
+#: rhodecode/templates/base/base.html:211 rhodecode/templates/base/base.html:213
+#: rhodecode/templates/summary/summary.html:4
+msgid "Summary"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:95 rhodecode/templates/index_base.html:97
+#: rhodecode/templates/index_base.html:99 rhodecode/templates/base/base.html:225
+#: rhodecode/templates/base/base.html:227 rhodecode/templates/base/base.html:229
+#: rhodecode/templates/changelog/changelog.html:6
+#: rhodecode/templates/changelog/changelog.html:14
+msgid "Changelog"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:103 rhodecode/templates/index_base.html:105
+#: rhodecode/templates/index_base.html:107 rhodecode/templates/base/base.html:268
+#: rhodecode/templates/base/base.html:270 rhodecode/templates/base/base.html:272
+#: rhodecode/templates/files/files.html:4
+msgid "Files"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:116
+#: rhodecode/templates/admin/repos/repos.html:42
+#: rhodecode/templates/admin/users/user_edit_my_account.html:127
+#: rhodecode/templates/summary/summary.html:48
 msgid "Mercurial repository"
 msgstr ""
 
-#: rhodecode/templates/index.html:66 rhodecode/templates/admin/repos/repos.html:44
-#: rhodecode/templates/admin/users/user_edit_my_account.html:128
-#: rhodecode/templates/summary/summary.html:38
+#: rhodecode/templates/index_base.html:118
+#: rhodecode/templates/admin/repos/repos.html:44
+#: rhodecode/templates/admin/users/user_edit_my_account.html:129
+#: rhodecode/templates/summary/summary.html:51
 msgid "Git repository"
 msgstr ""
 
-#: rhodecode/templates/index.html:73 rhodecode/templates/journal.html:67
-#: rhodecode/templates/admin/repos/repo_edit.html:103
-#: rhodecode/templates/settings/repo_settings.html:74
-#: rhodecode/templates/summary/summary.html:42
+#: rhodecode/templates/index_base.html:123
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:16
+#: rhodecode/templates/journal/journal.html:53
+#: rhodecode/templates/summary/summary.html:56
 msgid "private repository"
 msgstr ""
 
-#: rhodecode/templates/index.html:75 rhodecode/templates/journal.html:69
-#: rhodecode/templates/summary/summary.html:44
+#: rhodecode/templates/index_base.html:125
+#: rhodecode/templates/journal/journal.html:55
+#: rhodecode/templates/summary/summary.html:58
 msgid "public repository"
 msgstr ""
 
-#: rhodecode/templates/index.html:83 rhodecode/templates/base/base.html:221
-#: rhodecode/templates/settings/repo_fork.html:11
+#: rhodecode/templates/index_base.html:133 rhodecode/templates/base/base.html:291
+#: rhodecode/templates/settings/repo_fork.html:13
 msgid "fork"
 msgstr ""
 
-#: rhodecode/templates/index.html:84 rhodecode/templates/admin/repos/repos.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:142
-#: rhodecode/templates/summary/summary.html:63
-#: rhodecode/templates/summary/summary.html:65
+#: rhodecode/templates/index_base.html:134
+#: rhodecode/templates/admin/repos/repos.html:60
+#: rhodecode/templates/admin/users/user_edit_my_account.html:143
+#: rhodecode/templates/summary/summary.html:69
+#: rhodecode/templates/summary/summary.html:71
 msgid "Fork of"
 msgstr ""
 
-#: rhodecode/templates/index.html:105 rhodecode/templates/admin/repos/repos.html:73
+#: rhodecode/templates/index_base.html:155
+#: rhodecode/templates/admin/repos/repos.html:73
 msgid "No changesets yet"
 msgstr ""
 
-#: rhodecode/templates/index.html:110
+#: rhodecode/templates/index_base.html:161 rhodecode/templates/index_base.html:163
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""
 
-#: rhodecode/templates/index.html:113
+#: rhodecode/templates/index_base.html:168 rhodecode/templates/index_base.html:170
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr ""
 
-#: rhodecode/templates/journal.html:4 rhodecode/templates/journal.html:17
-#: rhodecode/templates/base/base.html:41 rhodecode/templates/base/base.html:278
-#: rhodecode/templates/base/base.html:280 rhodecode/templates/base/base.html:282
-msgid "Journal"
-msgstr ""
-
-#: rhodecode/templates/journal.html:45
-msgid "No entries yet"
-msgstr ""
-
-#: rhodecode/templates/journal.html:53
-msgid "Following"
-msgstr ""
-
-#: rhodecode/templates/journal.html:60
-msgid "following user"
-msgstr ""
-
-#: rhodecode/templates/journal.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:94
-#: rhodecode/templates/settings/repo_settings.html:65
-msgid "user"
-msgstr ""
-
-#: rhodecode/templates/journal.html:79
-msgid "You are not following any users or repositories"
-msgstr ""
-
-#: rhodecode/templates/login.html:5
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
+#: rhodecode/templates/base/base.html:38
 msgid "Sign In"
 msgstr ""
 
-#: rhodecode/templates/login.html:28
+#: rhodecode/templates/login.html:21
 msgid "Sign In to"
 msgstr ""
 
-#: rhodecode/templates/login.html:38 rhodecode/templates/register.html:27
+#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
 #: rhodecode/templates/admin/admin_log.html:5
 #: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:43
-#: rhodecode/templates/admin/users/user_edit_my_account.html:41
-#: rhodecode/templates/summary/summary.html:91
+#: rhodecode/templates/admin/users/user_edit.html:47
+#: rhodecode/templates/admin/users/user_edit_my_account.html:45
+#: rhodecode/templates/base/base.html:15
+#: rhodecode/templates/summary/summary.html:106
 msgid "Username"
 msgstr ""
 
-#: rhodecode/templates/login.html:47 rhodecode/templates/register.html:36
-#: rhodecode/templates/admin/ldap/ldap.html:50
+#: 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:24
 msgid "Password"
 msgstr ""
 
-#: rhodecode/templates/login.html:67
+#: rhodecode/templates/login.html:60
 msgid "Forgot your password ?"
 msgstr ""
 
-#: rhodecode/templates/login.html:70
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:35
 msgid "Don't have an account ?"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:5
-msgid "Reset You password"
-msgstr ""
-
-#: rhodecode/templates/password_reset.html:18
-msgid "Reset You password to"
-msgstr ""
-
-#: rhodecode/templates/password_reset.html:28
+msgid "Reset your password"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:11
+msgid "Reset your password to"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:21
 msgid "Email address"
 msgstr ""
 
-#: rhodecode/templates/password_reset.html:38
-msgid "Your new password will be send to matching email address"
-msgstr ""
-
-#: rhodecode/templates/register.html:5
+#: rhodecode/templates/password_reset.html:30
+msgid "Reset my password"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:31
+msgid "Password reset link will be send to matching email address"
+msgstr ""
+
+#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74
 msgid "Sign Up"
 msgstr ""
 
-#: rhodecode/templates/register.html:18
+#: rhodecode/templates/register.html:11
 msgid "Sign Up to"
 msgstr ""
 
-#: rhodecode/templates/register.html:45
+#: rhodecode/templates/register.html:38
 msgid "Re-enter password"
 msgstr ""
 
-#: rhodecode/templates/register.html:54
+#: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:50
-#: rhodecode/templates/admin/users/user_edit.html:61
-#: rhodecode/templates/admin/users/user_edit_my_account.html:59
+#: rhodecode/templates/admin/users/user_edit.html:74
+#: rhodecode/templates/admin/users/user_edit_my_account.html:63
 msgid "First Name"
 msgstr ""
 
-#: rhodecode/templates/register.html:63
+#: rhodecode/templates/register.html:56
 #: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:70
-#: rhodecode/templates/admin/users/user_edit_my_account.html:68
+#: rhodecode/templates/admin/users/user_edit.html:83
+#: rhodecode/templates/admin/users/user_edit_my_account.html:72
 msgid "Last Name"
 msgstr ""
 
-#: rhodecode/templates/register.html:72
+#: rhodecode/templates/register.html:65
 #: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:79
-#: rhodecode/templates/admin/users/user_edit_my_account.html:77
-#: rhodecode/templates/summary/summary.html:93
+#: rhodecode/templates/admin/users/user_edit.html:92
+#: rhodecode/templates/admin/users/user_edit_my_account.html:81
+#: rhodecode/templates/summary/summary.html:108
 msgid "Email"
 msgstr ""
 
-#: rhodecode/templates/register.html:83
+#: rhodecode/templates/register.html:76
 msgid "Your account will be activated right after registration"
 msgstr ""
 
-#: rhodecode/templates/register.html:85
+#: rhodecode/templates/register.html:78
 msgid "Your account must wait for activation by administrator"
 msgstr ""
 
+#: rhodecode/templates/repo_switcher_list.html:14
+msgid "Private repository"
+msgstr ""
+
+#: rhodecode/templates/repo_switcher_list.html:19
+msgid "Public repository"
+msgstr ""
+
 #: rhodecode/templates/admin/admin.html:5 rhodecode/templates/admin/admin.html:9
 msgid "Admin journal"
 msgstr ""
@@ -744,12 +1106,11 @@ msgstr ""
 msgid "From IP"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:62
+#: rhodecode/templates/admin/admin_log.html:52
 msgid "No actions yet"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:5
-#: rhodecode/templates/admin/ldap/ldap.html:24
 msgid "LDAP administration"
 msgstr ""
 
@@ -757,8 +1118,12 @@ msgstr ""
 msgid "Ldap"
 msgstr ""
 
+#: rhodecode/templates/admin/ldap/ldap.html:28
+msgid "Connection settings"
+msgstr ""
+
 #: rhodecode/templates/admin/ldap/ldap.html:30
-msgid "Enable ldap"
+msgid "Enable LDAP"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:34
@@ -770,24 +1135,71 @@ msgid "Port"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:42
-msgid "Enable LDAPS"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:46
 msgid "Account"
 msgstr ""
 
+#: rhodecode/templates/admin/ldap/ldap.html:50
+msgid "Connection security"
+msgstr ""
+
 #: rhodecode/templates/admin/ldap/ldap.html:54
+msgid "Certificate Checks"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:57
+msgid "Search settings"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:59
 msgid "Base DN"
 msgstr ""
 
+#: rhodecode/templates/admin/ldap/ldap.html:63
+msgid "LDAP Filter"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:67
+msgid "LDAP Search Scope"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:70
+msgid "Attribute mappings"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:72
+msgid "Login Attribute"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:76
+msgid "First Name Attribute"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:80
+msgid "Last Name Attribute"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:84
+msgid "E-mail Attribute"
+msgstr ""
+
+#: rhodecode/templates/admin/ldap/ldap.html:89
+#: rhodecode/templates/admin/settings/hooks.html:73
+#: rhodecode/templates/admin/users/user_edit.html:117
+#: rhodecode/templates/admin/users/user_edit.html:142
+#: rhodecode/templates/admin/users/user_edit_my_account.html:89
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:263
+msgid "Save"
+msgstr ""
+
 #: rhodecode/templates/admin/permissions/permissions.html:5
 msgid "Permissions administration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:85
-#: rhodecode/templates/settings/repo_settings.html:56
+#: rhodecode/templates/admin/repos/repo_edit.html:109
+#: rhodecode/templates/admin/users/user_edit.html:127
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:248
+#: rhodecode/templates/settings/repo_settings.html:58
 msgid "Permissions"
 msgstr ""
 
@@ -822,6 +1234,10 @@ msgstr ""
 msgid "Repository creation"
 msgstr ""
 
+#: rhodecode/templates/admin/permissions/permissions.html:71
+msgid "set"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_add.html:5
 #: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
 msgid "Add repository"
@@ -830,6 +1246,7 @@ msgstr ""
 #: rhodecode/templates/admin/repos/repo_add.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:11
 #: rhodecode/templates/admin/repos/repos.html:10
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
 msgid "Repositories"
 msgstr ""
 
@@ -837,20 +1254,34 @@ msgstr ""
 msgid "add new"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add.html:39
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:36
-#: rhodecode/templates/admin/repos/repo_edit.html:40
+#: rhodecode/templates/admin/repos/repo_add_base.html:20
+#: rhodecode/templates/summary/summary.html:80
+#: rhodecode/templates/summary/summary.html:82
+msgid "Clone from"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:28
+#: rhodecode/templates/admin/repos/repo_edit.html:48
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
+msgid "Repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:36
+#: rhodecode/templates/admin/repos/repo_edit.html:56
 msgid "Type"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add.html:55
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:52
-#: rhodecode/templates/admin/repos/repo_edit.html:57
-#: rhodecode/templates/settings/repo_fork.html:46
-#: rhodecode/templates/settings/repo_settings.html:47
+#: rhodecode/templates/admin/repos/repo_add_base.html:52
+#: rhodecode/templates/admin/repos/repo_edit.html:73
+#: rhodecode/templates/settings/repo_fork.html:48
+#: rhodecode/templates/settings/repo_settings.html:49
 msgid "Private"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_add_base.html:59
+msgid "add"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_add_create_repository.html:9
 msgid "add new repository"
 msgstr ""
@@ -861,121 +1292,268 @@ msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:13
 #: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit_my_account.html:147
+#: rhodecode/templates/admin/users/user_edit_my_account.html:148
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
+#: rhodecode/templates/files/files_annotate.html:49
+#: rhodecode/templates/files/files_source.html:20
 msgid "edit"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:65
+#: rhodecode/templates/admin/repos/repo_edit.html:40
+msgid "Clone uri"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:81
 msgid "Enable statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:90
-#: rhodecode/templates/settings/repo_settings.html:61
-msgid "none"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:91
-#: rhodecode/templates/settings/repo_settings.html:62
-msgid "read"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:92
-#: rhodecode/templates/settings/repo_settings.html:63
-msgid "write"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:93
-#: rhodecode/templates/admin/users/users.html:37
-#: rhodecode/templates/base/base.html:226
-#: rhodecode/templates/settings/repo_settings.html:64
-msgid "admin"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:124
-#: rhodecode/templates/settings/repo_settings.html:95
-msgid "Failed to remove user"
+#: rhodecode/templates/admin/repos/repo_edit.html:89
+msgid "Enable downloads"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:127
+msgid "Administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:130
+msgid "Statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:134
+msgid "Reset current statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:134
+msgid "Confirm to remove current statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:137
+msgid "Fetched to rev"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:138
+msgid "Percentage of stats gathered"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:147
+msgid "Remote"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:151
+msgid "Pull changes from remote location"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:151
-#: rhodecode/templates/settings/repo_settings.html:123
-msgid "Add another user"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:293
-msgid "Administration"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:296
-msgid "Statistics"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:301
-msgid "Reset current statistics"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:305
-msgid "Fetched to rev"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:306
-msgid "Percentage of stats gathered"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:314
+msgid "Confirm to pull changes from remote side"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Cache"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:318
+#: rhodecode/templates/admin/repos/repo_edit.html:166
 msgid "Invalidate repository cache"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:324
+#: rhodecode/templates/admin/repos/repo_edit.html:166
+msgid "Confirm to invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:177
+msgid "Remove from public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:179
+msgid "Add to public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:185
 msgid "Delete"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:328
+#: rhodecode/templates/admin/repos/repo_edit.html:189
 msgid "Remove this repository"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit.html:189
+#: rhodecode/templates/admin/repos/repos.html:79
+msgid "Confirm to delete this repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:3
+msgid "none"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:4
+msgid "read"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:5
+msgid "write"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:6
+#: rhodecode/templates/admin/users/users.html:38
+#: rhodecode/templates/base/base.html:296
+msgid "admin"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:7
+msgid "member"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:33
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:53
+msgid "revoke"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:75
+msgid "Add another member"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:89
+msgid "Failed to remove user"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:104
+msgid "Failed to remove users group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:205
+msgid "Group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_perms.html:206
+#: rhodecode/templates/admin/users_groups/users_groups.html:33
+msgid "members"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repos.html:5
 msgid "Repositories administration"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:34
-#: rhodecode/templates/summary/summary.html:85
+#: rhodecode/templates/summary/summary.html:100
 msgid "Contact"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:35
-#: rhodecode/templates/admin/users/user_edit_my_account.html:118
-#: rhodecode/templates/admin/users/users.html:39
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
+#: rhodecode/templates/admin/users/user_edit_my_account.html:119
+#: rhodecode/templates/admin/users/users.html:40
+#: rhodecode/templates/admin/users_groups/users_groups.html:35
 msgid "action"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:51
-#: rhodecode/templates/admin/users/user_edit_my_account.html:133
-#: rhodecode/templates/admin/users/user_edit_my_account.html:147
+#: rhodecode/templates/admin/users/user_edit_my_account.html:134
+#: rhodecode/templates/admin/users/user_edit_my_account.html:148
 msgid "private"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:53
 #: rhodecode/templates/admin/repos/repos.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:135
-#: rhodecode/templates/admin/users/user_edit_my_account.html:141
-#: rhodecode/templates/summary/summary.html:62
+#: rhodecode/templates/admin/users/user_edit_my_account.html:136
+#: rhodecode/templates/admin/users/user_edit_my_account.html:142
+#: rhodecode/templates/summary/summary.html:68
 msgid "public"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repos.html:79
+#: rhodecode/templates/admin/users/users.html:55
+msgid "delete"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:8
+msgid "Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:13
+msgid "with"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
+msgid "Add repos group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10
+msgid "Repos groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12
+msgid "add new repos group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50
+msgid "Group parent"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
+#: rhodecode/templates/admin/users/user_add.html:85
+#: rhodecode/templates/admin/users_groups/users_group_add.html:49
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
+msgid "save"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
+msgid "Edit repos group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12
+msgid "edit repos group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
+msgid "Repositories groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
+msgid "ADD NEW GROUP"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
+msgid "Number of repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+msgid "Confirm to delete this group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62
+msgid "There are no repositories groups yet"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/hooks.html:5
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr ""
 
+#: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:9
 #: rhodecode/templates/settings/repo_settings.html:5
-#: rhodecode/templates/settings/repo_settings.html:11
+#: rhodecode/templates/settings/repo_settings.html:13
 msgid "Settings"
 msgstr ""
 
+#: rhodecode/templates/admin/settings/hooks.html:24
+msgid "Built in hooks - read only"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/hooks.html:40
+msgid "Custom hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/hooks.html:56
+msgid "remove"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/hooks.html:88
+msgid "Failed to remove hook"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings.html:24
 msgid "Remap and rescan repositories"
 msgstr ""
@@ -995,6 +1573,10 @@ msgstr ""
 msgid "destroy old data"
 msgstr ""
 
+#: rhodecode/templates/admin/settings/settings.html:45
+msgid "Rescan repositories"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings.html:51
 msgid "Whoosh indexing"
 msgstr ""
@@ -1007,6 +1589,10 @@ msgstr ""
 msgid "build from scratch"
 msgstr ""
 
+#: rhodecode/templates/admin/settings/settings.html:70
+msgid "Reindex"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings.html:76
 msgid "Global application settings"
 msgstr ""
@@ -1019,50 +1605,73 @@ msgstr ""
 msgid "Realm text"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:109
-msgid "Mercurial settings"
+#: rhodecode/templates/admin/settings/settings.html:103
+msgid "GA code"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:111
+#: rhodecode/templates/admin/settings/settings.html:177
+msgid "Save settings"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:112
+#: rhodecode/templates/admin/settings/settings.html:178
+#: rhodecode/templates/admin/users/user_edit.html:118
+#: rhodecode/templates/admin/users/user_edit.html:143
+#: rhodecode/templates/admin/users/user_edit_my_account.html:90
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:264
+#: rhodecode/templates/files/files_edit.html:50
+msgid "Reset"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:118
+msgid "Mercurial settings"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:127
 msgid "Web"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:123
+#: rhodecode/templates/admin/settings/settings.html:132
 msgid "require ssl for pushing"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:130
-msgid "Hooks"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:135
-msgid "Update repository after push (hg update)"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:139
-msgid "Show repository size after push"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:143
-msgid "Log user push commands"
+msgid "Hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:142
+msgid "advanced setup"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:147
-msgid "Log user pull commands"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:154
-msgid "Repositories location"
+msgid "Update repository after push (hg update)"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:151
+msgid "Show repository size after push"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:155
+msgid "Log user push commands"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:159
+msgid "Log user pull commands"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:166
+msgid "Repositories location"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:171
 msgid ""
-"This a crucial application setting. If You really sure you need to change "
-"this, you must restart application in order to make this settings take "
+"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:160
+#: rhodecode/templates/admin/settings/settings.html:172
 msgid "unlock"
 msgstr ""
 
@@ -1081,7 +1690,9 @@ msgid "add new user"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:88
+#: rhodecode/templates/admin/users/user_edit.html:101
+#: rhodecode/templates/admin/users_groups/users_group_add.html:41
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
 msgid "Active"
 msgstr ""
 
@@ -1089,16 +1700,35 @@ msgstr ""
 msgid "Edit user"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:36
+#: rhodecode/templates/admin/users/user_edit.html:33
+#: rhodecode/templates/admin/users/user_edit_my_account.html:32
+msgid "Change your avatar at"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:34
 #: rhodecode/templates/admin/users/user_edit_my_account.html:33
 msgid "Using"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:52
-#: rhodecode/templates/admin/users/user_edit_my_account.html:50
+#: rhodecode/templates/admin/users/user_edit.html:40
+#: rhodecode/templates/admin/users/user_edit_my_account.html:39
+msgid "API key"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:56
+msgid "LDAP DN"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:65
+#: rhodecode/templates/admin/users/user_edit_my_account.html:54
 msgid "New password"
 msgstr ""
 
+#: rhodecode/templates/admin/users/user_edit.html:135
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:256
+msgid "Create repositories"
+msgstr ""
+
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
 msgid "My account"
 msgstr ""
@@ -1107,26 +1737,26 @@ msgstr ""
 msgid "My Account"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:100
+#: rhodecode/templates/admin/users/user_edit_my_account.html:101
 msgid "My repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:106
+#: rhodecode/templates/admin/users/user_edit_my_account.html:107
 msgid "ADD REPOSITORY"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:117
+#: rhodecode/templates/admin/users/user_edit_my_account.html:118
 #: rhodecode/templates/branches/branches_data.html:7
 #: rhodecode/templates/shortlog/shortlog_data.html:8
 #: rhodecode/templates/tags/tags_data.html:7
 msgid "revision"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:156
+#: rhodecode/templates/admin/users/user_edit_my_account.html:157
 msgid "No repositories yet"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:158
+#: rhodecode/templates/admin/users/user_edit_my_account.html:159
 msgid "create one now"
 msgstr ""
 
@@ -1134,6 +1764,10 @@ msgstr ""
 msgid "Users administration"
 msgstr ""
 
+#: rhodecode/templates/admin/users/users.html:23
+msgid "ADD NEW USER"
+msgstr ""
+
 #: rhodecode/templates/admin/users/users.html:33
 msgid "username"
 msgstr ""
@@ -1149,140 +1783,203 @@ msgid "lastname"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:36
+msgid "last login"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:37
+#: rhodecode/templates/admin/users_groups/users_groups.html:34
 msgid "active"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:38
-#: rhodecode/templates/base/base.html:233
+#: rhodecode/templates/admin/users/users.html:39
+#: rhodecode/templates/base/base.html:305
 msgid "ldap"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:37 rhodecode/templates/base/base.html:269
-#: rhodecode/templates/base/base.html:271 rhodecode/templates/base/base.html:273
+#: rhodecode/templates/admin/users/users.html:56
+msgid "Confirm to delete this user"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_add.html:5
+msgid "Add users group"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_add.html:10
+#: rhodecode/templates/admin/users_groups/users_groups.html:9
+msgid "Users groups"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_add.html:12
+msgid "add new users group"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:5
+msgid "Edit users group"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:11
+msgid "UsersGroups"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:50
+msgid "Members"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:58
+msgid "Choosen group members"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:61
+msgid "Remove all elements"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:75
+msgid "Available members"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:79
+msgid "Add all elements"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_groups.html:5
+msgid "Users groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_groups.html:23
+msgid "ADD NEW USER GROUP"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_groups.html:32
+msgid "group name"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:32
+msgid "Forgot password ?"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:57 rhodecode/templates/base/base.html:338
+#: rhodecode/templates/base/base.html:340 rhodecode/templates/base/base.html:342
 msgid "Home"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:87
+#: rhodecode/templates/base/base.html:61 rhodecode/templates/base/base.html:347
+#: rhodecode/templates/base/base.html:349 rhodecode/templates/base/base.html:351
+#: rhodecode/templates/journal/journal.html:4
+#: rhodecode/templates/journal/journal.html:17
+#: rhodecode/templates/journal/public_journal.html:4
+msgid "Journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:66
+msgid "Login"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:68
+msgid "Log Out"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:107
 msgid "Submit a bug"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:88
-msgid "GPL license"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:120
+#: rhodecode/templates/base/base.html:141
 msgid "Switch repository"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:122
+#: rhodecode/templates/base/base.html:143
 msgid "Products"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:130
-msgid "Private repository"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:132
-msgid "Public repository"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:139 rhodecode/templates/base/base.html:141
-#: rhodecode/templates/base/base.html:143
-#: rhodecode/templates/summary/summary.html:4
-msgid "Summary"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:155 rhodecode/templates/base/base.html:157
-#: rhodecode/templates/base/base.html:159
-#: rhodecode/templates/changelog/changelog.html:6
-#: rhodecode/templates/changelog/changelog.html:14
-msgid "Changelog"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:164 rhodecode/templates/base/base.html:166
-#: rhodecode/templates/base/base.html:168
+#: rhodecode/templates/base/base.html:149
+msgid "loading..."
+msgstr ""
+
+#: rhodecode/templates/base/base.html:234 rhodecode/templates/base/base.html:236
+#: rhodecode/templates/base/base.html:238
 msgid "Switch to"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:172
+#: rhodecode/templates/base/base.html:242
 #: rhodecode/templates/branches/branches.html:13
 msgid "branches"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:179
-#: rhodecode/templates/branches/branches_data.html:32
+#: rhodecode/templates/base/base.html:249
+#: rhodecode/templates/branches/branches_data.html:52
 msgid "There are no branches yet"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:184
+#: rhodecode/templates/base/base.html:254
 #: rhodecode/templates/shortlog/shortlog_data.html:10
 #: rhodecode/templates/tags/tags.html:14
 msgid "tags"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:191
+#: rhodecode/templates/base/base.html:261
 #: rhodecode/templates/tags/tags_data.html:32
 msgid "There are no tags yet"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:198 rhodecode/templates/base/base.html:200
-#: rhodecode/templates/base/base.html:202 rhodecode/templates/files/files.html:4
-msgid "Files"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:207 rhodecode/templates/base/base.html:211
+#: rhodecode/templates/base/base.html:277 rhodecode/templates/base/base.html:281
 #: rhodecode/templates/files/files_annotate.html:40
 #: rhodecode/templates/files/files_source.html:11
 msgid "Options"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:216 rhodecode/templates/base/base.html:218
-#: rhodecode/templates/base/base.html:234
+#: rhodecode/templates/base/base.html:286 rhodecode/templates/base/base.html:288
+#: rhodecode/templates/base/base.html:306
 msgid "settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:222
+#: rhodecode/templates/base/base.html:292
 msgid "search"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:229
+#: rhodecode/templates/base/base.html:299
 msgid "journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:230
-msgid "repositories"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:231
+#: rhodecode/templates/base/base.html:301
+msgid "repositories groups"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:302
 msgid "users"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/templates/base/base.html:303
+msgid "users groups"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:304
 msgid "permissions"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:246 rhodecode/templates/base/base.html:248
+#: rhodecode/templates/base/base.html:317 rhodecode/templates/base/base.html:319
+#: rhodecode/templates/followers/followers.html:5
 msgid "Followers"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:254 rhodecode/templates/base/base.html:256
+#: rhodecode/templates/base/base.html:325 rhodecode/templates/base/base.html:327
+#: rhodecode/templates/forks/forks.html:5
 msgid "Forks"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:287 rhodecode/templates/base/base.html:289
-#: rhodecode/templates/base/base.html:291 rhodecode/templates/search/search.html:4
+#: rhodecode/templates/base/base.html:356 rhodecode/templates/base/base.html:358
+#: rhodecode/templates/base/base.html:360 rhodecode/templates/search/search.html:4
 #: rhodecode/templates/search/search.html:24
 #: rhodecode/templates/search/search.html:46
 msgid "Search"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:339
-#: rhodecode/templates/summary/summary.html:49
+#: rhodecode/templates/base/root.html:57
+#: rhodecode/templates/journal/journal.html:48
+#: rhodecode/templates/summary/summary.html:36
 msgid "Stop following this repository"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:343
-#: rhodecode/templates/summary/summary.html:53
+#: rhodecode/templates/base/root.html:66
+#: rhodecode/templates/summary/summary.html:40
 msgid "Start following this repository"
 msgstr ""
 
@@ -1303,16 +2000,18 @@ msgstr ""
 msgid "links"
 msgstr ""
 
-#: rhodecode/templates/branches/branches_data.html:24
+#: rhodecode/templates/branches/branches_data.html:23
+#: rhodecode/templates/branches/branches_data.html:43
 #: rhodecode/templates/shortlog/shortlog_data.html:39
 #: rhodecode/templates/tags/tags_data.html:24
 msgid "changeset"
 msgstr ""
 
-#: rhodecode/templates/branches/branches_data.html:26
+#: rhodecode/templates/branches/branches_data.html:25
+#: rhodecode/templates/branches/branches_data.html:45
 #: rhodecode/templates/files/files.html:12
 #: rhodecode/templates/shortlog/shortlog_data.html:41
-#: rhodecode/templates/summary/summary.html:161
+#: rhodecode/templates/summary/summary.html:233
 #: rhodecode/templates/tags/tags_data.html:26
 msgid "files"
 msgstr ""
@@ -1325,119 +2024,130 @@ msgstr ""
 msgid "out of"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:38
+#: rhodecode/templates/changelog/changelog.html:37
 msgid "Show"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:41
-msgid "set"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:49
-#: rhodecode/templates/changeset/changeset.html:40
-#: rhodecode/templates/summary/summary.html:552
+#: rhodecode/templates/changelog/changelog.html:50
+#: rhodecode/templates/changeset/changeset.html:42
+#: rhodecode/templates/summary/summary.html:609
 msgid "commit"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:74
-#: rhodecode/templates/changeset/changeset.html:52
-msgid "removed"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:75
-#: rhodecode/templates/changeset/changeset.html:53
-msgid "changed"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:76
-#: rhodecode/templates/changeset/changeset.html:54
-msgid "added"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:80
-#: rhodecode/templates/changeset/changeset.html:58
+#: rhodecode/templates/changelog/changelog.html:63
+msgid "Affected number of files, click to show more details"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:67
+#: rhodecode/templates/changeset/changeset.html:66
 msgid "merge"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:85
-#: rhodecode/templates/changeset/changeset.html:64
+#: rhodecode/templates/changelog/changelog.html:72
+#: rhodecode/templates/changeset/changeset.html:72
 msgid "Parent"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:90
-#: rhodecode/templates/changeset/changeset.html:69
+#: rhodecode/templates/changelog/changelog.html:77
+#: rhodecode/templates/changeset/changeset.html:77
 msgid "No parents"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:95
-#: rhodecode/templates/changeset/changeset.html:72
+#: rhodecode/templates/changelog/changelog.html:82
+#: rhodecode/templates/changeset/changeset.html:80
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_annotate.html:25
+#: rhodecode/templates/files/files_edit.html:33
 #: rhodecode/templates/shortlog/shortlog_data.html:9
 msgid "branch"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:99
-#: rhodecode/templates/changeset/changeset.html:75
+#: rhodecode/templates/changelog/changelog.html:86
+#: rhodecode/templates/changeset/changeset.html:83
 msgid "tag"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:132
-#: rhodecode/templates/shortlog/shortlog_data.html:64
+#: rhodecode/templates/changelog/changelog.html:122
+msgid "Show selected changes __S -> __E"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:172
+#: rhodecode/templates/shortlog/shortlog_data.html:61
 msgid "There are no changes yet"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:4
-#: rhodecode/templates/changeset/changeset.html:12
-#: rhodecode/templates/changeset/changeset.html:29
+#: rhodecode/templates/changelog/changelog_details.html:2
+#: rhodecode/templates/changeset/changeset.html:55
+msgid "removed"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:3
+#: rhodecode/templates/changeset/changeset.html:56
+msgid "changed"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:4
+#: rhodecode/templates/changeset/changeset.html:57
+msgid "added"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:6
+#: rhodecode/templates/changelog/changelog_details.html:7
+#: rhodecode/templates/changelog/changelog_details.html:8
+#: rhodecode/templates/changeset/changeset.html:59
+#: rhodecode/templates/changeset/changeset.html:60
+#: rhodecode/templates/changeset/changeset.html:61
+#, python-format
+msgid "affected %s files"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:6
+#: rhodecode/templates/changeset/changeset.html:14
+#: rhodecode/templates/changeset/changeset.html:31
 msgid "Changeset"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:30
-#: rhodecode/templates/changeset/changeset.html:104
-#: rhodecode/templates/files/file_diff.html:32
-msgid "raw diff"
-msgstr ""
-
 #: rhodecode/templates/changeset/changeset.html:32
-#: rhodecode/templates/changeset/changeset.html:106
+#: rhodecode/templates/changeset/changeset.html:121
+#: rhodecode/templates/changeset/changeset_range.html:78
+#: rhodecode/templates/files/file_diff.html:32
+#: rhodecode/templates/files/file_diff.html:42
+msgid "raw diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:34
+#: rhodecode/templates/changeset/changeset.html:123
+#: rhodecode/templates/changeset/changeset_range.html:80
 #: rhodecode/templates/files/file_diff.html:34
 msgid "download diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:81
-msgid "Files affected"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:102
+#: rhodecode/templates/changeset/changeset.html:90
+#, python-format
+msgid "%s files affected with %s additions and %s deletions."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:101
+msgid "Changeset was too big and was cut off..."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:119
+#: rhodecode/templates/changeset/changeset_range.html:76
 #: rhodecode/templates/files/file_diff.html:30
 msgid "diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:115
+#: rhodecode/templates/changeset/changeset.html:132
+#: rhodecode/templates/changeset/changeset_range.html:89
 msgid "No changes in this file"
 msgstr ""
 
-#: rhodecode/templates/errors/error_404.html:5
-msgid "Repository not found"
-msgstr ""
-
-#: rhodecode/templates/errors/error_404.html:22
-msgid "Not Found"
-msgstr ""
-
-#: rhodecode/templates/errors/error_404.html:23
-#, python-format
-msgid "The specified repository \"%s\" is unknown, sorry."
-msgstr ""
-
-#: rhodecode/templates/errors/error_404.html:26
-#, python-format
-msgid "Create \"%s\" repository as %s"
-msgstr ""
-
-#: rhodecode/templates/errors/error_404.html:29
-msgid "Go back to the main repository list page"
+#: rhodecode/templates/changeset/changeset_range.html:30
+msgid "Compare View"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_range.html:52
+msgid "Files affected"
 msgstr ""
 
 #: rhodecode/templates/errors/error_document.html:44
@@ -1450,12 +2160,13 @@ msgstr ""
 msgid "File diff"
 msgstr ""
 
-#: rhodecode/templates/files/file_diff.html:40
-msgid "No changes"
+#: rhodecode/templates/files/file_diff.html:42
+msgid "Diff is to big to display"
 msgstr ""
 
 #: rhodecode/templates/files/files.html:37
 #: rhodecode/templates/files/files_annotate.html:31
+#: rhodecode/templates/files/files_edit.html:39
 msgid "Location"
 msgstr ""
 
@@ -1476,19 +2187,19 @@ msgid "annotate"
 msgstr ""
 
 #: rhodecode/templates/files/files_annotate.html:33
-#: rhodecode/templates/files/files_browser.html:30
+#: rhodecode/templates/files/files_browser.html:160
 #: rhodecode/templates/files/files_source.html:2
 msgid "Revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_annotate.html:36
-#: rhodecode/templates/files/files_browser.html:28
+#: rhodecode/templates/files/files_browser.html:158
 #: rhodecode/templates/files/files_source.html:7
 msgid "Size"
 msgstr ""
 
 #: rhodecode/templates/files/files_annotate.html:38
-#: rhodecode/templates/files/files_browser.html:29
+#: rhodecode/templates/files/files_browser.html:159
 #: rhodecode/templates/files/files_source.html:9
 msgid "Mimetype"
 msgstr ""
@@ -1498,9 +2209,9 @@ msgid "show source"
 msgstr ""
 
 #: rhodecode/templates/files/files_annotate.html:43
-#: rhodecode/templates/files/files_annotate.html:69
+#: rhodecode/templates/files/files_annotate.html:78
 #: rhodecode/templates/files/files_source.html:14
-#: rhodecode/templates/files/files_source.html:42
+#: rhodecode/templates/files/files_source.html:51
 msgid "show as raw"
 msgstr ""
 
@@ -1509,40 +2220,131 @@ msgstr ""
 msgid "download as raw"
 msgstr ""
 
-#: rhodecode/templates/files/files_annotate.html:48
-#: rhodecode/templates/files/files_source.html:19
+#: rhodecode/templates/files/files_annotate.html:54
+#: rhodecode/templates/files/files_source.html:25
 msgid "History"
 msgstr ""
 
-#: rhodecode/templates/files/files_annotate.html:69
-#: rhodecode/templates/files/files_source.html:42
-msgid "File is to big to display"
-msgstr ""
-
-#: rhodecode/templates/files/files_browser.html:12
-msgid "view"
+#: rhodecode/templates/files/files_annotate.html:73
+#: rhodecode/templates/files/files_source.html:46
+#, python-format
+msgid "Binary file (%s)"
+msgstr ""
+
+#: rhodecode/templates/files/files_annotate.html:78
+#: rhodecode/templates/files/files_source.html:51
+msgid "File is too big to display"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:13
+msgid "view"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:14
 msgid "previous revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:15
+#: rhodecode/templates/files/files_browser.html:16
 msgid "next revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:31
-msgid "Last modified"
+#: rhodecode/templates/files/files_browser.html:23
+msgid "follow current branch"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:27
+msgid "search file list"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:32
+msgid "Loading file list..."
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:111
+msgid "search truncated"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:122
+msgid "no matching files"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:161
+msgid "Last modified"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:162
 msgid "Last commiter"
 msgstr ""
 
+#: rhodecode/templates/files/files_edit.html:4
+msgid "Edit file"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:19
+msgid "edit file"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:45
+#: rhodecode/templates/shortlog/shortlog_data.html:5
+msgid "commit message"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:51
+msgid "Commit changes"
+msgstr ""
+
 #: rhodecode/templates/files/files_source.html:12
 msgid "show annotation"
 msgstr ""
 
+#: rhodecode/templates/files/files_source.html:153
+msgid "Selection link"
+msgstr ""
+
+#: rhodecode/templates/followers/followers.html:13
+msgid "followers"
+msgstr ""
+
+#: rhodecode/templates/followers/followers_data.html:12
+msgid "Started following"
+msgstr ""
+
+#: rhodecode/templates/forks/forks.html:13
+msgid "forks"
+msgstr ""
+
+#: rhodecode/templates/forks/forks_data.html:17
+msgid "forked"
+msgstr ""
+
+#: rhodecode/templates/forks/forks_data.html:34
+msgid "There are no forks yet"
+msgstr ""
+
+#: rhodecode/templates/journal/journal.html:34
+msgid "Following"
+msgstr ""
+
+#: rhodecode/templates/journal/journal.html:41
+msgid "following user"
+msgstr ""
+
+#: rhodecode/templates/journal/journal.html:41
+msgid "user"
+msgstr ""
+
+#: rhodecode/templates/journal/journal.html:65
+msgid "You are not following any users or repositories"
+msgstr ""
+
+#: rhodecode/templates/journal/journal_data.html:46
+msgid "No entries yet"
+msgstr ""
+
+#: rhodecode/templates/journal/public_journal.html:17
+msgid "Public Journal"
+msgstr ""
+
 #: rhodecode/templates/search/search.html:7
 #: rhodecode/templates/search/search.html:26
 msgid "in repository: "
@@ -1562,7 +2364,7 @@ msgid "Search in"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:57
-msgid "Source codes"
+msgid "File contents"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:59
@@ -1578,12 +2380,16 @@ msgstr ""
 msgid "Fork"
 msgstr ""
 
-#: rhodecode/templates/settings/repo_fork.html:29
+#: rhodecode/templates/settings/repo_fork.html:31
 msgid "Fork name"
 msgstr ""
 
+#: rhodecode/templates/settings/repo_fork.html:55
+msgid "fork this repository"
+msgstr ""
+
 #: rhodecode/templates/shortlog/shortlog.html:5
-#: rhodecode/templates/summary/summary.html:609
+#: rhodecode/templates/summary/summary.html:666
 msgid "Shortlog"
 msgstr ""
 
@@ -1591,10 +2397,6 @@ msgstr ""
 msgid "shortlog"
 msgstr ""
 
-#: rhodecode/templates/shortlog/shortlog_data.html:5
-msgid "commit message"
-msgstr ""
-
 #: rhodecode/templates/shortlog/shortlog_data.html:6
 msgid "age"
 msgstr ""
@@ -1603,61 +2405,96 @@ msgstr ""
 msgid "summary"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:103
+#: rhodecode/templates/summary/summary.html:79
+msgid "remote clone"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:121
 msgid "by"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:110
+#: rhodecode/templates/summary/summary.html:128
 msgid "Clone url"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:119
+#: rhodecode/templates/summary/summary.html:137
 msgid "Trending source files"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:184
-#: rhodecode/templates/summary/summary.html:627
-#: rhodecode/templates/summary/summary.html:638
-msgid "show more"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:217
+#: rhodecode/templates/summary/summary.html:146
 msgid "Download"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:233
+#: rhodecode/templates/summary/summary.html:150
+msgid "There are no downloads yet"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:152
+msgid "Downloads are disabled for this repository"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:154
+#: rhodecode/templates/summary/summary.html:320
+msgid "enable"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:162
+#: rhodecode/templates/summary/summary.html:297
+#, python-format
+msgid "Download %s as %s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:168
+msgid "Check this to download archive with subrepos"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:168
+msgid "with subrepos"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:176
 msgid "Feeds"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:247
+#: rhodecode/templates/summary/summary.html:257
+#: rhodecode/templates/summary/summary.html:684
+#: rhodecode/templates/summary/summary.html:695
+msgid "show more"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:312
 msgid "Commit activity by day / author"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:546
+#: rhodecode/templates/summary/summary.html:324
+msgid "Loaded in"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:603
 msgid "commits"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:547
+#: rhodecode/templates/summary/summary.html:604
 msgid "files added"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:548
+#: rhodecode/templates/summary/summary.html:605
 msgid "files changed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:549
+#: rhodecode/templates/summary/summary.html:606
 msgid "files removed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:553
+#: rhodecode/templates/summary/summary.html:610
 msgid "file added"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:554
+#: rhodecode/templates/summary/summary.html:611
 msgid "file changed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:555
+#: rhodecode/templates/summary/summary.html:612
 msgid "file removed"
 msgstr ""