merge with rc1

rhodecode/i18n/en/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: rhodecode 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-01-28 00:24+0100\n"
+"POT-Creation-Date: 2013-04-05 10:19-0700\n"
 "PO-Revision-Date: 2011-02-25 19:13+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <[e-mail]>\n"
@@ -22,11 +22,11 b' msgid "All Branches"'
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:83
-msgid "show white space"
+msgid "Show white space"
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
-msgid "ignore white space"
+msgid "Ignore white space"
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:163
@@ -35,7 +35,7 b' msgid "%s line context"'
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:329
-#: rhodecode/controllers/pullrequests.py:416
+#: rhodecode/controllers/pullrequests.py:438
 #, python-format
 msgid "Status change -> %s"
 msgstr ""
@@ -46,8 +46,8 b' msgid ""'
 "not allowed"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:75
-#: rhodecode/controllers/pullrequests.py:121
+#: rhodecode/controllers/compare.py:74
+#: rhodecode/controllers/pullrequests.py:167
 #: rhodecode/controllers/shortlog.py:100
 msgid "There are no changesets yet"
 msgstr ""
@@ -89,106 +89,115 b' msgid "%s %s feed"'
 msgstr ""
 
 #: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:137
-#: rhodecode/templates/changeset/changeset.html:149
-#: rhodecode/templates/compare/compare_diff.html:62
-#: rhodecode/templates/compare/compare_diff.html:73
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
-#: rhodecode/templates/pullrequests/pullrequest_show.html:171
+#: rhodecode/templates/changeset/changeset.html:134
+#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/compare/compare_diff.html:58
+#: rhodecode/templates/compare/compare_diff.html:69
+#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:195
 msgid "Changeset was too big and was cut off..."
 msgstr ""
 
-#: rhodecode/controllers/feed.py:92
-msgid "commited on"
-msgstr ""
-
-#: rhodecode/controllers/files.py:86
-msgid "click here to add new file"
-msgstr ""
-
-#: rhodecode/controllers/files.py:87
+#: rhodecode/controllers/feed.py:91
+#, 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
 #, python-format
 msgid "There are no files yet %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338
+#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:281
+#: rhodecode/controllers/files.py:279
 msgid "You can only edit files with revision being a valid branch "
 msgstr ""
 
-#: rhodecode/controllers/files.py:295
+#: rhodecode/controllers/files.py:293
 #, python-format
 msgid "Edited file %s via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:311
+#: rhodecode/controllers/files.py:309
 msgid "No changes"
 msgstr ""
 
-#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384
+#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388
 #, python-format
 msgid "Successfully committed to %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390
+#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/controllers/files.py:350
+#: rhodecode/controllers/files.py:347
 msgid "Added file via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:370
+#: rhodecode/controllers/files.py:364
 msgid "No content"
 msgstr ""
 
-#: rhodecode/controllers/files.py:374
+#: rhodecode/controllers/files.py:368
 msgid "No filename"
 msgstr ""
 
-#: rhodecode/controllers/files.py:416
-msgid "downloads disabled"
-msgstr ""
-
-#: rhodecode/controllers/files.py:427
-#, python-format
-msgid "Unknown revision %s"
-msgstr ""
-
-#: rhodecode/controllers/files.py:429
-msgid "Empty repository"
+#: rhodecode/controllers/files.py:372
+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
+#, python-format
+msgid "Unknown revision %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:433
+msgid "Empty repository"
+msgstr ""
+
+#: rhodecode/controllers/files.py:435
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/controllers/files.py:576
-#: rhodecode/templates/changeset/changeset_range.html:13
-#: rhodecode/templates/changeset/changeset_range.html:31
+#: rhodecode/controllers/files.py:617
+#: rhodecode/templates/changeset/changeset_range.html:9
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564
+#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131
+#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606
+#: rhodecode/templates/switch_to_list.html:3
+#: rhodecode/templates/branches/branches.html:10
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78
-#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575
+#: 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
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:165
+#: rhodecode/controllers/forks.py:175
 #, python-format
-msgid "forked %s repository as %s"
-msgstr ""
-
-#: rhodecode/controllers/forks.py:179
+msgid "Forked repository %s as %s"
+msgstr ""
+
+#: rhodecode/controllers/forks.py:189
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
@@ -198,50 +207,69 b' msgid "public journal"'
 msgstr ""
 
 #: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322
-#: rhodecode/templates/base/base.html:238
 #: rhodecode/templates/journal/journal.html:12
 msgid "journal"
 msgstr ""
 
-#: rhodecode/controllers/login.py:142
-msgid "You have successfully registered into rhodecode"
-msgstr ""
-
-#: rhodecode/controllers/login.py:163
+#: rhodecode/controllers/login.py:138
+msgid "You have successfully registered into RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/login.py:159
 msgid "Your password reset link was sent"
 msgstr ""
 
-#: rhodecode/controllers/login.py:183
+#: rhodecode/controllers/login.py:179
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570
+#: rhodecode/controllers/pullrequests.py:118
+#: rhodecode/templates/changeset/changeset.html:10
+#: rhodecode/templates/email_templates/changeset_comment.html:15
+msgid "Changeset"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:128
+msgid "Special"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:129
+msgid "Peer branches"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612
+#: rhodecode/templates/switch_to_list.html:28
+#: rhodecode/templates/bookmarks/bookmarks.html:10
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:190
+#: rhodecode/controllers/pullrequests.py:228
 msgid "Pull request requires a title with min. 3 chars"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:192
-msgid "error during creation of pull request"
-msgstr ""
-
-#: rhodecode/controllers/pullrequests.py:224
+#: rhodecode/controllers/pullrequests.py:230
+msgid "Error creating pull request"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:251
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:227
+#: rhodecode/controllers/pullrequests.py:254
 msgid "Error occurred during sending pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:260
+#: rhodecode/controllers/pullrequests.py:287
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:451
+#: rhodecode/controllers/pullrequests.py:441
+msgid "Closing with"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:478
 msgid "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr ""
 
@@ -257,55 +285,12 b' msgstr ""'
 msgid "An error occurred during this search operation"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:120
-#: rhodecode/controllers/admin/repos.py:254
-#, python-format
-msgid "Repository %s updated successfully"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:138
-#: rhodecode/controllers/admin/repos.py:272
-#, python-format
-msgid "error occurred during update of repository %s"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:163
-#: rhodecode/controllers/admin/repos.py:297
-#, python-format
-msgid "deleted repository %s"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:167
-#: rhodecode/controllers/admin/repos.py:307
-#: rhodecode/controllers/admin/repos.py:313
-#, python-format
-msgid "An error occurred during deletion of %s"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:186
-msgid "unlocked"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:189
-msgid "locked"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:191
-#, python-format
-msgid "Repository has been %s"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:195
-#: rhodecode/controllers/admin/repos.py:405
-msgid "An error occurred during unlocking"
-msgstr ""
-
-#: rhodecode/controllers/summary.py:140
+#: rhodecode/controllers/summary.py:141
 msgid "No data loaded yet"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:144
-#: rhodecode/templates/summary/summary.html:157
+#: rhodecode/controllers/summary.py:147
+#: rhodecode/templates/summary/summary.html:149
 msgid "Statistics are disabled for this repository"
 msgstr ""
 
@@ -314,7 +299,7 b' msgid "Default settings updated successf'
 msgstr ""
 
 #: rhodecode/controllers/admin/defaults.py:110
-msgid "error occurred during update of defaults"
+msgid "Error occurred during update of defaults"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:50
@@ -370,7 +355,7 b' msgid "Unable to activate ldap. The \\"py'
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:147
-msgid "error occurred during update of ldap settings"
+msgid "Error occurred during update of ldap settings"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:60
@@ -393,43 +378,42 b' msgstr ""'
 #: rhodecode/templates/admin/defaults/defaults.html:9
 #: 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/repo_add.html:10
+#: rhodecode/templates/admin/repos/repo_add.html:14
 #: rhodecode/templates/admin/repos/repos.html:9
-#: 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/repos_groups/repos_groups_add.html:9
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13
 #: 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:130
+#: rhodecode/templates/admin/users/user_edit.html:133
 #: rhodecode/templates/admin/users/users.html:9
+#: rhodecode/templates/admin/users/users.html:85
 #: 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:203
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:326
-#: rhodecode/templates/base/base.html:328
+#: rhodecode/templates/base/base.html:292
+#: rhodecode/templates/base/base.html:293
+#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:300
 msgid "Admin"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:70
-msgid "disabled"
+#: 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"
+msgid "Allowed with manual account activation"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:74
-msgid "allowed with automatic account activation"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:76
-#: rhodecode/controllers/admin/permissions.py:79
-msgid "Disabled"
+msgid "Allowed with automatic account activation"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:77
@@ -442,154 +426,221 b' msgid "Default permissions updated succe'
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:142
-msgid "error occurred during update of permissions"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:123
+msgid "Error occurred during update of permissions"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:127
 msgid "--REMOVE FORK--"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:162
+#: rhodecode/controllers/admin/repos.py:168
 #, python-format
-msgid "created repository %s from %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:166
+msgid "Created repository %s from %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:174
 #, python-format
-msgid "created repository %s"
+msgid "Created repository %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:197
 #, python-format
-msgid "error occurred during creation of repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:302
+msgid "Error creating repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:266
+#, python-format
+msgid "Repository %s updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:284
+#, python-format
+msgid "Error occurred during update of repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:311
+#: rhodecode/controllers/api/api.py:877
+#, python-format
+msgid "Detached %s forks"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:314
+#: rhodecode/controllers/api/api.py:879
+#, python-format
+msgid "Deleted %s forks"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:319
+#, python-format
+msgid "Deleted repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:322
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/admin/repos.py:327
+#, python-format
+msgid "An error occurred during deletion of %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:365
+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:350
-msgid "An error occurred during deletion of repository users groups"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:368
+#: rhodecode/controllers/admin/repos.py:403
+msgid "An error occurred during deletion of repository user groups"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:421
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:385
+#: rhodecode/controllers/admin/repos.py:438
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:425
+#: rhodecode/controllers/admin/repos.py:458
+#: rhodecode/controllers/admin/repos.py:485
+msgid "An error occurred during unlocking"
+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:429
+#: rhodecode/controllers/admin/repos.py:509
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301
+#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302
 msgid "Token mismatch"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:447
+#: rhodecode/controllers/admin/repos.py:527
 msgid "Pulled from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:449
+#: rhodecode/controllers/admin/repos.py:529
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:465
+#: rhodecode/controllers/admin/repos.py:545
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:467
+#: rhodecode/controllers/admin/repos.py:547
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:471
+#: rhodecode/controllers/admin/repos.py:551
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:136
+#: rhodecode/controllers/admin/repos.py:590
+msgid "An error occurred during creation of field"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:604
+msgid "An error occurred during removal of field"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:145
 #, python-format
-msgid "created repos group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:148
+msgid "Created repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:157
 #, python-format
-msgid "error occurred during creation of repos group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:205
-#, python-format
-msgid "updated repos group %s"
+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
 #, python-format
-msgid "error occurred during update of repos group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:238
+msgid "Updated repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:235
+#, python-format
+msgid "Error occurred during update of repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:253
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:246
+#: rhodecode/controllers/admin/repos_groups.py:260
 #, python-format
-msgid "removed repos group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:252
-msgid "Cannot delete this group it still contains subgroups"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:257
-#: rhodecode/controllers/admin/repos_groups.py:262
+msgid "This group contains %s subgroups and cannot be deleted"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:266
+#, python-format
+msgid "Removed repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:271
 #, python-format
-msgid "error occurred during deletion of repos group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:283
+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:304
-msgid "An error occurred during deletion of group users groups"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:124
+#: rhodecode/controllers/admin/repos_groups.py:318
+msgid "An error occurred during deletion of group user groups"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:126
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:133
+#: rhodecode/controllers/admin/settings.py:135
 msgid "Whoosh reindex task scheduled"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:164
+#: rhodecode/controllers/admin/settings.py:166
 msgid "Updated application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:168
+#: rhodecode/controllers/admin/settings.py:170
 #: rhodecode/controllers/admin/settings.py:301
-msgid "error occurred during updating application settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:209
+msgid "Error occurred during updating application settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:216
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:214
-msgid "error occurred during updating visualisation settings"
+#: rhodecode/controllers/admin/settings.py:221
+msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:297
@@ -605,35 +656,35 b' msgid "Updated hooks"'
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:327
-msgid "error occurred during hook creation"
+msgid "Error occurred during hook creation"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:346
 msgid "Email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:408
+#: rhodecode/controllers/admin/settings.py:410
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:448
+#: rhodecode/controllers/admin/settings.py:452
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:463
+#: rhodecode/controllers/admin/settings.py:467
 #: rhodecode/controllers/admin/users.py:198
 #, python-format
-msgid "error occurred during update of user %s"
+msgid "Error occurred during update of user %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:130
 #, python-format
-msgid "created user %s"
+msgid "Created user %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:142
 #, python-format
-msgid "error occurred during creation of user %s"
+msgid "Error occurred during creation of user %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:176
@@ -641,7 +692,7 b' msgid "User updated successfully"'
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:214
-msgid "successfully deleted user"
+msgid "Successfully deleted user"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:219
@@ -669,7 +720,7 b' msgid "Revoked \'repository fork\' permiss'
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:298
-#: rhodecode/controllers/admin/users_groups.py:279
+#: rhodecode/controllers/admin/users_groups.py:281
 msgid "An error occurred during permissions saving"
 msgstr ""
 
@@ -701,220 +752,219 b' msgstr ""'
 
 #: rhodecode/controllers/admin/users_groups.py:86
 #, python-format
-msgid "created users group %s"
+msgid "Created user group %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users_groups.py:97
 #, python-format
-msgid "error occurred during creation of users group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:164
+msgid "Error occurred during creation of user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:166
 #, python-format
-msgid "updated users group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:186
+msgid "Updated user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:188
 #, python-format
-msgid "error occurred during update of users group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:203
-msgid "successfully deleted users group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:208
-msgid "An error occurred during deletion of users group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:257
-msgid "Granted 'repository create' permission to users group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:262
-msgid "Revoked 'repository create' permission to users group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:268
-msgid "Granted 'repository fork' permission to users group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:273
-msgid "Revoked 'repository fork' permission to users group"
-msgstr ""
-
-#: rhodecode/lib/auth.py:509
+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
+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
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 
-#: rhodecode/lib/auth.py:558
+#: rhodecode/lib/auth.py:579
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: rhodecode/lib/auth.py:599
+#: rhodecode/lib/auth.py:620
 msgid "You need to be a signed in to view this page"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:74
-msgid "binary file"
-msgstr ""
-
-#: rhodecode/lib/diffs.py:90
+#: rhodecode/lib/diffs.py:66
+msgid "Binary file"
+msgstr ""
+
+#: rhodecode/lib/diffs.py:82
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:100
+#: rhodecode/lib/diffs.py:92
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:374
+#: rhodecode/lib/helpers.py:394
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:486
+#: rhodecode/lib/helpers.py:506
 msgid "True"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:490
+#: rhodecode/lib/helpers.py:509
 msgid "False"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:530
+#: rhodecode/lib/helpers.py:547
 #, python-format
 msgid "Deleted branch: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:533
+#: rhodecode/lib/helpers.py:550
 #, python-format
 msgid "Created tag: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:546
+#: rhodecode/lib/helpers.py:563
 msgid "Changeset not found"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:589
-#, python-format
-msgid "Show all combined changesets %s->%s"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:595
-msgid "compare view"
-msgstr ""
-
 #: rhodecode/lib/helpers.py:615
-msgid "and"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:616
 #, python-format
-msgid "%s more"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51
-msgid "revisions"
+msgid "Show all combined changesets %s->%s"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:621
+msgid "compare view"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:641
+msgid "and"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:642
+#, python-format
+msgid "%s more"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44
+msgid "revisions"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:667
 #, python-format
 msgid "fork name %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:658
-#: rhodecode/templates/pullrequests/pullrequest_show.html:4
-#: rhodecode/templates/pullrequests/pullrequest_show.html:12
-#, python-format
-msgid "Pull request #%s"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:664
-msgid "[deleted] repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676
-msgid "[created] repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:668
-msgid "[created] repository as fork"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678
-msgid "[forked] repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680
-msgid "[updated] repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:674
-msgid "[delete] repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:682
-msgid "[created] user"
-msgstr ""
-
 #: rhodecode/lib/helpers.py:684
-msgid "[updated] user"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:686
-msgid "[created] users group"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:688
-msgid "[updated] users group"
+#: rhodecode/templates/pullrequests/pullrequest_show.html:8
+#, python-format
+msgid "Pull request #%s"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:690
-msgid "[commented] on revision in repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:692
-msgid "[commented] on pull request for"
+msgid "[deleted] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702
+msgid "[created] repository"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:694
-msgid "[closed] pull request for"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:696
-msgid "[pushed] into"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:698
-msgid "[committed via RhodeCode] into repository"
+msgid "[created] repository as fork"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704
+msgid "[forked] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706
+msgid "[updated] repository"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:700
+msgid "[delete] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:708
+msgid "[created] user"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:710
+msgid "[updated] user"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:712
+msgid "[created] user group"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:714
+msgid "[updated] user group"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:716
+msgid "[commented] on revision in repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:718
+msgid "[commented] on pull request for"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:720
+msgid "[closed] pull request for"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:722
+msgid "[pushed] into"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:724
+msgid "[committed via RhodeCode] into repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:726
 msgid "[pulled from remote] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:702
+#: rhodecode/lib/helpers.py:728
 msgid "[pulled] from"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:704
+#: rhodecode/lib/helpers.py:730
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:706
+#: rhodecode/lib/helpers.py:732
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:884
+#: rhodecode/lib/helpers.py:910
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:888
+#: rhodecode/lib/helpers.py:914
 msgid "No Files"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1164
+#: rhodecode/lib/helpers.py:1198
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -922,185 +972,225 b' msgid ""'
 "repositories"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:403
+#: rhodecode/lib/unionrepo.py:193
+msgid "cannot create new union repository"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:411
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:404
+#: rhodecode/lib/utils2.py:412
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:405
+#: rhodecode/lib/utils2.py:413
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:406
+#: rhodecode/lib/utils2.py:414
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:407
+#: rhodecode/lib/utils2.py:415
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:408
+#: rhodecode/lib/utils2.py:416
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:424
+#: rhodecode/lib/utils2.py:432
 #, python-format
 msgid "in %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:426
-#, python-format
-msgid "%s ago"
-msgstr ""
-
-#: rhodecode/lib/utils2.py:428
-#, python-format
-msgid "in %s and %s"
-msgstr ""
-
-#: rhodecode/lib/utils2.py:431
-#, python-format
-msgid "%s and %s ago"
-msgstr ""
-
 #: rhodecode/lib/utils2.py:434
+#, python-format
+msgid "%s ago"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:436
+#, python-format
+msgid "in %s and %s"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:439
+#, python-format
+msgid "%s and %s ago"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:442
 msgid "just now"
 msgstr ""
 
-#: rhodecode/lib/celerylib/tasks.py:270
-msgid "password reset link"
-msgstr ""
-
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313
+#: 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
 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/model/db.py:1314
+#: 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
 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/model/db.py:1315
+#: 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
 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/model/db.py:1316
+#: 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
 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/model/db.py:1318
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294
 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/model/db.py:1319
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295
 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/model/db.py:1320
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296
 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/model/db.py:1321
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297
 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/model/db.py:1323
+#: 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
 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/model/db.py:1324
+#: 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
 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/model/db.py:1325
+#: 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
 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/model/db.py:1326
+#: 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
 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/model/db.py:1327
+#: 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
 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/model/db.py:1328
+#: 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
 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/model/db.py:1329
+#: 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
 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/model/db.py:1332
+#: 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
 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/model/db.py:1776
+#: 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
 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/model/db.py:1777
+#: 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
 msgid "Approved"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778
+#: 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
 msgid "Rejected"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779
+#: 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
 msgid "Under Review"
 msgstr ""
 
-#: rhodecode/model/comment.py:109
+#: rhodecode/model/comment.py:75
 #, python-format
 msgid "on line %s"
 msgstr ""
 
-#: rhodecode/model/comment.py:176
+#: rhodecode/model/comment.py:219
 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 ""
@@ -1119,216 +1209,237 b' msgstr ""'
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
-#: rhodecode/model/notification.py:220
-#, python-format
-msgid "commented on commit at %(when)s"
-msgstr ""
-
-#: rhodecode/model/notification.py:221
-#, python-format
-msgid "sent message at %(when)s"
-msgstr ""
-
-#: rhodecode/model/notification.py:222
-#, python-format
-msgid "mentioned you at %(when)s"
-msgstr ""
-
-#: rhodecode/model/notification.py:223
-#, python-format
-msgid "registered in RhodeCode at %(when)s"
-msgstr ""
-
 #: rhodecode/model/notification.py:224
 #, python-format
-msgid "opened new pull request at %(when)s"
+msgid "%(user)s commented on changeset at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:225
 #, python-format
-msgid "commented on pull request at %(when)s"
-msgstr ""
-
-#: rhodecode/model/pull_request.py:100
+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 wants you to review pull request #%(pr_id)s"
-msgstr ""
-
-#: rhodecode/model/scm.py:556
+msgid "%(user)s opened new pull request at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:229
+#, python-format
+msgid "%(user)s commented on pull request at %(when)s"
+msgstr ""
+
+#: rhodecode/model/pull_request.py:104
+#, python-format
+msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
+msgstr ""
+
+#: rhodecode/model/scm.py:598
 msgid "latest tip"
 msgstr ""
 
-#: rhodecode/model/user.py:231
-msgid "new user registration"
-msgstr ""
-
-#: rhodecode/model/user.py:256 rhodecode/model/user.py:280
+#: rhodecode/model/user.py:232
+msgid "New user registration"
+msgstr ""
+
+#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:302
+#: rhodecode/model/user.py:303
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:308
+#: rhodecode/model/user.py:309
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories. %s"
 msgstr ""
 
-#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38
+#: rhodecode/model/user.py:334
+msgid "Password reset link"
+msgstr ""
+
+#: rhodecode/model/user.py:366
+msgid "Your new password"
+msgstr ""
+
+#: rhodecode/model/user.py:367
+#, python-format
+msgid "Your new RhodeCode password:%s"
+msgstr ""
+
+#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39
 msgid "Value cannot be an empty list"
 msgstr ""
 
-#: rhodecode/model/validators.py:84
+#: rhodecode/model/validators.py:85
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:86
+#: rhodecode/model/validators.py:87
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr ""
 
-#: rhodecode/model/validators.py:88
+#: rhodecode/model/validators.py:89
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
 msgstr ""
 
-#: rhodecode/model/validators.py:116
+#: rhodecode/model/validators.py:117
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:135
-msgid "Invalid users group name"
-msgstr ""
-
 #: rhodecode/model/validators.py:136
+msgid "Invalid user group name"
+msgstr ""
+
+#: rhodecode/model/validators.py:137
 #, python-format
-msgid "Users group \"%(usersgroup)s\" already exists"
-msgstr ""
-
-#: rhodecode/model/validators.py:138
+msgid "User group \"%(usergroup)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:139
 msgid ""
-"users group name may only contain  alphanumeric characters underscores, "
+"user group name may only contain alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 
-#: rhodecode/model/validators.py:176
-msgid "Cannot assign this group as parent"
-msgstr ""
-
 #: rhodecode/model/validators.py:177
+msgid "Cannot assign this group as parent"
+msgstr ""
+
+#: rhodecode/model/validators.py:178
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:179
+#: rhodecode/model/validators.py:180
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:237
+#: rhodecode/model/validators.py:238
 msgid "Invalid characters (non-ascii) in password"
 msgstr ""
 
-#: rhodecode/model/validators.py:252
+#: rhodecode/model/validators.py:253
 msgid "Passwords do not match"
 msgstr ""
 
-#: rhodecode/model/validators.py:269
-msgid "invalid password"
-msgstr ""
-
 #: rhodecode/model/validators.py:270
-msgid "invalid user name"
+msgid "invalid password"
 msgstr ""
 
 #: rhodecode/model/validators.py:271
+msgid "invalid user name"
+msgstr ""
+
+#: rhodecode/model/validators.py:272
 msgid "Your account is disabled"
 msgstr ""
 
-#: rhodecode/model/validators.py:315
+#: rhodecode/model/validators.py:316
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr ""
 
-#: rhodecode/model/validators.py:317
-#, python-format
-msgid "Repository named %(repo)s already exists"
-msgstr ""
-
 #: rhodecode/model/validators.py:318
 #, python-format
+msgid "Repository named %(repo)s already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:319
+#, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:320
+#: rhodecode/model/validators.py:321
 #, python-format
-msgid "Repositories group with name \"%(repo)s\" already exists"
-msgstr ""
-
-#: rhodecode/model/validators.py:433
+msgid "Repository group with name \"%(repo)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:438
 msgid "invalid clone url"
 msgstr ""
 
-#: rhodecode/model/validators.py:434
+#: rhodecode/model/validators.py:439
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 
-#: rhodecode/model/validators.py:459
+#: rhodecode/model/validators.py:464
 msgid "Fork have to be the same type as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:474
+#: rhodecode/model/validators.py:479
 msgid "You don't have permissions to create repository in this group"
 msgstr ""
 
-#: rhodecode/model/validators.py:501
+#: rhodecode/model/validators.py:481
+msgid "no permission to create repository in root location"
+msgstr ""
+
+#: rhodecode/model/validators.py:518
 msgid "You don't have permissions to create a group in this location"
 msgstr ""
 
-#: rhodecode/model/validators.py:540
-msgid "This username or users group name is not valid"
-msgstr ""
-
-#: rhodecode/model/validators.py:636
+#: rhodecode/model/validators.py:557
+msgid "This username or user group name is not valid"
+msgstr ""
+
+#: rhodecode/model/validators.py:650
 msgid "This is not a valid path"
 msgstr ""
 
-#: rhodecode/model/validators.py:651
+#: rhodecode/model/validators.py:665
 msgid "This e-mail address is already taken"
 msgstr ""
 
-#: rhodecode/model/validators.py:671
+#: rhodecode/model/validators.py:685
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
-#: rhodecode/model/validators.py:708
+#: rhodecode/model/validators.py:722
 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:727
+#: rhodecode/model/validators.py:735
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
-#: rhodecode/model/validators.py:759
+#: rhodecode/model/validators.py:767
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
-#: rhodecode/model/validators.py:760
+#: rhodecode/model/validators.py:768
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 
-#: rhodecode/templates/index.html:3
+#: rhodecode/model/validators.py:800
+msgid "Key name can only consist of letters, underscore, dash or numbers"
+msgstr ""
+
+#: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr ""
 
@@ -1337,222 +1448,226 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:9
 #: rhodecode/templates/admin/users/user_edit_my_account.html:31
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/bookmarks/bookmarks.html:10
+#: rhodecode/templates/bookmarks/bookmarks.html:9
 #: rhodecode/templates/branches/branches.html:9
 #: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:49
-#: rhodecode/templates/journal/journal.html:50
-#: rhodecode/templates/tags/tags.html:10
+#: rhodecode/templates/journal/journal.html:46
+#: rhodecode/templates/journal/journal.html:47
+#: rhodecode/templates/tags/tags.html:9
 msgid "quick filter..."
 msgstr ""
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:239
 msgid "repositories"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:14
-#: rhodecode/templates/index_base.html:17
+#: rhodecode/templates/index_base.html:13
+#: rhodecode/templates/index_base.html:18
 #: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
 #: rhodecode/templates/admin/repos/repos.html:21
 msgid "Add repository"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:23
+#: rhodecode/templates/index_base.html:15
+#: rhodecode/templates/index_base.html:20
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31
+msgid "Add group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:27
 msgid "Edit group"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:23
+#: rhodecode/templates/index_base.html:27
 msgid "You have admin right to this group, and can edit it"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:36
+#: rhodecode/templates/index_base.html:40
 #: rhodecode/templates/index_base.html:140
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
+#: 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
 msgid "Group name"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:37
-#: rhodecode/templates/index_base.html:79
+#: 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:273
+#: rhodecode/templates/index_base.html:270
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:73
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
-#: rhodecode/templates/forks/fork.html:59
-#: rhodecode/templates/settings/repo_settings.html:66
-#: rhodecode/templates/summary/summary.html:114
+#: 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/forks/fork.html:56
+#: rhodecode/templates/pullrequests/pullrequest.html:101
+#: rhodecode/templates/summary/summary.html:106
 msgid "Description"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:47
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47
-msgid "Repositories group"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:78
+#: 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_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:271
-#: rhodecode/templates/admin/permissions/permissions.html:117
+#: rhodecode/templates/index_base.html:268
 #: 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.html:200
-#: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:211
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:184
-#: rhodecode/templates/bookmarks/bookmarks.html:36
+#: 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/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:50
+#: 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:201
-#: rhodecode/templates/journal/journal.html:305
-#: rhodecode/templates/settings/repo_settings.html:31
-#: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:132
-#: rhodecode/templates/tags/tags.html:51
+#: rhodecode/templates/journal/journal.html:193
+#: rhodecode/templates/journal/journal.html:296
+#: 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:80
+#: rhodecode/templates/index_base.html:84
 msgid "Last change"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:81
+#: rhodecode/templates/index_base.html:85
 #: rhodecode/templates/index_base.html:183
-#: rhodecode/templates/index_base.html:276
+#: rhodecode/templates/index_base.html:273
 #: rhodecode/templates/admin/repos/repos.html:74
-#: rhodecode/templates/admin/users/user_edit_my_account.html:213
-#: rhodecode/templates/journal/journal.html:203
-#: rhodecode/templates/journal/journal.html:307
+#: rhodecode/templates/admin/users/user_edit_my_account.html:174
+#: rhodecode/templates/journal/journal.html:195
+#: rhodecode/templates/journal/journal.html:298
 msgid "Tip"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:82
+#: rhodecode/templates/index_base.html:86
 #: rhodecode/templates/index_base.html:185
-#: rhodecode/templates/index_base.html:278
+#: rhodecode/templates/index_base.html:275
 #: rhodecode/templates/admin/repos/repo_edit.html:121
 #: rhodecode/templates/admin/repos/repos.html:76
 msgid "Owner"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:83
-#: rhodecode/templates/summary/summary.html:48
-#: rhodecode/templates/summary/summary.html:51
-msgid "RSS"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:84
+#: rhodecode/templates/index_base.html:87
 msgid "Atom"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:171
-#: rhodecode/templates/index_base.html:211
-#: rhodecode/templates/index_base.html:300
+#: 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:235
+#: rhodecode/templates/admin/users/user_edit_my_account.html:196
 #: rhodecode/templates/admin/users/users.html:107
-#: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:225
-#: rhodecode/templates/journal/journal.html:329
-#: rhodecode/templates/tags/tags.html:77
+#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/branches/branches.html:73
+#: rhodecode/templates/journal/journal.html:217
+#: rhodecode/templates/journal/journal.html:320
+#: rhodecode/templates/tags/tags.html:74
 msgid "Click to sort ascending"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:172
-#: rhodecode/templates/index_base.html:212
-#: rhodecode/templates/index_base.html:301
+#: 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:236
+#: rhodecode/templates/admin/users/user_edit_my_account.html:197
 #: rhodecode/templates/admin/users/users.html:108
-#: rhodecode/templates/bookmarks/bookmarks.html:61
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:226
-#: rhodecode/templates/journal/journal.html:330
-#: rhodecode/templates/tags/tags.html:78
+#: rhodecode/templates/bookmarks/bookmarks.html:59
+#: rhodecode/templates/branches/branches.html:74
+#: rhodecode/templates/journal/journal.html:218
+#: rhodecode/templates/journal/journal.html:321
+#: rhodecode/templates/tags/tags.html:75
 msgid "Click to sort descending"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:181
-#: rhodecode/templates/index_base.html:274
+#: 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/admin/users/users.html:110
+#: rhodecode/templates/bookmarks/bookmarks.html:61
+#: rhodecode/templates/branches/branches.html:76
+#: rhodecode/templates/journal/journal.html:220
+#: rhodecode/templates/journal/journal.html:323
+#: rhodecode/templates/tags/tags.html:77
+msgid "Data error."
+msgstr ""
+
 #: rhodecode/templates/index_base.html:213
-#: rhodecode/templates/index_base.html:302
-#: rhodecode/templates/admin/repos/repos.html:99
-#: rhodecode/templates/admin/users/user_edit_my_account.html:237
-#: rhodecode/templates/admin/users/users.html:109
+#: rhodecode/templates/index_base.html:300
+#: rhodecode/templates/admin/repos/repos.html:101
+#: rhodecode/templates/admin/users/user_edit_my_account.html:58
+#: rhodecode/templates/admin/users/user_edit_my_account.html:200
+#: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:62
-#: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:227
-#: rhodecode/templates/journal/journal.html:331
-#: rhodecode/templates/tags/tags.html:79
-msgid "No records found."
-msgstr ""
-
-#: rhodecode/templates/index_base.html:214
-#: rhodecode/templates/index_base.html:303
-#: rhodecode/templates/admin/repos/repos.html:100
-#: rhodecode/templates/admin/users/user_edit_my_account.html:238
-#: rhodecode/templates/admin/users/users.html:110
-#: rhodecode/templates/bookmarks/bookmarks.html:63
-#: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:228
-#: rhodecode/templates/journal/journal.html:332
-#: rhodecode/templates/tags/tags.html:80
-msgid "Data error."
-msgstr ""
-
-#: rhodecode/templates/index_base.html:215
-#: rhodecode/templates/index_base.html:304
-#: rhodecode/templates/admin/repos/repos.html:101
-#: rhodecode/templates/admin/users/user_edit_my_account.html:105
-#: rhodecode/templates/admin/users/user_edit_my_account.html:239
-#: rhodecode/templates/admin/users/users.html:111
-#: rhodecode/templates/bookmarks/bookmarks.html:64
-#: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:229
-#: rhodecode/templates/journal/journal.html:333
-#: rhodecode/templates/tags/tags.html:81
+#: rhodecode/templates/branches/branches.html:77
+#: rhodecode/templates/journal/journal.html:221
+#: rhodecode/templates/journal/journal.html:324
+#: rhodecode/templates/tags/tags.html:78
 msgid "Loading..."
 msgstr ""
 
-#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
-msgid "Sign In"
+#: rhodecode/templates/index_base.html:298
+msgid "No repositories found."
+msgstr ""
+
+#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227
+msgid "Log In"
 msgstr ""
 
 #: rhodecode/templates/login.html:21
-msgid "Sign In to"
+#, python-format
+msgid "Log In to %s"
 msgstr ""
 
 #: 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:54
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
-#: rhodecode/templates/base/base.html:89
-#: rhodecode/templates/summary/summary.html:131
+#: 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/summary/summary.html:123
 msgid "Username"
 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:98
+#: rhodecode/templates/base/base.html:212
 msgid "Password"
 msgstr ""
 
@@ -1560,16 +1675,20 b' msgstr ""'
 msgid "Remember me"
 msgstr ""
 
+#: rhodecode/templates/login.html:54
+msgid "Sign In"
+msgstr ""
+
 #: rhodecode/templates/login.html:60
 msgid "Forgot your password ?"
 msgstr ""
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223
 msgid "Don't have an account ?"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:5
-msgid "Reset your password"
+msgid "Password Reset"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:11
@@ -1602,23 +1721,23 b' msgstr ""'
 
 #: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57
+#: rhodecode/templates/admin/users/user_edit.html:97
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
 msgid "First Name"
 msgstr ""
 
 #: rhodecode/templates/register.html:56
 #: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:103
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66
+#: rhodecode/templates/admin/users/user_edit.html:106
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
 msgid "Last Name"
 msgstr ""
 
 #: rhodecode/templates/register.html:65
 #: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:112
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75
-#: rhodecode/templates/summary/summary.html:133
+#: rhodecode/templates/admin/users/user_edit.html:115
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
+#: rhodecode/templates/summary/summary.html:125
 msgid "Email"
 msgstr ""
 
@@ -1630,44 +1749,31 b' msgstr ""'
 msgid "Your account must wait for activation by administrator"
 msgstr ""
 
-#: rhodecode/templates/repo_switcher_list.html:11
+#: 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/settings/repo_settings.html:76
+#: rhodecode/templates/data_table/_dt_elements.html:61
+#: rhodecode/templates/summary/summary.html:77
 msgid "Private repository"
 msgstr ""
 
-#: rhodecode/templates/repo_switcher_list.html:16
+#: rhodecode/templates/repo_switcher_list.html:12
+#: rhodecode/templates/data_table/_dt_elements.html:63
+#: rhodecode/templates/summary/summary.html:79
 msgid "Public repository"
 msgstr ""
 
-#: rhodecode/templates/switch_to_list.html:3
-#: rhodecode/templates/branches/branches.html:14
-msgid "branches"
-msgstr ""
-
 #: rhodecode/templates/switch_to_list.html:10
 #: rhodecode/templates/branches/branches_data.html:57
 msgid "There are no branches yet"
 msgstr ""
 
-#: rhodecode/templates/switch_to_list.html:15
-#: rhodecode/templates/shortlog/shortlog_data.html:10
-#: rhodecode/templates/tags/tags.html:15
-msgid "tags"
-msgstr ""
-
 #: rhodecode/templates/switch_to_list.html:22
 #: rhodecode/templates/tags/tags_data.html:38
 msgid "There are no tags yet"
 msgstr ""
 
-#: rhodecode/templates/switch_to_list.html:28
-#: rhodecode/templates/bookmarks/bookmarks.html:15
-msgid "bookmarks"
-msgstr ""
-
 #: rhodecode/templates/switch_to_list.html:35
 #: rhodecode/templates/bookmarks/bookmarks_data.html:32
 msgid "There are no bookmarks yet"
@@ -1675,6 +1781,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:13
+#: rhodecode/templates/base/base.html:68
 msgid "Admin journal"
 msgstr ""
 
@@ -1697,9 +1804,12 b' msgstr[1] ""'
 
 #: rhodecode/templates/admin/admin_log.html:6
 #: rhodecode/templates/admin/repos/repos.html:77
-#: rhodecode/templates/admin/users/user_edit_my_account.html:215
-#: rhodecode/templates/journal/journal.html:205
-#: rhodecode/templates/journal/journal.html:309
+#: 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/journal/journal.html:197
+#: rhodecode/templates/journal/journal.html:300
 msgid "Action"
 msgstr ""
 
@@ -1709,11 +1819,11 b' msgid "Repository"'
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:8
-#: rhodecode/templates/bookmarks/bookmarks.html:37
+#: rhodecode/templates/bookmarks/bookmarks.html:35
 #: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:51
+#: rhodecode/templates/branches/branches.html:48
 #: rhodecode/templates/branches/branches_data.html:7
-#: rhodecode/templates/tags/tags.html:52
+#: rhodecode/templates/tags/tags.html:49
 #: rhodecode/templates/tags/tags_data.html:7
 msgid "Date"
 msgstr ""
@@ -1732,6 +1842,7 b' msgid "Repositories defaults"'
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:11
+#: rhodecode/templates/base/base.html:75
 msgid "Defaults"
 msgstr ""
 
@@ -1744,8 +1855,7 b' 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/forks/fork.html:72
-#: rhodecode/templates/settings/repo_settings.html:80
+#: rhodecode/templates/forks/fork.html:69
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
@@ -1773,7 +1883,7 b' 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:71
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
 msgid "Enable locking"
 msgstr ""
 
@@ -1785,14 +1895,17 b' 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:141
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79
+#: 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/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_edit.html:137
-#: rhodecode/templates/admin/users/user_edit.html:182
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83
+#: 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/settings/repo_settings.html:94
 msgid "Save"
 msgstr ""
 
@@ -1801,7 +1914,9 b' msgid "LDAP administration"'
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:11
-msgid "Ldap"
+#: rhodecode/templates/admin/users/users.html:86
+#: rhodecode/templates/base/base.html:74
+msgid "LDAP"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:28
@@ -1883,8 +1998,7 b' msgid "Comments"'
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:272
-#: rhodecode/templates/base/base.html:274
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
 msgid "Pull requests"
 msgstr ""
 
@@ -1902,6 +2016,7 b' msgid "Show notification"'
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/show_notification.html:9
+#: rhodecode/templates/base/base.html:241
 msgid "Notifications"
 msgstr ""
 
@@ -1910,11 +2025,12 b' msgid "Permissions administration"'
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:134
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63
-#: rhodecode/templates/admin/users/user_edit.html:147
+#: 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/users/user_edit.html:150
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
-#: rhodecode/templates/settings/repo_settings.html:86
+#: rhodecode/templates/base/base.html:73
 msgid "Permissions"
 msgstr ""
 
@@ -1928,30 +2044,21 b' msgstr ""'
 
 #: rhodecode/templates/admin/permissions/permissions.html:49
 msgid ""
-"All default permissions on each repository will be reset to choosen "
+"All default permissions on each repository will be reset to chosen "
 "permission, note that all custom default permission on repositories will "
 "be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:50
 #: rhodecode/templates/admin/permissions/permissions.html:63
-msgid "overwrite existing settings"
-msgstr ""
-
-#: 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_groups/repos_groups.html:4
-#: rhodecode/templates/forks/fork.html:50
-#: rhodecode/templates/settings/repo_settings.html:48
-msgid "Repository group"
+msgid "Overwrite existing settings"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:62
 msgid ""
-"All default permissions on each repository group will be reset to choosen"
-" permission, note that all custom default permission on repositories "
-"group will be lost"
+"All default permissions on each repository 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:69
@@ -1967,22 +2074,23 b' msgid "Repository forking"'
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:93
-#: rhodecode/templates/admin/permissions/permissions.html:209
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80
-#: rhodecode/templates/admin/settings/settings.html:113
-#: rhodecode/templates/admin/settings/settings.html:179
-#: rhodecode/templates/admin/settings/settings.html:269
-#: rhodecode/templates/admin/users/user_edit.html:138
-#: rhodecode/templates/admin/users/user_edit.html:183
-#: rhodecode/templates/admin/users/user_edit.html:286
-#: rhodecode/templates/admin/users/user_edit.html:334
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84
+#: 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:82
-#: rhodecode/templates/files/files_edit.html:68
-#: rhodecode/templates/pullrequests/pullrequest.html:124
-#: rhodecode/templates/settings/repo_settings.html:95
+#: rhodecode/templates/files/files_add.html:80
+#: rhodecode/templates/files/files_edit.html:66
+#: rhodecode/templates/pullrequests/pullrequest.html:110
 msgid "Reset"
 msgstr ""
 
@@ -1990,104 +2098,70 b' msgstr ""'
 msgid "Default User Permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:111
-#: rhodecode/templates/admin/users/user_edit.html:194
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
-msgid "Nothing here yet"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:118
-#: rhodecode/templates/admin/users/user_edit.html:201
-#: rhodecode/templates/admin/users/user_edit_my_account.html:61
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
-msgid "Permission"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:119
-#: rhodecode/templates/admin/users/user_edit.html:202
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
-msgid "Edit Permission"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:149
-#: rhodecode/templates/admin/permissions/permissions.html:151
-#: rhodecode/templates/admin/repos/repo_edit.html:13
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:232
-#: rhodecode/templates/admin/users/user_edit.html:234
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
-#: rhodecode/templates/data_table/_dt_elements.html:116
-#: rhodecode/templates/data_table/_dt_elements.html:117
-msgid "edit"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:168
-#: rhodecode/templates/admin/users/user_edit.html:295
+#: rhodecode/templates/admin/permissions/permissions.html:113
+#: rhodecode/templates/admin/users/user_edit.html:244
 msgid "Allowed IP addresses"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:182
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
-#: rhodecode/templates/admin/users/user_edit.html:263
-#: rhodecode/templates/admin/users/user_edit.html:308
-#: rhodecode/templates/admin/users_groups/users_groups.html:44
+#: rhodecode/templates/admin/permissions/permissions.html:127
+#: rhodecode/templates/admin/repos/repo_edit.html:347
+#: 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/data_table/_dt_elements.html:122
 #: rhodecode/templates/data_table/_dt_elements.html:130
 msgid "delete"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:183
-#: rhodecode/templates/admin/users/user_edit.html:309
+#: rhodecode/templates/admin/permissions/permissions.html:128
+#: rhodecode/templates/admin/users/user_edit.html:258
 #, fuzzy, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:189
-#: rhodecode/templates/admin/users/user_edit.html:315
+#: rhodecode/templates/admin/permissions/permissions.html:134
+#: rhodecode/templates/admin/users/user_edit.html:264
 msgid "All IP addresses are allowed"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:200
-#: rhodecode/templates/admin/users/user_edit.html:326
+#: rhodecode/templates/admin/permissions/permissions.html:145
+#: rhodecode/templates/admin/users/user_edit.html:275
 msgid "New ip address"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:208
-#: rhodecode/templates/admin/users/user_edit.html:285
-#: rhodecode/templates/admin/users/user_edit.html:333
+#: rhodecode/templates/admin/permissions/permissions.html:153
+#: 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
 msgid "Add"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
-#: rhodecode/templates/base/base.html:154
+#: 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
 msgid "Repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add.html:13
-msgid "add new"
+#: rhodecode/templates/admin/repos/repo_add.html:19
+msgid "Add new"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:104
-#: rhodecode/templates/summary/summary.html:105
+#: rhodecode/templates/summary/summary.html:96
+#: rhodecode/templates/summary/summary.html:97
 msgid "Clone from"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:24
 #: rhodecode/templates/admin/repos/repo_edit.html:44
-#: rhodecode/templates/settings/repo_settings.html:43
 msgid "Optional http[s] url from which repository should be cloned."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:33
-#: rhodecode/templates/forks/fork.html:54
+#: rhodecode/templates/forks/fork.html:51
 msgid "Optionaly select a group to put this repository into."
 msgstr ""
 
@@ -2097,44 +2171,39 b' msgstr ""'
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:47
 #: rhodecode/templates/admin/repos/repo_edit.html:66
-#: rhodecode/templates/forks/fork.html:41
-#: rhodecode/templates/settings/repo_settings.html:57
+#: 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/forks/fork.html:45
-#: rhodecode/templates/settings/repo_settings.html:61
+#: 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/forks/fork.html:63
-#: rhodecode/templates/settings/repo_settings.html:70
+#: rhodecode/templates/forks/fork.html:60
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:73
-msgid "add"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9
-msgid "add new repository"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:5
+#: rhodecode/templates/admin/repos/repo_edit.html:8
 msgid "Edit repository"
 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/summary/summary.html:212
+msgid "Settings"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit.html:40
-#: rhodecode/templates/settings/repo_settings.html:39
 msgid "Clone uri"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:53
-#: rhodecode/templates/settings/repo_settings.html:52
 msgid "Optional select a group to put this repository into."
 msgstr ""
 
@@ -2142,164 +2211,206 b' msgstr ""'
 msgid "Change owner of this repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:152
-msgid "Administration"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:155
+#: rhodecode/templates/admin/repos/repo_edit.html:184
+msgid "Advanced settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:187
 msgid "Statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:159
+#: rhodecode/templates/admin/repos/repo_edit.html:191
 msgid "Reset current statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:159
+#: rhodecode/templates/admin/repos/repo_edit.html:191
 msgid "Confirm to remove current statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:162
+#: rhodecode/templates/admin/repos/repo_edit.html:194
 msgid "Fetched to rev"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:163
+#: rhodecode/templates/admin/repos/repo_edit.html:195
 msgid "Stats gathered"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:171
-msgid "Remote"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:175
-msgid "Pull changes from remote location"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:175
-msgid "Confirm to pull changes from remote side"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:186
-msgid "Cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:190
-msgid "Invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:190
-msgid "Confirm to invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:193
-msgid ""
-"Manually invalidate cache for this repository. On first access repository"
-" will be cached again"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:198
-msgid "List of cached values"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:201
-msgid "Prefix"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:202
-msgid "Key"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:203
-#: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:121
-#: rhodecode/templates/admin/users_groups/users_group_add.html:41
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-msgid "Active"
+msgid "Remote"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:207
+msgid "Pull changes from remote location"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:207
+msgid "Confirm to pull changes from remote side"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:218
-#: rhodecode/templates/base/base.html:306
-#: rhodecode/templates/base/base.html:308
-#: rhodecode/templates/base/base.html:310
+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
+msgid "List of cached values"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:233
+msgid "Prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:234
+msgid "Key"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:235
+#: 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
+msgid "Active"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:250
+#: rhodecode/templates/base/base.html:280
+#: rhodecode/templates/base/base.html:281
 msgid "Public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:224
+#: rhodecode/templates/admin/repos/repo_edit.html:256
 msgid "Remove from public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:226
+#: rhodecode/templates/admin/repos/repo_edit.html:258
 msgid "Add to public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:231
+#: 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:238
+#: rhodecode/templates/admin/repos/repo_edit.html:270
 msgid "Locking"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:243
+#: rhodecode/templates/admin/repos/repo_edit.html:275
 msgid "Unlock locked repo"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:243
+#: rhodecode/templates/admin/repos/repo_edit.html:275
 msgid "Confirm to unlock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:246
+#: rhodecode/templates/admin/repos/repo_edit.html:278
 msgid "lock repo"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:246
-msgid "Confirm to lock repository"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:247
-msgid "Repository is not locked"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:252
-msgid "Force locking on repository. Works only when anonymous access is disabled"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:259
-msgid "Set as fork of"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:264
-msgid "set"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Manually set this repository as a fork of another from the list"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:274
-#: rhodecode/templates/changeset/changeset_file_comment.html:41
-msgid "Delete"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:278
-#: rhodecode/templates/settings/repo_settings.html:115
+msgid "Confirm to lock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:279
+msgid "Repository is not locked"
+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
+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
 msgid "Remove this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:278
-#: rhodecode/templates/settings/repo_settings.html:115
+#: rhodecode/templates/admin/repos/repo_edit.html:315
 msgid "Confirm to delete this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:282
-#: rhodecode/templates/settings/repo_settings.html:119
+#: rhodecode/templates/admin/repos/repo_edit.html:317
+#, 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
+msgid "Detach forks"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:319
+msgid "Delete forks"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:322
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for RhodeCode and VCS systems. If you need fully delete it "
+"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
+msgid "Extra fields"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:348
+#, fuzzy, python-format
+msgid "Confirm to delete this field: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:362
+msgid "New field key"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:370
+msgid "New field label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:373
+msgid "Enter short label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:379
+msgid "New field description"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:382
+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
 msgid "none"
@@ -2317,8 +2428,6 b' msgstr ""'
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
-#: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/base/base.html:235
 msgid "admin"
 msgstr ""
 
@@ -2328,74 +2437,58 b' msgid "member"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-#: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/summary/summary.html:85
 msgid "private repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:19
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35
 msgid "default"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:33
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25
+#: rhodecode/templates/admin/repos_groups/repos_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:67
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80
 msgid "Add another member"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:97
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
+#: 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:103
-msgid "Failed to remove users group"
+#: 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:73
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86
 msgid "apply to children"
 msgstr ""
 
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
 msgid ""
 "Set or revoke permission to all children of that group, including non-"
 "private repositories and other groups"
 msgstr ""
 
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
+#, python-format
+msgid "%s Group Dashboard"
+msgstr ""
+
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:9
-#: rhodecode/templates/base/base.html:128
-#: rhodecode/templates/bookmarks/bookmarks.html:11
-#: rhodecode/templates/branches/branches.html:10
-#: rhodecode/templates/changelog/changelog.html:10
-#: rhodecode/templates/changeset/changeset.html:10
-#: rhodecode/templates/changeset/changeset_range.html:9
-#: rhodecode/templates/compare/compare_diff.html:9
-#: rhodecode/templates/files/file_diff.html:8
-#: rhodecode/templates/files/files.html:8
-#: rhodecode/templates/files/files_add.html:15
-#: rhodecode/templates/files/files_edit.html:15
-#: rhodecode/templates/followers/followers.html:9
-#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9
-#: rhodecode/templates/pullrequests/pullrequest.html:8
-#: rhodecode/templates/pullrequests/pullrequest_show.html:8
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
-#: rhodecode/templates/settings/repo_settings.html:9
-#: rhodecode/templates/shortlog/shortlog.html:10
-#: rhodecode/templates/summary/summary.html:8
-#: rhodecode/templates/tags/tags.html:11
 msgid "Home"
 msgstr ""
 
@@ -2404,76 +2497,78 b' 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:55
+msgid "Add repository group"
+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
+msgid "Repository groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13
+msgid "Add new repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56
 msgid "Group parent"
 msgstr ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58
-#: rhodecode/templates/admin/users/user_add.html:94
-#: rhodecode/templates/admin/users_groups/users_group_add.html:49
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/pullrequests/pullrequest_show.html:149
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59
 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_edit.html:26
-msgid "Add new child group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
+msgid "Edit repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13
+#, python-format
+msgid "Edit repository group %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27
+msgid "Add child group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76
 msgid ""
 "Enable lock-by-pulling on group. This option will be applied to all other"
 " groups and repositories inside"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
-msgid "Repositories groups administration"
-msgstr ""
-
-#: 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 "Repository groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45
 msgid "Number of toplevel repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
-#: rhodecode/templates/admin/users/users.html:87
-#: rhodecode/templates/admin/users_groups/users_groups.html:35
-msgid "action"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64
+msgid "Edit"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65
+#: rhodecode/templates/base/perms_summary.html:29
+#: rhodecode/templates/base/perms_summary.html:48
+#: rhodecode/templates/base/perms_summary.html:50
+#: rhodecode/templates/data_table/_dt_elements.html:116
+#: rhodecode/templates/data_table/_dt_elements.html:117
+msgid "edit"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
 #, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68
-msgid "There are no repositories groups yet"
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78
+msgid "There are no repository groups yet"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/hooks.html:5
@@ -2481,12 +2576,6 b' msgstr ""'
 msgid "Settings administration"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:9
-#: rhodecode/templates/settings/repo_settings.html:13
-msgid "Settings"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/hooks.html:24
 msgid "Built in hooks - read only"
 msgstr ""
@@ -2503,205 +2592,210 b' msgstr ""'
 msgid "Failed to remove hook"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:24
+#: rhodecode/templates/admin/settings/settings.html:26
 msgid "Remap and rescan repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:32
-msgid "rescan option"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:38
+#: rhodecode/templates/admin/settings/settings.html:34
+msgid "Rescan option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:40
 msgid ""
 "In case a repository was deleted from filesystem and there are leftovers "
 "in the database check this option to scan obsolete data in database and "
 "remove it."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:39
-msgid "destroy old data"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:41
+msgid "Destroy old data"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:43
 msgid ""
 "Rescan repositories location for new repositories. Also deletes obsolete "
 "if `destroy` flag is checked "
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:46
+#: rhodecode/templates/admin/settings/settings.html:48
 msgid "Rescan repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:52
+#: rhodecode/templates/admin/settings/settings.html:54
 msgid "Whoosh indexing"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:60
-msgid "index build option"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:65
-msgid "build from scratch"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:71
+#: rhodecode/templates/admin/settings/settings.html:62
+msgid "Index build option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:67
+msgid "Build from scratch"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:73
 msgid "Reindex"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:77
+#: rhodecode/templates/admin/settings/settings.html:79
 msgid "Global application settings"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:86
-msgid "Application name"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:95
-msgid "Realm text"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:104
-msgid "GA code"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:112
-#: rhodecode/templates/admin/settings/settings.html:178
-#: rhodecode/templates/admin/settings/settings.html:268
+#: rhodecode/templates/admin/settings/settings.html:88
+msgid "Site branding"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:97
+msgid "HTTP authentication realm"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:106
+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
 msgid "Save settings"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:119
+#: rhodecode/templates/admin/settings/settings.html:121
 msgid "Visualisation settings"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:127
+#: rhodecode/templates/admin/settings/settings.html:129
 msgid "General"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:132
+#: rhodecode/templates/admin/settings/settings.html:134
 msgid "Use lightweight dashboard"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:139
+#: rhodecode/templates/admin/settings/settings.html:140
+msgid "Use repository extra fields"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:147
 msgid "Icons"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:144
+#: rhodecode/templates/admin/settings/settings.html:152
 msgid "Show public repo icon on repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:148
+#: rhodecode/templates/admin/settings/settings.html:156
 msgid "Show private repo icon on repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:155
+#: rhodecode/templates/admin/settings/settings.html:163
 msgid "Meta-Tagging"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:160
+#: rhodecode/templates/admin/settings/settings.html:168
 msgid "Stylify recognised metatags:"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:187
+#: rhodecode/templates/admin/settings/settings.html:195
 msgid "VCS settings"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:196
+#: rhodecode/templates/admin/settings/settings.html:204
 msgid "Web"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:201
-msgid "require ssl for vcs operations"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:203
+#: rhodecode/templates/admin/settings/settings.html:209
+msgid "Require SSL for vcs operations"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:211
 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:209
+#: rhodecode/templates/admin/settings/settings.html:217
 msgid "Hooks"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:214
-msgid "Update repository after push (hg update)"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:218
-msgid "Show repository size after push"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:222
-msgid "Log user push commands"
+msgid "Update repository after push (hg update)"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:226
-msgid "Log user pull commands"
+msgid "Show repository size after push"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:230
-msgid "advanced setup"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:235
+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:240
-msgid "largefiles extensions"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:244
-msgid "hgsubversion extensions"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:246
+#: rhodecode/templates/admin/settings/settings.html:248
+msgid "Enable largefiles extension"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:252
+msgid "Enable hgsubversion extension"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:254
 msgid ""
-"Requires hgsubversion library installed. Allows clonning from svn remote "
+"Requires hgsubversion library installed. Allows cloning from svn remote "
 "locations"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:256
+#: rhodecode/templates/admin/settings/settings.html:264
 msgid "Repositories location"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:261
+#: rhodecode/templates/admin/settings/settings.html:269
 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:262
-#: rhodecode/templates/base/base.html:227
-msgid "unlock"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:263
+#: rhodecode/templates/admin/settings/settings.html:270
+#: rhodecode/templates/base/base.html:131
+msgid "Unlock"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:272
 msgid ""
 "Location where repositories are stored. After changing this value a "
 "restart, and rescan is required"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:283
+#: rhodecode/templates/admin/settings/settings.html:292
 msgid "Test Email"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:291
+#: rhodecode/templates/admin/settings/settings.html:300
 msgid "Email to"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:299
-msgid "Send"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:305
-msgid "System Info and Packages"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:308
-msgid "show"
+msgid "Send"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:314
+msgid "System Info and Packages"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:317
+#: rhodecode/templates/changelog/changelog.html:42
+msgid "Show"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:5
@@ -2710,11 +2804,13 b' msgstr ""'
 
 #: rhodecode/templates/admin/users/user_add.html:10
 #: rhodecode/templates/admin/users/user_edit.html:11
+#: rhodecode/templates/base/base.html:71
 msgid "Users"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:12
-msgid "add new user"
+#: rhodecode/templates/admin/users/users.html:23
+msgid "Add new user"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:50
@@ -2725,6 +2821,12 b' msgstr ""'
 msgid "Edit user"
 msgstr ""
 
+#: rhodecode/templates/admin/users/user_edit.html:13
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
+#, python-format
+msgid "Edit %s"
+msgstr ""
+
 #: rhodecode/templates/admin/users/user_edit.html:34
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10
 msgid "Change your avatar at"
@@ -2740,30 +2842,31 b' msgstr ""'
 msgid "API key"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:48
-msgid "Your IP"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:67
+#: rhodecode/templates/admin/users/user_edit.html:50
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25
+msgid "Current IP"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:70
 msgid "LDAP DN"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:76
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39
+#: rhodecode/templates/admin/users/user_edit.html:79
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
 msgid "New password"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:85
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48
+#: rhodecode/templates/admin/users/user_edit.html:88
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
 msgid "New password confirmation"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:155
+#: 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:160
+#: rhodecode/templates/admin/users/user_edit.html:163
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113
 #, python-format
 msgid ""
@@ -2771,31 +2874,31 b' msgid ""'
 "options does not have any action"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:166
+#: 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:174
+#: 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:251
+#: rhodecode/templates/admin/users/user_edit.html:200
 msgid "Email addresses"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:264
+#: rhodecode/templates/admin/users/user_edit.html:213
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:278
+#: rhodecode/templates/admin/users/user_edit.html:227
 msgid "New email address"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:130
+#: rhodecode/templates/base/base.html:242
 msgid "My account"
 msgstr ""
 
@@ -2808,7 +2911,7 b' msgid "My permissions"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:57
+#: rhodecode/templates/journal/journal.html:54
 msgid "My repos"
 msgstr ""
 
@@ -2816,30 +2919,43 b' msgstr ""'
 msgid "My pull requests"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:45
-#: rhodecode/templates/journal/journal.html:61
-msgid "Add repo"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4
+msgid "Show closed pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6
 msgid "Opened by me"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10
-#, python-format
-msgid "Pull request #%s opened on %s"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
+#, python-format
+msgid "Pull request #%s opened on %s"
+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_show.html:27
+#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+msgid "Closed"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23
 msgid "Confirm to delete this pull request"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51
+msgid "Nothing here yet"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34
 msgid "I participate in"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
 msgstr ""
@@ -2849,67 +2965,51 b' msgid "Users administration"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:241
 msgid "users"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:23
-msgid "Add new user"
-msgstr ""
-
-#: rhodecode/templates/admin/users/users.html:77
-msgid "username"
-msgstr ""
-
 #: rhodecode/templates/admin/users/users.html:80
-msgid "firstname"
+msgid "Firstname"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:81
-msgid "lastname"
+msgid "Lastname"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:82
-msgid "last login"
-msgstr ""
-
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/admin/users_groups/users_groups.html:34
-msgid "active"
-msgstr ""
-
-#: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:244
-msgid "ldap"
+msgid "Last login"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:5
-msgid "Add users group"
+msgid "Add user group"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:10
-#: rhodecode/templates/admin/users_groups/users_groups.html:9
-msgid "Users groups"
+#: rhodecode/templates/admin/users_groups/users_groups.html:11
+#: rhodecode/templates/base/base.html:72
+msgid "User groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:12
-msgid "add new users group"
+#: rhodecode/templates/admin/users_groups/users_groups.html:25
+msgid "Add new user group"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:5
-msgid "Edit users group"
+msgid "Edit user group"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:11
-msgid "UsersGroups"
+msgid "UserGroups"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:50
+#: rhodecode/templates/admin/users_groups/users_groups.html:35
 msgid "Members"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:58
-msgid "Choosen group members"
+msgid "Chosen group members"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:61
@@ -2924,260 +3024,245 b' msgstr ""'
 msgid "Add all elements"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:146
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:150
 msgid "Group members"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:163
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:167
 msgid "No members yet"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:171
-msgid "Permissions defined for this group"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:178
-msgid "No permissions set yet"
-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/admin/users_groups/users_groups.html:33
-#: rhodecode/templates/base/root.html:46
-msgid "members"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:45
-#, python-format
-msgid "Confirm to delete this users group: %s"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:41
+msgid "User groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_groups.html:47
+#, fuzzy, python-format
+msgid "Confirm to delete this user group: %s"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:42
 msgid "Submit a bug"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:76
-msgid "Not logged in"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:83
-msgid "Login to your account"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:106
-msgid "Forgot password ?"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:113
-msgid "Log In"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:124
-msgid "Inbox"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:129
-#: rhodecode/templates/base/base.html:297
-#: rhodecode/templates/base/base.html:299
-#: rhodecode/templates/base/base.html:301
-#: rhodecode/templates/journal/journal.html:4
-#: rhodecode/templates/journal/public_journal.html:4
-msgid "Journal"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:131
-msgid "Log Out"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:150
-msgid "Switch repository"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:152
-msgid "Products"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:158
-#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47
-msgid "loading..."
-msgstr ""
-
-#: rhodecode/templates/base/base.html:166
-#: rhodecode/templates/base/base.html:168
-#: rhodecode/templates/base/base.html:170
+#: rhodecode/templates/base/base.html:108
 #: 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:174
-#: rhodecode/templates/base/base.html:176
-#: rhodecode/templates/base/base.html:178
-#: rhodecode/templates/changelog/changelog.html:15
+#: rhodecode/templates/base/base.html:109
+#: rhodecode/templates/changelog/changelog.html:11
 #: 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:182
-#: rhodecode/templates/base/base.html:184
-#: rhodecode/templates/base/base.html:186
-msgid "Switch to"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:193
-#: rhodecode/templates/base/base.html:195
-#: rhodecode/templates/base/base.html:197
+#: rhodecode/templates/base/base.html:110
 #: rhodecode/templates/data_table/_dt_elements.html:25
 #: rhodecode/templates/data_table/_dt_elements.html:27
 #: rhodecode/templates/data_table/_dt_elements.html:29
+#: rhodecode/templates/files/files.html:12
 msgid "Files"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:201
-#: rhodecode/templates/base/base.html:205
+#: rhodecode/templates/base/base.html:112
+msgid "Switch To"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:114
+#: rhodecode/templates/base/base.html:267
+msgid "loading..."
+msgstr ""
+
+#: rhodecode/templates/base/base.html:118
 msgid "Options"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/base/base.html:212
-msgid "repository settings"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:216
+#: rhodecode/templates/base/base.html:124
+#: 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/search/search.html:14
+#: rhodecode/templates/search/search.html:54
+msgid "Search"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:133
+msgid "Lock"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:141
+msgid "Follow"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:142
+msgid "Unfollow"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:145
+#: rhodecode/templates/data_table/_dt_elements.html:33
+#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/data_table/_dt_elements.html:37
 #: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/forks/fork.html:13
-msgid "fork"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:218
-#: rhodecode/templates/changelog/changelog.html:43
-msgid "open new pull request"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:221
-msgid "compare fork"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:223
-msgid "search"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:229
-msgid "lock"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:240
-msgid "repositories groups"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:242
-msgid "users groups"
+#: rhodecode/templates/forks/fork.html:9
+msgid "Fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:147
+msgid "Create Pull Request"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:153
+msgid "Show Pull Requests"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:153
+msgid "Pull Requests"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:190
+msgid "Not logged in"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:197
+msgid "Login to your account"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:220
+msgid "Forgot password ?"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:243
-msgid "permissions"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:245
-msgid "defaults"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:246
-msgid "settings"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:256
-#: rhodecode/templates/base/base.html:258
-msgid "Followers"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:264
-#: rhodecode/templates/base/base.html:266
-msgid "Forks"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:315
-#: rhodecode/templates/base/base.html:317
-#: rhodecode/templates/base/base.html:319
-#: rhodecode/templates/search/search.html:52
-msgid "Search"
-msgstr ""
-
-#: rhodecode/templates/base/root.html:42
-msgid "add another comment"
+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"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:286
+msgid "Search in repositories"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:8
+msgid "No permissions defined yet"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:15
+msgid "Permission"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:16
+msgid "Edit Permission"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/data_table/_dt_elements.html:140
-#: rhodecode/templates/summary/summary.html:57
-msgid "Stop following this repository"
+#, fuzzy
+msgid "Add another comment"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:44
-#: rhodecode/templates/summary/summary.html:61
-msgid "Start following this repository"
+#: rhodecode/templates/data_table/_dt_elements.html:140
+msgid "Stop following this repository"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:45
+msgid "Start following this repository"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:46
 msgid "Group"
 msgstr ""
 
+#: rhodecode/templates/base/root.html:47
+msgid "members"
+msgstr ""
+
 #: rhodecode/templates/base/root.html:48
-msgid "search truncated"
+#: rhodecode/templates/pullrequests/pullrequest.html:181
+msgid "Loading ..."
 msgstr ""
 
 #: rhodecode/templates/base/root.html:49
-msgid "no matching files"
+msgid "Search truncated"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:50
-msgid "Open new pull request"
+msgid "No matching files"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:51
-msgid "Open new pull request for selected changesets"
+#: rhodecode/templates/changelog/changelog.html:36
+msgid "Open new pull request"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:52
-msgid "Show selected changes __S -> __E"
+msgid "Open new pull request for selected changesets"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:53
+msgid "Show selected changesets __S -> __E"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:54
+msgid "Show selected changeset __S"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:55
 msgid "Selection link"
 msgstr ""
 
+#: rhodecode/templates/base/root.html:56
+#: rhodecode/templates/changeset/diff_block.html:8
+msgid "Collapse diff"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:57
+msgid "Expand diff"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr ""
 
-#: rhodecode/templates/bookmarks/bookmarks.html:39
+#: rhodecode/templates/bookmarks/bookmarks.html:37
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:53
+#: rhodecode/templates/branches/branches.html:50
 #: rhodecode/templates/branches/branches_data.html:8
-#: rhodecode/templates/tags/tags.html:54
+#: rhodecode/templates/shortlog/shortlog_data.html:8
+#: rhodecode/templates/tags/tags.html:51
 #: rhodecode/templates/tags/tags_data.html:8
 msgid "Author"
 msgstr ""
 
-#: rhodecode/templates/bookmarks/bookmarks.html:40
+#: rhodecode/templates/bookmarks/bookmarks.html:38
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches.html:51
 #: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/shortlog/shortlog_data.html:5
+#: rhodecode/templates/tags/tags.html:52
 #: rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr ""
@@ -3187,15 +3272,13 b' msgstr ""'
 msgid "%s Branches"
 msgstr ""
 
-#: rhodecode/templates/branches/branches.html:29
+#: rhodecode/templates/branches/branches.html:26
 msgid "Compare branches"
 msgstr ""
 
-#: rhodecode/templates/branches/branches.html:56
+#: rhodecode/templates/branches/branches.html:53
 #: rhodecode/templates/branches/branches_data.html:10
-#: rhodecode/templates/compare/compare_diff.html:5
-#: rhodecode/templates/compare/compare_diff.html:13
-#: rhodecode/templates/tags/tags.html:57
+#: rhodecode/templates/tags/tags.html:54
 #: rhodecode/templates/tags/tags_data.html:10
 msgid "Compare"
 msgstr ""
@@ -3205,116 +3288,80 b' msgstr ""'
 msgid "%s Changelog"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:15
+#: rhodecode/templates/changelog/changelog.html:11
 #, 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:37
+#: rhodecode/templates/changelog/changelog.html:30
 msgid "Clear selection"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/templates/changelog/changelog.html:33
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
-msgid "compare fork with %s"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:40
+msgid "Compare fork with %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:33
 msgid "Compare fork with parent"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:49
-msgid "Show"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:74
-#: rhodecode/templates/summary/summary.html:375
-msgid "show more"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:78
-msgid "Affected number of files, click to show more details"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:91
-#: rhodecode/templates/changeset/changeset.html:65
-#: rhodecode/templates/changeset/changeset_file_comment.html:20
-#: rhodecode/templates/changeset/changeset_range.html:46
-msgid "Changeset status"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:94
-#: rhodecode/templates/shortlog/shortlog_data.html:20
+#: rhodecode/templates/changelog/changelog.html:76
+#: rhodecode/templates/summary/summary.html:404
+msgid "Show more"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:89
+#: rhodecode/templates/changeset/changeset_range.html:86
 #, python-format
-msgid "Click to open associated pull request #%s"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:104
-msgid "Parent"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:110
-#: rhodecode/templates/changeset/changeset.html:42
-msgid "No parents"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:115
+msgid "Bookmark %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:95
+#: rhodecode/templates/changeset/changeset.html:111
+#: 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:79
-msgid "merge"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:118
-#: rhodecode/templates/changeset/changeset.html:109
-#: rhodecode/templates/changeset/changeset_range.html:82
-#: rhodecode/templates/files/files.html:29
-#: rhodecode/templates/files/files_add.html:33
-#: rhodecode/templates/files/files_edit.html:33
-#: rhodecode/templates/shortlog/shortlog_data.html:9
-msgid "branch"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:124
-#: rhodecode/templates/changeset/changeset_range.html:88
-msgid "bookmark"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:130
-#: rhodecode/templates/changeset/changeset.html:114
-#: rhodecode/templates/changeset/changeset_range.html:94
-msgid "tag"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:302
+#: rhodecode/templates/changeset/changeset_range.html:80
+#, python-format
+msgid "Branch %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:258
 msgid "There are no changes yet"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:94
-msgid "removed"
+#: rhodecode/templates/changeset/changeset.html:91
+msgid "Removed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:95
-msgid "changed"
+#: rhodecode/templates/changeset/changeset.html:92
+#, fuzzy
+msgid "Changed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:96
-msgid "added"
+#: rhodecode/templates/changeset/changeset.html:93
+msgid "Added"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changelog/changelog_details.html:9
 #: rhodecode/templates/changelog/changelog_details.html:10
-#: rhodecode/templates/changeset/changeset.html:98
-#: rhodecode/templates/changeset/changeset.html:99
-#: rhodecode/templates/changeset/changeset.html:100
+#: rhodecode/templates/changeset/changeset.html:95
+#: rhodecode/templates/changeset/changeset.html:96
+#: rhodecode/templates/changeset/changeset.html:97
 #, python-format
-msgid "affected %s files"
+msgid "Affected %s files"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:6
@@ -3322,29 +3369,35 b' msgstr ""'
 msgid "%s Changeset"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:14
-msgid "Changeset"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:52
+#: rhodecode/templates/changeset/changeset.html:39
+msgid "No parents"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:49
 msgid "No children"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:70
-#: rhodecode/templates/changeset/diff_block.html:20
-msgid "raw diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:71
-msgid "patch diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:72
-#: rhodecode/templates/changeset/diff_block.html:21
-msgid "download diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:76
+#: rhodecode/templates/changeset/changeset.html:62
+#: rhodecode/templates/changeset/changeset_file_comment.html:20
+#: rhodecode/templates/changeset/changeset_range.html:44
+msgid "Changeset status"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/diff_block.html:23
+msgid "Raw diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:68
+msgid "Patch diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:69
+#: rhodecode/templates/changeset/diff_block.html:24
+msgid "Download diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:73
 #: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "%d comment"
@@ -3352,7 +3405,7 b' msgid_plural "%d comments"'
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:76
+#: rhodecode/templates/changeset/changeset.html:73
 #: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "(%d inline)"
@@ -3360,32 +3413,53 b' msgid_plural "(%d inline)"'
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:122
-#: rhodecode/templates/compare/compare_diff.html:44
-#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+#: rhodecode/templates/changeset/changeset.html:103
+#: rhodecode/templates/changeset/changeset_range.html:77
+msgid "merge"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:119
+#: rhodecode/templates/compare/compare_diff.html:40
+#: rhodecode/templates/pullrequests/pullrequest_show.html:113
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:124
-#: rhodecode/templates/compare/compare_diff.html:46
-#: rhodecode/templates/pullrequests/pullrequest_show.html:96
+#: rhodecode/templates/changeset/changeset.html:121
+#: rhodecode/templates/compare/compare_diff.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:115
 #, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
 msgstr[0] ""
 msgstr[1] ""
 
+#: rhodecode/templates/changeset/changeset.html:134
+#: rhodecode/templates/changeset/changeset.html:146
+#: 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/compare/compare_diff.html:58
+#: rhodecode/templates/compare/compare_diff.html:69
+#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+msgid "Show full diff"
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset_file_comment.html:30
 #, python-format
-msgid "Status from pull request %s"
+msgid "Status change on pull request #%s"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:32
 #, python-format
-msgid "Comment from pull request %s"
+msgid "Comment on pull request #%s"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:57
@@ -3397,24 +3471,23 b' msgid "Commenting on line {1}."'
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:61
-#: rhodecode/templates/changeset/changeset_file_comment.html:140
+#: 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:142
+#: rhodecode/templates/changeset/changeset_file_comment.html:141
 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:162
+#: rhodecode/templates/changeset/changeset_file_comment.html:161
 msgid "Comment"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:75
-#: rhodecode/templates/changeset/changeset_file_comment.html:86
-msgid "Hide"
+msgid "Cancel"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:82
@@ -3425,19 +3498,15 b' msgstr ""'
 msgid "Login now"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:137
-msgid "Leave a comment"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:144
-msgid "Check this to change current status of code-review for this changeset"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:144
-msgid "change status"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:164
+#: rhodecode/templates/changeset/changeset_file_comment.html:86
+msgid "Hide"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:143
+msgid "Change status"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:163
 msgid "Comment and close"
 msgstr ""
 
@@ -3446,69 +3515,74 b' msgstr ""'
 msgid "%s Changesets"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_range.html:29
-#: rhodecode/templates/compare/compare_diff.html:29
-msgid "Compare View"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_range.html:29
-msgid "Show combined compare"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_range.html:54
+#: rhodecode/templates/changeset/changeset_range.html:52
 msgid "Files affected"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:19
-msgid "show full diff for this file"
-msgstr ""
-
-#: rhodecode/templates/changeset/diff_block.html:27
-msgid "show inline comments"
-msgstr ""
-
-#: rhodecode/templates/compare/compare_cs.html:5
+#: rhodecode/templates/changeset/diff_block.html:22
+msgid "Show full diff for this file"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:30
+msgid "Show inline comments"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:55
+msgid "Show file at latest version in this repo"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:56
+msgid "Show file at initial version in this repo"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_cs.html:4
 msgid "No changesets"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:37
-#: rhodecode/templates/pullrequests/pullrequest_show.html:87
+#: rhodecode/templates/compare/compare_cs.html:32
+msgid "Ancestor"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:5
+#, fuzzy, python-format
+msgid "%s Compare"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:9
+msgid "Compare revisions"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:33
+#: rhodecode/templates/pullrequests/pullrequest_show.html:106
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/compare/compare_diff.html:52
-#: rhodecode/templates/pullrequests/pullrequest_show.html:102
+#: rhodecode/templates/compare/compare_diff.html:48
+#: rhodecode/templates/pullrequests/pullrequest_show.html:121
 msgid "No files"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:33
-#: rhodecode/templates/data_table/_dt_elements.html:35
-#: rhodecode/templates/data_table/_dt_elements.html:37
-msgid "Fork"
+#: rhodecode/templates/compare/compare_diff.html:58
+#: rhodecode/templates/compare/compare_diff.html:69
+msgid "confirm to show potentially huge diff"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/summary/summary.html:77
+#: rhodecode/templates/summary/summary.html:69
 msgid "Mercurial repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/summary/summary.html:80
+#: rhodecode/templates/summary/summary.html:72
 msgid "Git repository"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/summary/summary.html:87
-msgid "public repository"
-msgstr ""
-
 #: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/summary/summary.html:96
-#: rhodecode/templates/summary/summary.html:97
-msgid "Fork of"
+#, python-format
+msgid "Fork of %s"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:88
@@ -3537,8 +3611,22 b' msgstr ""'
 msgid "Confirm to delete this user: %s"
 msgstr ""
 
-#: rhodecode/templates/email_templates/changeset_comment.html:10
-msgid "New status$"
+#: 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"
+msgstr ""
+
+#: rhodecode/templates/email_templates/changeset_comment.html:14
+msgid "Repo"
+msgstr ""
+
+#: rhodecode/templates/email_templates/changeset_comment.html:16
+msgid "desc"
 msgstr ""
 
 #: rhodecode/templates/email_templates/main.html:8
@@ -3546,19 +3634,20 b' msgid "This is a notification from Rhode'
 msgstr ""
 
 #: rhodecode/templates/email_templates/password_reset.html:4
-msgid "Hello"
+#, python-format
+msgid "Hello %s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/password_reset.html:5
+msgid "We received a request to create a new password for your account."
 msgstr ""
 
 #: rhodecode/templates/email_templates/password_reset.html:6
-msgid "We received a request to create a new password for your account."
-msgstr ""
-
-#: rhodecode/templates/email_templates/password_reset.html:8
 msgid "You can generate it by clicking following URL"
 msgstr ""
 
-#: rhodecode/templates/email_templates/password_reset.html:12
-msgid "If you didn't request new password please ignore this email."
+#: 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
@@ -3569,33 +3658,28 b' msgid ""'
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:5
-msgid "title"
+msgid "View this pull request here"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:6
-#: rhodecode/templates/pullrequests/pullrequest.html:115
-msgid "description"
+msgid "title"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:7
-msgid "View this pull request here"
+msgid "description"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:12
 msgid "revisions for reviewing"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_comment.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:3
 #, python-format
-msgid "User %s commented on pull request #%s for repository %s"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.html:10
-msgid "New status"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.html:14
-msgid "View this comment here"
+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
@@ -3606,107 +3690,105 b' msgstr ""'
 msgid "View this user here"
 msgstr ""
 
-#: rhodecode/templates/errors/error_document.html:46
+#: rhodecode/templates/errors/error_document.html:55
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
 
 #: rhodecode/templates/files/file_diff.html:4
-#, python-format
-msgid "%s File diff"
-msgstr ""
-
-#: rhodecode/templates/files/file_diff.html:12
+#, fuzzy, python-format
+msgid "%s File Diff"
+msgstr ""
+
+#: rhodecode/templates/files/file_diff.html:8
 msgid "File diff"
 msgstr ""
 
 #: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:74
-#, python-format
-msgid "%s files"
-msgstr ""
-
-#: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:351
-msgid "files"
+#: rhodecode/templates/files/files.html:76
+#, fuzzy, python-format
+msgid "%s Files"
+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 ""
 
 #: rhodecode/templates/files/files_add.html:4
-#: rhodecode/templates/files/files_edit.html:4
-#, python-format
-msgid "%s Edit file"
+#, fuzzy, python-format
+msgid "%s Files Add"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:19
-msgid "add file"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.html:40
+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:45
+#: rhodecode/templates/files/files_add.html:43
 msgid "File Name"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:49
-#: rhodecode/templates/files/files_add.html:58
+#: rhodecode/templates/files/files_add.html:47
+#: rhodecode/templates/files/files_add.html:56
 msgid "or"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:49
-#: rhodecode/templates/files/files_add.html:54
+#: rhodecode/templates/files/files_add.html:47
+#: rhodecode/templates/files/files_add.html:52
 msgid "Upload file"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:58
+#: rhodecode/templates/files/files_add.html:56
 msgid "Create new file"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:63
-#: rhodecode/templates/files/files_edit.html:39
+#: rhodecode/templates/files/files_add.html:61
+#: rhodecode/templates/files/files_edit.html:37
 #: rhodecode/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:67
+#: rhodecode/templates/files/files_add.html:65
 msgid "use / to separate directories"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:77
-#: rhodecode/templates/files/files_edit.html:63
+#: 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:81
-#: rhodecode/templates/files/files_edit.html:67
+msgid "Commit message"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:79
+#: rhodecode/templates/files/files_edit.html:65
 msgid "Commit changes"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:13
-msgid "view"
+msgid "View"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:14
-msgid "previous revision"
+msgid "Previous revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:16
-msgid "next revision"
+msgid "Next revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:23
-msgid "follow current branch"
+msgid "Follow current branch"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:27
-msgid "search file list"
-msgstr ""
-
-#: rhodecode/templates/files/files_browser.html:31
-#: rhodecode/templates/shortlog/shortlog_data.html:78
-msgid "add new file"
+msgid "Search file list"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:35
@@ -3733,31 +3815,36 b' msgstr ""'
 msgid "Last committer"
 msgstr ""
 
+#: rhodecode/templates/files/files_edit.html:4
+#, fuzzy, python-format
+msgid "%s Files Edit"
+msgstr ""
+
 #: rhodecode/templates/files/files_edit.html:19
-msgid "edit file"
+msgid "Edit file"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:47
+#: rhodecode/templates/files/files_source.html:23
+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:23
-msgid "show annotation"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:50
-#: 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:51
 #: rhodecode/templates/files/files_source.html:26
-msgid "download as raw"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:54
-msgid "source"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:59
+msgid "Download as raw"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:52
+msgid "Source"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:57
 msgid "Editing file"
 msgstr ""
 
@@ -3766,16 +3853,16 b' msgid "History"'
 msgstr ""
 
 #: rhodecode/templates/files/files_history_box.html:9
-msgid "diff to revision"
+msgid "Diff to revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_history_box.html:10
 #, fuzzy
-msgid "show at revision"
+msgid "Show at revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_history_box.html:11
-msgid "show full history"
+msgid "Show full history"
 msgstr ""
 
 #: rhodecode/templates/files/files_history_box.html:16
@@ -3790,16 +3877,16 b' msgid "Load file history"'
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:21
-msgid "show source"
+msgid "Show source"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:29
 #, python-format
-msgid "edit on branch:%s"
+msgid "Edit on branch:%s"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:31
-msgid "edit on branch:?"
+msgid "Edit on branch:?"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:31
@@ -3832,8 +3919,10 b' msgstr ""'
 msgid "%s Followers"
 msgstr ""
 
-#: rhodecode/templates/followers/followers.html:13
-msgid "followers"
+#: rhodecode/templates/followers/followers.html:9
+#: rhodecode/templates/summary/summary.html:183
+#: rhodecode/templates/summary/summary.html:184
+msgid "Followers"
 msgstr ""
 
 #: rhodecode/templates/followers/followers_data.html:12
@@ -3845,32 +3934,32 b' msgstr ""'
 msgid "%s Fork"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:31
+#: rhodecode/templates/forks/fork.html:28
 msgid "Fork name"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:68
+#: rhodecode/templates/forks/fork.html:65
 msgid "Private"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:77
+#: rhodecode/templates/forks/fork.html:74
 msgid "Copy permissions"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:81
+#: rhodecode/templates/forks/fork.html:78
 msgid "Copy permissions from forked repository"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:86
+#: rhodecode/templates/forks/fork.html:84
 msgid "Update after clone"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:90
+#: rhodecode/templates/forks/fork.html:88
 msgid "Checkout source after making a clone"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:94
-msgid "fork this repository"
+#: rhodecode/templates/forks/fork.html:93
+msgid "Fork this repository"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.html:5
@@ -3878,16 +3967,14 b' msgstr ""'
 msgid "%s Forks"
 msgstr ""
 
-#: rhodecode/templates/forks/forks.html:13
-msgid "forks"
+#: rhodecode/templates/forks/forks.html:9
+#: rhodecode/templates/summary/summary.html:189
+#: rhodecode/templates/summary/summary.html:190
+msgid "Forks"
 msgstr ""
 
 #: rhodecode/templates/forks/forks_data.html:17
-msgid "forked"
-msgstr ""
-
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
+msgid "Forked"
 msgstr ""
 
 #: rhodecode/templates/forks/forks_data.html:42
@@ -3903,21 +3990,15 b' msgid "RSS journal feed"'
 msgstr ""
 
 #: rhodecode/templates/journal/journal.html:32
-#: rhodecode/templates/pullrequests/pullrequest.html:55
 msgid "Refresh"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.html:35
 #: rhodecode/templates/journal/public_journal.html:24
-msgid "RSS feed"
-msgstr ""
-
-#: rhodecode/templates/journal/journal.html:38
-#: rhodecode/templates/journal/public_journal.html:27
 msgid "ATOM feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:54
+#: rhodecode/templates/journal/journal.html:51
 msgid "Watched"
 msgstr ""
 
@@ -3925,6 +4006,11 b' msgstr ""'
 msgid "No entries yet"
 msgstr ""
 
+#: rhodecode/templates/journal/public_journal.html:4
+#: rhodecode/templates/journal/public_journal.html:21
+msgid "Public Journal"
+msgstr ""
+
 #: rhodecode/templates/journal/public_journal.html:13
 msgid "ATOM public journal feed"
 msgstr ""
@@ -3933,152 +4019,128 b' msgstr ""'
 msgid "RSS public journal feed"
 msgstr ""
 
-#: rhodecode/templates/journal/public_journal.html:21
-msgid "Public Journal"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest.html:4
-#: rhodecode/templates/pullrequests/pullrequest.html:12
+#: rhodecode/templates/pullrequests/pullrequest.html:8
 msgid "New pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:54
-msgid "refresh overview"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.html:66
+#: rhodecode/templates/pullrequests/pullrequest.html:52
 msgid "Detailed compare view"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:118
+#: rhodecode/templates/pullrequests/pullrequest.html:56
+#: rhodecode/templates/pullrequests/pullrequest_show.html:137
 msgid "Pull request reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:130
+#: rhodecode/templates/pullrequests/pullrequest.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "owner"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:145
+#: rhodecode/templates/pullrequests/pullrequest.html:77
 msgid "Add reviewer to this pull request."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:97
+#: rhodecode/templates/pullrequests/pullrequest.html:83
 msgid "Create new pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:106
+#: rhodecode/templates/pullrequests/pullrequest.html:92
+#: rhodecode/templates/pullrequests/pullrequest_data.html:14
 #: rhodecode/templates/pullrequests/pullrequest_show.html:25
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
 msgid "Title"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:123
+#: rhodecode/templates/pullrequests/pullrequest.html:109
 msgid "Send pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:23
-#, python-format
-msgid "Closed %s"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:23
+#: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #, python-format
-msgid "with status %s"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:31
-msgid "Status"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:36
+msgid "%s Pull Request #%s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+msgid "Review status"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:40
 msgid "Pull request status"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:44
+#: rhodecode/templates/pullrequests/pullrequest_show.html:53
 msgid "Still not reviewed by"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:48
+#: rhodecode/templates/pullrequests/pullrequest_show.html:57
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:50
-msgid "pull request was reviewed by all reviewers"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:56
+#: rhodecode/templates/pullrequests/pullrequest_show.html:59
+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:76
+#: rhodecode/templates/pullrequests/pullrequest_show.html:89
 msgid "Created on"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:83
+#: rhodecode/templates/pullrequests/pullrequest_show.html:102
 msgid "Compare view"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:130
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 #, fuzzy
 msgid "reviewer"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest_show.html:164
+msgid "Add or remove reviewer to this pull request."
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:168
+#, fuzzy
+msgid "Save changes"
+msgstr ""
+
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
-msgid "all pull requests"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
-msgid "All pull requests"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27
-msgid "Closed"
+#, python-format
+msgid "%s Pull Requests"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:6
-#, python-format
-msgid "Search \"%s\" in repository: %s"
+msgid "Search repository"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:8
-#, python-format
-msgid "Search \"%s\" in all repositories"
-msgstr ""
-
-#: rhodecode/templates/search/search.html:12
-#: rhodecode/templates/search/search.html:32
-#, python-format
-msgid "Search in repository: %s"
-msgstr ""
-
-#: rhodecode/templates/search/search.html:14
-#: rhodecode/templates/search/search.html:34
+#: rhodecode/templates/search/search.html:16
 msgid "Search in all repositories"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:48
+#: rhodecode/templates/search/search.html:50
 msgid "Search term"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:60
+#: rhodecode/templates/search/search.html:62
 msgid "Search in"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:63
-msgid "File contents"
-msgstr ""
-
-#: rhodecode/templates/search/search.html:64
-msgid "Commit messages"
-msgstr ""
-
 #: rhodecode/templates/search/search.html:65
+msgid "File contents"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:66
+msgid "Commit messages"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:67
 msgid "File names"
 msgstr ""
 
@@ -4088,39 +4150,23 b' msgstr ""'
 msgid "Permission denied"
 msgstr ""
 
-#: rhodecode/templates/settings/repo_settings.html:5
-#, python-format
-msgid "%s Settings"
-msgstr ""
-
-#: rhodecode/templates/settings/repo_settings.html:102
-msgid "Delete repository"
-msgstr ""
-
-#: rhodecode/templates/settings/repo_settings.html:109
-msgid "Remove repo"
-msgstr ""
-
 #: rhodecode/templates/shortlog/shortlog.html:5
-#, python-format
-msgid "%s Shortlog"
-msgstr ""
-
+#, fuzzy, python-format
+msgid "%s Lightweight Changelog"
+msgstr ""
+
+#: rhodecode/templates/shortlog/shortlog.html:11
 #: rhodecode/templates/shortlog/shortlog.html:15
-#: rhodecode/templates/shortlog/shortlog.html:19
-msgid "shortlog"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog_data.html:5
-msgid "revision"
+msgid "Lightweight Changelog"
 msgstr ""
 
 #: rhodecode/templates/shortlog/shortlog_data.html:7
-msgid "age"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog_data.html:8
-msgid "author"
+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
@@ -4140,156 +4186,165 b' msgstr ""'
 msgid "%s Summary"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:12
-msgid "summary"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:20
+#: rhodecode/templates/summary/summary.html:16
 #, python-format
-msgid "repo %s ATOM feed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:21
+msgid "%s ATOM feed"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:17
 #, python-format
-msgid "repo %s RSS feed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:49
-#: rhodecode/templates/summary/summary.html:52
-msgid "ATOM"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:70
+msgid "%s RSS feed"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:62
 #, python-format
 msgid "Repository locked by %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:72
+#: rhodecode/templates/summary/summary.html:64
 msgid "Repository unlocked"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:91
+#: rhodecode/templates/summary/summary.html:83
 #, python-format
 msgid "Non changable ID %s"
 msgstr ""
 
+#: rhodecode/templates/summary/summary.html:88
+msgid "Public"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:88
+#: rhodecode/templates/summary/summary.html:89
+msgid "Fork of"
+msgstr ""
+
 #: rhodecode/templates/summary/summary.html:96
-msgid "public"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:104
-msgid "remote clone"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:125
+msgid "Remote clone"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:117
 msgid "Contact"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:139
+#: rhodecode/templates/summary/summary.html:131
 msgid "Clone url"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:142
+#: rhodecode/templates/summary/summary.html:136
 msgid "Show by Name"
 msgstr ""
 
+#: rhodecode/templates/summary/summary.html:137
+msgid "Show by ID"
+msgstr ""
+
 #: rhodecode/templates/summary/summary.html:143
-msgid "Show by ID"
+msgid "Trending files"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:151
-msgid "Trending files"
+#: rhodecode/templates/summary/summary.html:167
+#: rhodecode/templates/summary/summary.html:232
+msgid "enable"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:159
-#: rhodecode/templates/summary/summary.html:175
-#: rhodecode/templates/summary/summary.html:203
-msgid "enable"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:167
 msgid "Download"
 msgstr ""
 
+#: rhodecode/templates/summary/summary.html:163
+msgid "There are no downloads yet"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:165
+msgid "Downloads are disabled for this repository"
+msgstr ""
+
 #: rhodecode/templates/summary/summary.html:171
-msgid "There are no downloads yet"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:173
-msgid "Downloads are disabled for this repository"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:179
 msgid "Download as zip"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:182
+#: rhodecode/templates/summary/summary.html:174
 msgid "Check this to download archive with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:182
+#: rhodecode/templates/summary/summary.html:174
 msgid "with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:195
+#: rhodecode/templates/summary/summary.html:197
+msgid "Repository Size"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:204
+#: rhodecode/templates/summary/summary.html:206
+msgid "Feed"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:224
 msgid "Commit activity by day / author"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:206
+#: rhodecode/templates/summary/summary.html:235
 msgid "Stats gathered: "
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:227
-msgid "Shortlog"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:229
+#: rhodecode/templates/summary/summary.html:256
+msgid "Latest changes"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:258
 msgid "Quick start"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:243
+#: rhodecode/templates/summary/summary.html:272
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:246
+#: rhodecode/templates/summary/summary.html:275
 msgid "Permalink to this readme"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:304
+#: rhodecode/templates/summary/summary.html:333
 #, python-format
 msgid "Download %s as %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:661
+#: rhodecode/templates/summary/summary.html:380
+msgid "files"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:690
 msgid "commits"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:662
+#: rhodecode/templates/summary/summary.html:691
 msgid "files added"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:663
+#: rhodecode/templates/summary/summary.html:692
 msgid "files changed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:664
+#: rhodecode/templates/summary/summary.html:693
 msgid "files removed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:667
+#: rhodecode/templates/summary/summary.html:695
 msgid "commit"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:668
+#: rhodecode/templates/summary/summary.html:696
 msgid "file added"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:669
+#: rhodecode/templates/summary/summary.html:697
 msgid "file changed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:670
+#: rhodecode/templates/summary/summary.html:698
 msgid "file removed"
 msgstr ""
 
@@ -4298,7 +4353,7 b' msgstr ""'
 msgid "%s Tags"
 msgstr ""
 
-#: rhodecode/templates/tags/tags.html:29
+#: rhodecode/templates/tags/tags.html:26
 msgid "Compare tags"
 msgstr ""
 

rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode 1.1.5\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-01-28 00:24+0100\n"
+"POT-Creation-Date: 2013-04-05 10:19-0700\n"
 "PO-Revision-Date: 2012-10-02 11:32+0100\n"
 "Last-Translator: Vincent Duvert <[e-mail]>\n"
 "Language-Team: fr <[e-mail]>\n"
@@ -22,11 +22,13 b' msgid "All Branches"'
 msgstr "Toutes les branches"
 
 #: rhodecode/controllers/changeset.py:83
-msgid "show white space"
+#, fuzzy
+msgid "Show white space"
 msgstr "Afficher les espaces et tabulations"
 
 #: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
-msgid "ignore white space"
+#, fuzzy
+msgid "Ignore white space"
 msgstr "Ignorer les espaces et tabulations"
 
 #: rhodecode/controllers/changeset.py:163
@@ -35,7 +37,7 b' msgid "%s line context"'
 msgstr "Afficher %s lignes de contexte"
 
 #: rhodecode/controllers/changeset.py:329
-#: rhodecode/controllers/pullrequests.py:416
+#: rhodecode/controllers/pullrequests.py:438
 #, python-format
 msgid "Status change -> %s"
 msgstr "Changement de statut -> %s"
@@ -49,8 +51,8 b' msgstr ""'
 "Le changement de statut d’un changeset associé à une pull request fermée "
 "n’est pas autorisé."
 
-#: rhodecode/controllers/compare.py:75
-#: rhodecode/controllers/pullrequests.py:121
+#: rhodecode/controllers/compare.py:74
+#: rhodecode/controllers/pullrequests.py:167
 #: rhodecode/controllers/shortlog.py:100
 msgid "There are no changesets yet"
 msgstr "Il n’y a aucun changement pour le moment"
@@ -96,107 +98,118 b' msgid "%s %s feed"'
 msgstr "Flux %s de %s"
 
 #: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:137
-#: rhodecode/templates/changeset/changeset.html:149
-#: rhodecode/templates/compare/compare_diff.html:62
-#: rhodecode/templates/compare/compare_diff.html:73
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
-#: rhodecode/templates/pullrequests/pullrequest_show.html:171
+#: rhodecode/templates/changeset/changeset.html:134
+#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/compare/compare_diff.html:58
+#: rhodecode/templates/compare/compare_diff.html:69
+#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:195
 msgid "Changeset was too big and was cut off..."
 msgstr "Cet ensemble de changements était trop important et a été découpé…"
 
-#: rhodecode/controllers/feed.py:92
-msgid "commited on"
-msgstr "a commité, le"
-
-#: rhodecode/controllers/files.py:86
-msgid "click here to add new file"
+#: rhodecode/controllers/feed.py:91
+#, fuzzy, python-format
+msgid "%s committed on %s"
+msgstr "%s a commité, le %s"
+
+#: rhodecode/controllers/files.py:88
+#, fuzzy
+msgid "Click here to add new file"
 msgstr "Ajouter un nouveau fichier"
 
-#: rhodecode/controllers/files.py:87
+#: rhodecode/controllers/files.py:89
 #, python-format
 msgid "There are no files yet %s"
 msgstr "Il n’y a pas encore de fichiers %s"
 
-#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338
+#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr "Ce dépôt a été verrouillé par %s sur %s."
 
-#: rhodecode/controllers/files.py:281
+#: rhodecode/controllers/files.py:279
 msgid "You can only edit files with revision being a valid branch "
 msgstr ""
 
-#: rhodecode/controllers/files.py:295
+#: rhodecode/controllers/files.py:293
 #, fuzzy, python-format
 msgid "Edited file %s via RhodeCode"
 msgstr "%s édité via RhodeCode"
 
-#: rhodecode/controllers/files.py:311
+#: rhodecode/controllers/files.py:309
 msgid "No changes"
 msgstr "Aucun changement"
 
-#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384
+#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Commit réalisé avec succès sur %s"
 
-#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390
+#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394
 msgid "Error occurred during commit"
 msgstr "Une erreur est survenue durant le commit"
 
-#: rhodecode/controllers/files.py:350
+#: rhodecode/controllers/files.py:347
 #, fuzzy
 msgid "Added file via RhodeCode"
 msgstr "%s ajouté par RhodeCode"
 
-#: rhodecode/controllers/files.py:370
+#: rhodecode/controllers/files.py:364
 msgid "No content"
 msgstr "Aucun contenu"
 
-#: rhodecode/controllers/files.py:374
+#: rhodecode/controllers/files.py:368
 msgid "No filename"
 msgstr "Aucun nom de fichier"
 
-#: rhodecode/controllers/files.py:416
-msgid "downloads disabled"
+#: rhodecode/controllers/files.py:372
+msgid "Location must be relative path and must not contain .. in path"
+msgstr ""
+
+#: rhodecode/controllers/files.py:420
+#, fuzzy
+msgid "Downloads disabled"
 msgstr "Les téléchargements sont désactivés"
 
-#: rhodecode/controllers/files.py:427
+#: rhodecode/controllers/files.py:431
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Révision %s inconnue."
 
-#: rhodecode/controllers/files.py:429
+#: rhodecode/controllers/files.py:433
 msgid "Empty repository"
 msgstr "Dépôt vide."
 
-#: rhodecode/controllers/files.py:431
+#: rhodecode/controllers/files.py:435
 msgid "Unknown archive type"
 msgstr "Type d’archive inconnu"
 
-#: rhodecode/controllers/files.py:576
-#: rhodecode/templates/changeset/changeset_range.html:13
-#: rhodecode/templates/changeset/changeset_range.html:31
+#: rhodecode/controllers/files.py:617
+#: rhodecode/templates/changeset/changeset_range.html:9
 msgid "Changesets"
 msgstr "Changesets"
 
-#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564
+#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131
+#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606
+#: rhodecode/templates/switch_to_list.html:3
+#: rhodecode/templates/branches/branches.html:10
 msgid "Branches"
 msgstr "Branches"
 
-#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78
-#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575
+#: 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
 msgid "Tags"
 msgstr "Tags"
 
-#: rhodecode/controllers/forks.py:165
-#, python-format
-msgid "forked %s repository as %s"
+#: rhodecode/controllers/forks.py:175
+#, fuzzy, python-format
+msgid "Forked repository %s as %s"
 msgstr "dépôt %s forké en tant que %s"
 
-#: rhodecode/controllers/forks.py:179
+#: rhodecode/controllers/forks.py:189
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "Une erreur est survenue durant le fork du dépôt %s."
@@ -206,20 +219,20 b' msgid "public journal"'
 msgstr "Journal public"
 
 #: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322
-#: rhodecode/templates/base/base.html:238
 #: rhodecode/templates/journal/journal.html:12
 msgid "journal"
 msgstr "Journal"
 
-#: rhodecode/controllers/login.py:142
-msgid "You have successfully registered into rhodecode"
+#: rhodecode/controllers/login.py:138
+#, fuzzy
+msgid "You have successfully registered into RhodeCode"
 msgstr "Vous vous êtes inscrits avec succès à RhodeCode"
 
-#: rhodecode/controllers/login.py:163
+#: rhodecode/controllers/login.py:159
 msgid "Your password reset link was sent"
 msgstr "Un lien de rénitialisation de votre mot de passe vous a été envoyé."
 
-#: rhodecode/controllers/login.py:183
+#: rhodecode/controllers/login.py:179
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
@@ -227,31 +240,53 b' msgstr ""'
 "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a "
 "été envoyé par e-mail."
 
-#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570
+#: rhodecode/controllers/pullrequests.py:118
+#: rhodecode/templates/changeset/changeset.html:10
+#: rhodecode/templates/email_templates/changeset_comment.html:15
+msgid "Changeset"
+msgstr "Changements"
+
+#: rhodecode/controllers/pullrequests.py:128
+msgid "Special"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:129
+#, fuzzy
+msgid "Peer branches"
+msgstr "Branches"
+
+#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612
+#: rhodecode/templates/switch_to_list.html:28
+#: rhodecode/templates/bookmarks/bookmarks.html:10
 msgid "Bookmarks"
 msgstr "Signets"
 
-#: rhodecode/controllers/pullrequests.py:190
+#: rhodecode/controllers/pullrequests.py:228
 msgid "Pull request requires a title with min. 3 chars"
 msgstr "Les requêtes de pull nécessitent un titre d’au moins 3 caractères."
 
-#: rhodecode/controllers/pullrequests.py:192
-msgid "error during creation of pull request"
+#: rhodecode/controllers/pullrequests.py:230
+#, fuzzy
+msgid "Error creating pull request"
 msgstr "Une erreur est survenue lors de la création de la requête de pull."
 
-#: rhodecode/controllers/pullrequests.py:224
+#: rhodecode/controllers/pullrequests.py:251
 msgid "Successfully opened new pull request"
 msgstr "La requête de pull a été ouverte avec succès."
 
-#: rhodecode/controllers/pullrequests.py:227
+#: rhodecode/controllers/pullrequests.py:254
 msgid "Error occurred during sending pull request"
 msgstr "Une erreur est survenue durant l’envoi de la requête de pull."
 
-#: rhodecode/controllers/pullrequests.py:260
+#: rhodecode/controllers/pullrequests.py:287
 msgid "Successfully deleted pull request"
 msgstr "La requête de pull a été supprimée avec succès."
 
-#: rhodecode/controllers/pullrequests.py:451
+#: rhodecode/controllers/pullrequests.py:441
+msgid "Closing with"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:478
 msgid "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr ""
 
@@ -269,55 +304,12 b' msgstr ""'
 msgid "An error occurred during this search operation"
 msgstr "Une erreur est survenue durant l’opération de recherche."
 
-#: rhodecode/controllers/settings.py:120
-#: rhodecode/controllers/admin/repos.py:254
-#, python-format
-msgid "Repository %s updated successfully"
-msgstr "Dépôt %s mis à jour avec succès."
-
-#: rhodecode/controllers/settings.py:138
-#: rhodecode/controllers/admin/repos.py:272
-#, python-format
-msgid "error occurred during update of repository %s"
-msgstr "Une erreur est survenue lors de la mise à jour du dépôt %s."
-
-#: rhodecode/controllers/settings.py:163
-#: rhodecode/controllers/admin/repos.py:297
-#, python-format
-msgid "deleted repository %s"
-msgstr "Dépôt %s supprimé"
-
-#: rhodecode/controllers/settings.py:167
-#: rhodecode/controllers/admin/repos.py:307
-#: rhodecode/controllers/admin/repos.py:313
-#, python-format
-msgid "An error occurred during deletion of %s"
-msgstr "Erreur pendant la suppression de %s"
-
-#: rhodecode/controllers/settings.py:186
-msgid "unlocked"
-msgstr "déverrouillé"
-
-#: rhodecode/controllers/settings.py:189
-msgid "locked"
-msgstr "verrouillé"
-
-#: rhodecode/controllers/settings.py:191
-#, python-format
-msgid "Repository has been %s"
-msgstr "Le dépôt a été %s."
-
-#: rhodecode/controllers/settings.py:195
-#: rhodecode/controllers/admin/repos.py:405
-msgid "An error occurred during unlocking"
-msgstr "Une erreur est survenue durant le déverrouillage."
-
-#: rhodecode/controllers/summary.py:140
+#: rhodecode/controllers/summary.py:141
 msgid "No data loaded yet"
 msgstr "Aucune donnée actuellement disponible."
 
-#: rhodecode/controllers/summary.py:144
-#: rhodecode/templates/summary/summary.html:157
+#: rhodecode/controllers/summary.py:147
+#: rhodecode/templates/summary/summary.html:149
 msgid "Statistics are disabled for this repository"
 msgstr "La mise à jour des statistiques est désactivée pour ce dépôt."
 
@@ -328,7 +320,7 b' msgstr "Mise \xc3\xa0 jour r\xc3\xa9ussie des r\xc3\xa9glages LDAP"'
 
 #: rhodecode/controllers/admin/defaults.py:110
 #, fuzzy
-msgid "error occurred during update of defaults"
+msgid "Error occurred during update of defaults"
 msgstr "Une erreur est survenue durant la mise à jour de l’utilisateur %s."
 
 #: rhodecode/controllers/admin/ldap_settings.py:50
@@ -384,7 +376,8 b' msgid "Unable to activate ldap. The \\"py'
 msgstr "Impossible d’activer LDAP. La bibliothèque « python-ldap » est manquante."
 
 #: rhodecode/controllers/admin/ldap_settings.py:147
-msgid "error occurred during update of ldap settings"
+#, fuzzy
+msgid "Error occurred during update of ldap settings"
 msgstr "Une erreur est survenue durant la mise à jour des réglages du LDAP."
 
 #: rhodecode/controllers/admin/permissions.py:60
@@ -407,45 +400,46 b' msgstr "\xc3\x89crire"'
 #: rhodecode/templates/admin/defaults/defaults.html:9
 #: 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/repo_add.html:10
+#: rhodecode/templates/admin/repos/repo_add.html:14
 #: rhodecode/templates/admin/repos/repos.html:9
-#: 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/repos_groups/repos_groups_add.html:9
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13
 #: 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:130
+#: rhodecode/templates/admin/users/user_edit.html:133
 #: rhodecode/templates/admin/users/users.html:9
+#: rhodecode/templates/admin/users/users.html:85
 #: 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:203
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:326
-#: rhodecode/templates/base/base.html:328
+#: rhodecode/templates/base/base.html:292
+#: rhodecode/templates/base/base.html:293
+#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:300
 msgid "Admin"
 msgstr "Administration"
 
 #: rhodecode/controllers/admin/permissions.py:70
-msgid "disabled"
-msgstr "Désactivé"
-
-#: rhodecode/controllers/admin/permissions.py:72
-msgid "allowed with manual account activation"
-msgstr "Autorisé avec activation manuelle du compte"
-
-#: rhodecode/controllers/admin/permissions.py:74
-msgid "allowed with automatic account activation"
-msgstr "Autorisé avec activation automatique du compte"
-
 #: rhodecode/controllers/admin/permissions.py:76
 #: rhodecode/controllers/admin/permissions.py:79
 msgid "Disabled"
 msgstr "Interdite"
 
+#: rhodecode/controllers/admin/permissions.py:72
+#, fuzzy
+msgid "Allowed with manual account activation"
+msgstr "Autorisé avec activation manuelle du compte"
+
+#: rhodecode/controllers/admin/permissions.py:74
+#, fuzzy
+msgid "Allowed with automatic account activation"
+msgstr "Autorisé avec activation automatique du compte"
+
 #: rhodecode/controllers/admin/permissions.py:77
 #: rhodecode/controllers/admin/permissions.py:80
 msgid "Enabled"
@@ -456,162 +450,239 b' msgid "Default permissions updated succe'
 msgstr "Permissions par défaut mises à jour avec succès"
 
 #: rhodecode/controllers/admin/permissions.py:142
-msgid "error occurred during update of permissions"
+#, fuzzy
+msgid "Error occurred during update of permissions"
 msgstr "erreur pendant la mise à jour des permissions"
 
-#: rhodecode/controllers/admin/repos.py:123
+#: rhodecode/controllers/admin/repos.py:127
 msgid "--REMOVE FORK--"
 msgstr "[Pas un fork]"
 
-#: rhodecode/controllers/admin/repos.py:162
-#, python-format
-msgid "created repository %s from %s"
+#: rhodecode/controllers/admin/repos.py:168
+#, fuzzy, python-format
+msgid "Created repository %s from %s"
 msgstr "Le dépôt %s a été créé depuis %s."
 
-#: rhodecode/controllers/admin/repos.py:166
-#, python-format
-msgid "created repository %s"
+#: rhodecode/controllers/admin/repos.py:174
+#, fuzzy, python-format
+msgid "Created repository %s"
 msgstr "Le dépôt %s a été créé."
 
 #: rhodecode/controllers/admin/repos.py:197
+#, fuzzy, python-format
+msgid "Error creating repository %s"
+msgstr "Le dépôt %s a été créé."
+
+#: rhodecode/controllers/admin/repos.py:266
 #, python-format
-msgid "error occurred during creation of repository %s"
-msgstr "Une erreur est survenue durant la création du dépôt %s."
-
-#: rhodecode/controllers/admin/repos.py:302
+msgid "Repository %s updated successfully"
+msgstr "Dépôt %s mis à jour avec succès."
+
+#: rhodecode/controllers/admin/repos.py:284
+#, fuzzy, python-format
+msgid "Error occurred during update of repository %s"
+msgstr "Une erreur est survenue lors de la mise à jour du dépôt %s."
+
+#: rhodecode/controllers/admin/repos.py:311
+#: rhodecode/controllers/api/api.py:877
+#, python-format
+msgid "Detached %s forks"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:314
+#: rhodecode/controllers/api/api.py:879
+#, fuzzy, python-format
+msgid "Deleted %s forks"
+msgstr "Dépôt %s supprimé"
+
+#: rhodecode/controllers/admin/repos.py:319
+#, fuzzy, python-format
+msgid "Deleted repository %s"
+msgstr "Dépôt %s supprimé"
+
+#: rhodecode/controllers/admin/repos.py:322
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr "Impossible de supprimer le dépôt %s : Des forks y sont attachés."
 
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/admin/repos.py:327
+#, python-format
+msgid "An error occurred during deletion of %s"
+msgstr "Erreur pendant la suppression de %s"
+
+#: rhodecode/controllers/admin/repos.py:365
+#, fuzzy
+msgid "Repository permissions updated"
+msgstr "Création de dépôt désactivée"
+
+#: rhodecode/controllers/admin/repos.py:384
 msgid "An error occurred during deletion of repository user"
 msgstr "Une erreur est survenue durant la suppression de l’utilisateur du dépôt."
 
-#: rhodecode/controllers/admin/repos.py:350
-msgid "An error occurred during deletion of repository users groups"
+#: rhodecode/controllers/admin/repos.py:403
+#, fuzzy
+msgid "An error occurred during deletion of repository user groups"
 msgstr ""
 "Une erreur est survenue durant la suppression du groupe d’utilisateurs de"
 " ce dépôt."
 
-#: rhodecode/controllers/admin/repos.py:368
+#: rhodecode/controllers/admin/repos.py:421
 msgid "An error occurred during deletion of repository stats"
 msgstr "Une erreur est survenue durant la suppression des statistiques du dépôt."
 
-#: rhodecode/controllers/admin/repos.py:385
+#: rhodecode/controllers/admin/repos.py:438
 msgid "An error occurred during cache invalidation"
 msgstr "Une erreur est survenue durant l’invalidation du cache."
 
-#: rhodecode/controllers/admin/repos.py:425
+#: rhodecode/controllers/admin/repos.py:458
+#: rhodecode/controllers/admin/repos.py:485
+msgid "An error occurred during unlocking"
+msgstr "Une erreur est survenue durant le déverrouillage."
+
+#: rhodecode/controllers/admin/repos.py:476
+#, fuzzy
+msgid "Unlocked"
+msgstr "déverrouillé"
+
+#: rhodecode/controllers/admin/repos.py:479
+#, fuzzy
+msgid "Locked"
+msgstr "verrouillé"
+
+#: rhodecode/controllers/admin/repos.py:481
+#, python-format
+msgid "Repository has been %s"
+msgstr "Le dépôt a été %s."
+
+#: rhodecode/controllers/admin/repos.py:505
 msgid "Updated repository visibility in public journal"
 msgstr "La visibilité du dépôt dans le journal public a été mise à jour."
 
-#: rhodecode/controllers/admin/repos.py:429
+#: rhodecode/controllers/admin/repos.py:509
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 "Une erreur est survenue durant la configuration du journal public pour ce"
 " dépôt."
 
-#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301
+#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302
 msgid "Token mismatch"
 msgstr "Jeton d’authentification incorrect."
 
-#: rhodecode/controllers/admin/repos.py:447
+#: rhodecode/controllers/admin/repos.py:527
 msgid "Pulled from remote location"
 msgstr "Les changements distants ont été récupérés."
 
-#: rhodecode/controllers/admin/repos.py:449
+#: rhodecode/controllers/admin/repos.py:529
 msgid "An error occurred during pull from remote location"
 msgstr "Une erreur est survenue durant le pull depuis la source distante."
 
-#: rhodecode/controllers/admin/repos.py:465
+#: rhodecode/controllers/admin/repos.py:545
 msgid "Nothing"
 msgstr "[Aucun dépôt]"
 
-#: rhodecode/controllers/admin/repos.py:467
+#: rhodecode/controllers/admin/repos.py:547
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "Le dépôt %s a été marké comme fork de %s"
 
-#: rhodecode/controllers/admin/repos.py:471
+#: rhodecode/controllers/admin/repos.py:551
 msgid "An error occurred during this operation"
 msgstr "Une erreur est survenue durant cette opération."
 
-#: rhodecode/controllers/admin/repos_groups.py:136
-#, python-format
-msgid "created repos group %s"
+#: rhodecode/controllers/admin/repos.py:590
+#, fuzzy
+msgid "An error occurred during creation of field"
+msgstr "Une erreur est survenue durant la création de l’utilisateur %s."
+
+#: rhodecode/controllers/admin/repos.py:604
+#, fuzzy
+msgid "An error occurred during removal of field"
+msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail."
+
+#: rhodecode/controllers/admin/repos_groups.py:145
+#, fuzzy, python-format
+msgid "Created repository group %s"
 msgstr "Le groupe de dépôts %s a été créé."
 
-#: rhodecode/controllers/admin/repos_groups.py:148
-#, python-format
-msgid "error occurred during creation of repos group %s"
+#: rhodecode/controllers/admin/repos_groups.py:157
+#, fuzzy, python-format
+msgid "Error occurred during creation of repository group %s"
 msgstr "Une erreur est survenue durant la création du groupe de dépôts %s."
 
-#: rhodecode/controllers/admin/repos_groups.py:205
-#, python-format
-msgid "updated repos group %s"
-msgstr "Le groupe de dépôts %s a été mis à jour."
+#: rhodecode/controllers/admin/repos_groups.py:214
+#: rhodecode/controllers/admin/repos_groups.py:286
+msgid "Cannot revoke permission for yourself as admin"
+msgstr ""
 
 #: rhodecode/controllers/admin/repos_groups.py:220
-#, python-format
-msgid "error occurred during update of repos group %s"
+#, fuzzy, python-format
+msgid "Updated repository group %s"
+msgstr "Le groupe de dépôts %s a été mis à jour."
+
+#: rhodecode/controllers/admin/repos_groups.py:235
+#, fuzzy, python-format
+msgid "Error occurred during update of repository group %s"
 msgstr "Une erreur est survenue durant la mise à jour du groupe de dépôts %s."
 
-#: rhodecode/controllers/admin/repos_groups.py:238
+#: rhodecode/controllers/admin/repos_groups.py:253
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr "Ce groupe contient %s dépôts et ne peut être supprimé."
 
-#: rhodecode/controllers/admin/repos_groups.py:246
-#, python-format
-msgid "removed repos group %s"
+#: rhodecode/controllers/admin/repos_groups.py:260
+#, fuzzy, python-format
+msgid "This group contains %s subgroups and cannot be deleted"
+msgstr "Ce groupe contient %s dépôts et ne peut être supprimé."
+
+#: rhodecode/controllers/admin/repos_groups.py:266
+#, fuzzy, python-format
+msgid "Removed repository group %s"
 msgstr "Le groupe de dépôts %s a été supprimé."
 
-#: rhodecode/controllers/admin/repos_groups.py:252
-msgid "Cannot delete this group it still contains subgroups"
-msgstr "Impossible de supprimer ce groupe : Il contient des sous-groupes."
-
-#: rhodecode/controllers/admin/repos_groups.py:257
-#: rhodecode/controllers/admin/repos_groups.py:262
-#, python-format
-msgid "error occurred during deletion of repos group %s"
+#: rhodecode/controllers/admin/repos_groups.py:271
+#, fuzzy, python-format
+msgid "Error occurred during deletion of repos group %s"
 msgstr "Une erreur est survenue durant la suppression du groupe de dépôts %s."
 
-#: rhodecode/controllers/admin/repos_groups.py:283
+#: rhodecode/controllers/admin/repos_groups.py:297
 msgid "An error occurred during deletion of group user"
 msgstr ""
 "Une erreur est survenue durant la suppression de l’utilisateur du groupe "
 "de dépôts."
 
-#: rhodecode/controllers/admin/repos_groups.py:304
-msgid "An error occurred during deletion of group users groups"
+#: rhodecode/controllers/admin/repos_groups.py:318
+#, fuzzy
+msgid "An error occurred during deletion of group user groups"
 msgstr ""
 "Une erreur est survenue durant la suppression du groupe d’utilisateurs du"
 " groupe de dépôts."
 
-#: rhodecode/controllers/admin/settings.py:124
+#: rhodecode/controllers/admin/settings.py:126
 #, fuzzy, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr "Après re-scan : %s ajouté(s), %s enlevé(s)"
 
-#: rhodecode/controllers/admin/settings.py:133
+#: rhodecode/controllers/admin/settings.py:135
 msgid "Whoosh reindex task scheduled"
 msgstr "La tâche de réindexation Whoosh a été planifiée."
 
-#: rhodecode/controllers/admin/settings.py:164
+#: rhodecode/controllers/admin/settings.py:166
 msgid "Updated application settings"
 msgstr "Réglages mis à jour"
 
-#: rhodecode/controllers/admin/settings.py:168
+#: rhodecode/controllers/admin/settings.py:170
 #: rhodecode/controllers/admin/settings.py:301
-msgid "error occurred during updating application settings"
+#, fuzzy
+msgid "Error occurred during updating application settings"
 msgstr "Une erreur est survenue durant la mise à jour des options."
 
-#: rhodecode/controllers/admin/settings.py:209
+#: rhodecode/controllers/admin/settings.py:216
 msgid "Updated visualisation settings"
 msgstr "Réglages d’affichage mis à jour."
 
-#: rhodecode/controllers/admin/settings.py:214
-msgid "error occurred during updating visualisation settings"
+#: rhodecode/controllers/admin/settings.py:221
+#, fuzzy
+msgid "Error occurred during updating visualisation settings"
 msgstr "Une erreur est survenue durant la mise à jour des réglages d’affichages."
 
 #: rhodecode/controllers/admin/settings.py:297
@@ -627,37 +698,38 b' msgid "Updated hooks"'
 msgstr "Hooks mis à jour"
 
 #: rhodecode/controllers/admin/settings.py:327
-msgid "error occurred during hook creation"
+#, fuzzy
+msgid "Error occurred during hook creation"
 msgstr "Une erreur est survenue durant la création du hook."
 
 #: rhodecode/controllers/admin/settings.py:346
 msgid "Email task created"
 msgstr "La tâche d’e-mail a été créée."
 
-#: rhodecode/controllers/admin/settings.py:408
+#: rhodecode/controllers/admin/settings.py:410
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon"
 " fonctionnement de l’application."
 
-#: rhodecode/controllers/admin/settings.py:448
+#: rhodecode/controllers/admin/settings.py:452
 msgid "Your account was updated successfully"
 msgstr "Votre compte a été mis à jour avec succès"
 
-#: rhodecode/controllers/admin/settings.py:463
+#: rhodecode/controllers/admin/settings.py:467
 #: rhodecode/controllers/admin/users.py:198
-#, python-format
-msgid "error occurred during update of user %s"
+#, fuzzy, python-format
+msgid "Error occurred during update of user %s"
 msgstr "Une erreur est survenue durant la mise à jour de l’utilisateur %s."
 
 #: rhodecode/controllers/admin/users.py:130
-#, python-format
-msgid "created user %s"
+#, fuzzy, python-format
+msgid "Created user %s"
 msgstr "utilisateur %s créé"
 
 #: rhodecode/controllers/admin/users.py:142
-#, python-format
-msgid "error occurred during creation of user %s"
+#, fuzzy, python-format
+msgid "Error occurred during creation of user %s"
 msgstr "Une erreur est survenue durant la création de l’utilisateur %s."
 
 #: rhodecode/controllers/admin/users.py:176
@@ -665,7 +737,8 b' msgid "User updated successfully"'
 msgstr "L’utilisateur a été mis à jour avec succès."
 
 #: rhodecode/controllers/admin/users.py:214
-msgid "successfully deleted user"
+#, fuzzy
+msgid "Successfully deleted user"
 msgstr "L’utilisateur a été supprimé avec succès."
 
 #: rhodecode/controllers/admin/users.py:219
@@ -693,7 +766,7 b' msgid "Revoked \'repository fork\' permiss'
 msgstr "La permission de fork de dépôts a été révoquée à l’utilisateur."
 
 #: rhodecode/controllers/admin/users.py:298
-#: rhodecode/controllers/admin/users_groups.py:279
+#: rhodecode/controllers/admin/users_groups.py:281
 msgid "An error occurred during permissions saving"
 msgstr "Une erreur est survenue durant l’enregistrement des permissions."
 
@@ -726,227 +799,235 b' msgid "Removed ip from user"'
 msgstr "L’e-mail a été enlevé de l’utilisateur."
 
 #: rhodecode/controllers/admin/users_groups.py:86
-#, python-format
-msgid "created users group %s"
+#, fuzzy, python-format
+msgid "Created user group %s"
 msgstr "Le groupe d’utilisateurs %s a été créé."
 
 #: rhodecode/controllers/admin/users_groups.py:97
-#, python-format
-msgid "error occurred during creation of users group %s"
+#, fuzzy, python-format
+msgid "Error occurred during creation of user group %s"
 msgstr "Une erreur est survenue durant la création du groupe d’utilisateurs %s."
 
-#: rhodecode/controllers/admin/users_groups.py:164
-#, python-format
-msgid "updated users group %s"
+#: rhodecode/controllers/admin/users_groups.py:166
+#, fuzzy, python-format
+msgid "Updated user group %s"
 msgstr "Le groupe d’utilisateurs %s a été mis à jour."
 
-#: rhodecode/controllers/admin/users_groups.py:186
-#, python-format
-msgid "error occurred during update of users group %s"
+#: rhodecode/controllers/admin/users_groups.py:188
+#, fuzzy, python-format
+msgid "Error occurred during update of user group %s"
 msgstr "Une erreur est survenue durant la mise à jour du groupe d’utilisateurs %s."
 
-#: rhodecode/controllers/admin/users_groups.py:203
-msgid "successfully deleted users group"
+#: rhodecode/controllers/admin/users_groups.py:205
+#, fuzzy
+msgid "Successfully deleted user group"
 msgstr "Le groupe d’utilisateurs a été supprimé avec succès."
 
-#: rhodecode/controllers/admin/users_groups.py:208
-msgid "An error occurred during deletion of users group"
+#: rhodecode/controllers/admin/users_groups.py:210
+#, fuzzy
+msgid "An error occurred during deletion of user group"
 msgstr "Une erreur est survenue lors de la suppression du groupe d’utilisateurs."
 
-#: rhodecode/controllers/admin/users_groups.py:257
-msgid "Granted 'repository create' permission to users group"
+#: rhodecode/controllers/admin/users_groups.py:259
+#, fuzzy
+msgid "Granted 'repository create' permission to user group"
 msgstr ""
 "La permission de création de dépôts a été accordée au groupe "
 "d’utilisateurs."
 
-#: rhodecode/controllers/admin/users_groups.py:262
-msgid "Revoked 'repository create' permission to users group"
+#: rhodecode/controllers/admin/users_groups.py:264
+#, fuzzy
+msgid "Revoked 'repository create' permission to user group"
 msgstr ""
 "La permission de création de dépôts a été révoquée au groupe "
 "d’utilisateurs."
 
-#: rhodecode/controllers/admin/users_groups.py:268
-msgid "Granted 'repository fork' permission to users group"
+#: rhodecode/controllers/admin/users_groups.py:270
+#, fuzzy
+msgid "Granted 'repository fork' permission to user group"
 msgstr "La permission de fork de dépôts a été accordée au groupe d’utilisateur."
 
-#: rhodecode/controllers/admin/users_groups.py:273
-msgid "Revoked 'repository fork' permission to users group"
+#: rhodecode/controllers/admin/users_groups.py:275
+#, fuzzy
+msgid "Revoked 'repository fork' permission to user group"
 msgstr "La permission de fork de dépôts a été révoquée au groupe d’utilisateurs."
 
-#: rhodecode/lib/auth.py:509
+#: rhodecode/lib/auth.py:530
 #, fuzzy, python-format
 msgid "IP %s not allowed"
 msgstr "Followers de %s"
 
-#: rhodecode/lib/auth.py:558
+#: rhodecode/lib/auth.py:579
 msgid "You need to be a registered user to perform this action"
 msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action."
 
-#: rhodecode/lib/auth.py:599
+#: rhodecode/lib/auth.py:620
 msgid "You need to be a signed in to view this page"
 msgstr "Vous devez être connecté pour visualiser cette page."
 
-#: rhodecode/lib/diffs.py:74
-msgid "binary file"
+#: rhodecode/lib/diffs.py:66
+#, fuzzy
+msgid "Binary file"
 msgstr "Fichier binaire"
 
-#: rhodecode/lib/diffs.py:90
+#: rhodecode/lib/diffs.py:82
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 "Cet ensemble de changements était trop gros pour être affiché et a été "
 "découpé, utilisez le menu « Diff » pour afficher les différences."
 
-#: rhodecode/lib/diffs.py:100
+#: rhodecode/lib/diffs.py:92
 msgid "No changes detected"
 msgstr "Aucun changement détecté."
 
-#: rhodecode/lib/helpers.py:374
+#: rhodecode/lib/helpers.py:394
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr "%d/%m/%Y à %H:%M:%S"
 
-#: rhodecode/lib/helpers.py:486
+#: rhodecode/lib/helpers.py:506
 msgid "True"
 msgstr "Vrai"
 
-#: rhodecode/lib/helpers.py:490
+#: rhodecode/lib/helpers.py:509
 msgid "False"
 msgstr "Faux"
 
-#: rhodecode/lib/helpers.py:530
+#: rhodecode/lib/helpers.py:547
 #, fuzzy, python-format
 msgid "Deleted branch: %s"
 msgstr "Dépôt %s supprimé"
 
-#: rhodecode/lib/helpers.py:533
+#: rhodecode/lib/helpers.py:550
 #, fuzzy, python-format
 msgid "Created tag: %s"
 msgstr "utilisateur %s créé"
 
-#: rhodecode/lib/helpers.py:546
+#: rhodecode/lib/helpers.py:563
 msgid "Changeset not found"
 msgstr "Ensemble de changements non trouvé"
 
-#: rhodecode/lib/helpers.py:589
+#: rhodecode/lib/helpers.py:615
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "Afficher les changements combinés %s->%s"
 
-#: rhodecode/lib/helpers.py:595
+#: rhodecode/lib/helpers.py:621
 msgid "compare view"
 msgstr "vue de comparaison"
 
-#: rhodecode/lib/helpers.py:615
+#: rhodecode/lib/helpers.py:641
 msgid "and"
 msgstr "et"
 
-#: rhodecode/lib/helpers.py:616
+#: rhodecode/lib/helpers.py:642
 #, python-format
 msgid "%s more"
 msgstr "%s de plus"
 
-#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51
+#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44
 msgid "revisions"
 msgstr "révisions"
 
-#: rhodecode/lib/helpers.py:641
+#: rhodecode/lib/helpers.py:667
 #, fuzzy, python-format
 msgid "fork name %s"
 msgstr "Nom du fork %s"
 
-#: rhodecode/lib/helpers.py:658
-#: rhodecode/templates/pullrequests/pullrequest_show.html:4
-#: rhodecode/templates/pullrequests/pullrequest_show.html:12
+#: rhodecode/lib/helpers.py:684
+#: rhodecode/templates/pullrequests/pullrequest_show.html:8
 #, python-format
 msgid "Pull request #%s"
 msgstr "Requête de pull #%s"
 
-#: rhodecode/lib/helpers.py:664
+#: rhodecode/lib/helpers.py:690
 msgid "[deleted] repository"
 msgstr "[a supprimé] le dépôt"
 
-#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676
+#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702
 msgid "[created] repository"
 msgstr "[a créé] le dépôt"
 
-#: rhodecode/lib/helpers.py:668
+#: rhodecode/lib/helpers.py:694
 msgid "[created] repository as fork"
 msgstr "[a créé] le dépôt en tant que fork"
 
-#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678
+#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704
 msgid "[forked] repository"
 msgstr "[a forké] le dépôt"
 
-#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680
+#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706
 msgid "[updated] repository"
 msgstr "[a mis à jour] le dépôt"
 
-#: rhodecode/lib/helpers.py:674
+#: rhodecode/lib/helpers.py:700
 msgid "[delete] repository"
 msgstr "[a supprimé] le dépôt"
 
-#: rhodecode/lib/helpers.py:682
+#: rhodecode/lib/helpers.py:708
 msgid "[created] user"
 msgstr "[a créé] l’utilisateur"
 
-#: rhodecode/lib/helpers.py:684
+#: rhodecode/lib/helpers.py:710
 msgid "[updated] user"
 msgstr "[a mis à jour] l’utilisateur"
 
-#: rhodecode/lib/helpers.py:686
-msgid "[created] users group"
+#: rhodecode/lib/helpers.py:712
+#, fuzzy
+msgid "[created] user group"
 msgstr "[a créé] le groupe d’utilisateurs"
 
-#: rhodecode/lib/helpers.py:688
-msgid "[updated] users group"
+#: rhodecode/lib/helpers.py:714
+#, fuzzy
+msgid "[updated] user group"
 msgstr "[a mis à jour] le groupe d’utilisateurs"
 
-#: rhodecode/lib/helpers.py:690
+#: rhodecode/lib/helpers.py:716
 msgid "[commented] on revision in repository"
 msgstr "[a commenté] une révision du dépôt"
 
-#: rhodecode/lib/helpers.py:692
+#: rhodecode/lib/helpers.py:718
 msgid "[commented] on pull request for"
 msgstr "[a commenté] la requête de pull pour"
 
-#: rhodecode/lib/helpers.py:694
+#: rhodecode/lib/helpers.py:720
 msgid "[closed] pull request for"
 msgstr "[a fermé] la requête de pull de"
 
-#: rhodecode/lib/helpers.py:696
+#: rhodecode/lib/helpers.py:722
 msgid "[pushed] into"
 msgstr "[a pushé] dans"
 
-#: rhodecode/lib/helpers.py:698
+#: rhodecode/lib/helpers.py:724
 msgid "[committed via RhodeCode] into repository"
 msgstr "[a commité via RhodeCode] dans le dépôt"
 
-#: rhodecode/lib/helpers.py:700
+#: rhodecode/lib/helpers.py:726
 msgid "[pulled from remote] into repository"
 msgstr "[a pullé depuis un site distant] dans le dépôt"
 
-#: rhodecode/lib/helpers.py:702
+#: rhodecode/lib/helpers.py:728
 msgid "[pulled] from"
 msgstr "[a pullé] depuis"
 
-#: rhodecode/lib/helpers.py:704
+#: rhodecode/lib/helpers.py:730
 msgid "[started following] repository"
 msgstr "[suit maintenant] le dépôt"
 
-#: rhodecode/lib/helpers.py:706
+#: rhodecode/lib/helpers.py:732
 msgid "[stopped following] repository"
 msgstr "[ne suit plus] le dépôt"
 
-#: rhodecode/lib/helpers.py:884
+#: rhodecode/lib/helpers.py:910
 #, python-format
 msgid " and %s more"
 msgstr "et %s de plus"
 
-#: rhodecode/lib/helpers.py:888
+#: rhodecode/lib/helpers.py:914
 msgid "No Files"
 msgstr "Aucun fichier"
 
-#: rhodecode/lib/helpers.py:1164
+#: rhodecode/lib/helpers.py:1198
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -957,185 +1038,230 b' msgstr ""'
 "probablement été créé ou renommé manuellement. Veuillez relancer "
 "l’application pour rescanner les dépôts."
 
-#: rhodecode/lib/utils2.py:403
+#: rhodecode/lib/unionrepo.py:193
+#, fuzzy
+msgid "cannot create new union repository"
+msgstr "[a créé] le dépôt"
+
+#: rhodecode/lib/utils2.py:411
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d an"
 msgstr[1] "%d ans"
 
-#: rhodecode/lib/utils2.py:404
+#: rhodecode/lib/utils2.py:412
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mois"
 msgstr[1] "%d mois"
 
-#: rhodecode/lib/utils2.py:405
+#: rhodecode/lib/utils2.py:413
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: rhodecode/lib/utils2.py:406
+#: rhodecode/lib/utils2.py:414
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: rhodecode/lib/utils2.py:407
+#: rhodecode/lib/utils2.py:415
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: rhodecode/lib/utils2.py:408
+#: rhodecode/lib/utils2.py:416
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 
-#: rhodecode/lib/utils2.py:424
+#: rhodecode/lib/utils2.py:432
 #, fuzzy, python-format
 msgid "in %s"
 msgstr "à la ligne %s"
 
-#: rhodecode/lib/utils2.py:426
+#: rhodecode/lib/utils2.py:434
 #, python-format
 msgid "%s ago"
 msgstr "Il y a %s"
 
-#: rhodecode/lib/utils2.py:428
+#: rhodecode/lib/utils2.py:436
 #, fuzzy, python-format
 msgid "in %s and %s"
 msgstr "Il y a %s et %s"
 
-#: rhodecode/lib/utils2.py:431
+#: rhodecode/lib/utils2.py:439
 #, python-format
 msgid "%s and %s ago"
 msgstr "Il y a %s et %s"
 
-#: rhodecode/lib/utils2.py:434
+#: rhodecode/lib/utils2.py:442
 msgid "just now"
 msgstr "à l’instant"
 
-#: rhodecode/lib/celerylib/tasks.py:270
-msgid "password reset link"
-msgstr "Réinitialisation du mot de passe"
-
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313
+#: 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
 msgid "Repository no access"
 msgstr "Aucun accès au dépôt"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314
+#: 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
 msgid "Repository read access"
 msgstr "Accès en lecture au dépôt"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315
+#: 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
 msgid "Repository write access"
 msgstr "Accès en écriture au dépôt"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316
+#: 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
 msgid "Repository admin access"
 msgstr "Accès administrateur au dépôt"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294
 msgid "Repositories Group no access"
 msgstr "Aucun accès au groupe de dépôts"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295
 msgid "Repositories Group read access"
 msgstr "Accès en lecture au groupe de dépôts"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296
 msgid "Repositories Group write access"
 msgstr "Accès en écriture au groupe de dépôts"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297
 msgid "Repositories Group admin access"
 msgstr "Accès administrateur au groupe de dépôts"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323
+#: 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
 msgid "RhodeCode Administrator"
 msgstr "Administrateur RhodeCode"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324
+#: 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
 msgid "Repository creation disabled"
 msgstr "Création de dépôt désactivée"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325
+#: 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
 msgid "Repository creation enabled"
 msgstr "Création de dépôt activée"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326
+#: 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
 msgid "Repository forking disabled"
 msgstr "Fork de dépôt désactivé"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327
+#: 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
 msgid "Repository forking enabled"
 msgstr "Fork de dépôt activé"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328
+#: 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
 msgid "Register disabled"
 msgstr "Enregistrement désactivé"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329
+#: 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
 msgid "Register new user with RhodeCode with manual activation"
 msgstr "Enregistrer un nouvel utilisateur Rhodecode manuellement activé"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332
+#: 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
 msgid "Register new user with RhodeCode with auto activation"
 msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776
+#: 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
 msgid "Not Reviewed"
 msgstr "Pas encore relue"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777
+#: 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
 msgid "Approved"
 msgstr "Approuvée "
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778
+#: 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
 msgid "Rejected"
 msgstr "Rejetée"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779
+#: 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
 msgid "Under Review"
 msgstr "En cours de relecture"
 
-#: rhodecode/model/comment.py:109
+#: rhodecode/model/comment.py:75
 #, python-format
 msgid "on line %s"
 msgstr "à la ligne %s"
 
-#: rhodecode/model/comment.py:176
+#: rhodecode/model/comment.py:219
 msgid "[Mention]"
 msgstr "[Mention]"
 
+#: rhodecode/model/db.py:1252
+msgid "top level"
+msgstr ""
+
+#: rhodecode/model/db.py:1393
+#, fuzzy
+msgid "Repository group no access"
+msgstr "Aucun accès au groupe de dépôts"
+
+#: rhodecode/model/db.py:1394
+#, fuzzy
+msgid "Repository group read access"
+msgstr "Accès en lecture au groupe de dépôts"
+
+#: rhodecode/model/db.py:1395
+#, fuzzy
+msgid "Repository group write access"
+msgstr "Accès en écriture au groupe de dépôts"
+
+#: rhodecode/model/db.py:1396
+#, fuzzy
+msgid "Repository group admin access"
+msgstr "Accès administrateur au groupe de dépôts"
+
 #: rhodecode/model/forms.py:43
 msgid "Please enter a login"
 msgstr "Veuillez entrer un identifiant"
@@ -1154,62 +1280,65 b' msgstr "Veuillez entrer un mot de passe"'
 msgid "Enter %(min)i characters or more"
 msgstr "Entrez au moins %(min)i caractères"
 
-#: rhodecode/model/notification.py:220
-#, fuzzy, python-format
-msgid "commented on commit at %(when)s"
-msgstr "a posté un commentaire sur le commit %(when)s"
-
-#: rhodecode/model/notification.py:221
-#, fuzzy, python-format
-msgid "sent message at %(when)s"
-msgstr "a envoyé un message  %(when)s"
-
-#: rhodecode/model/notification.py:222
-#, fuzzy, python-format
-msgid "mentioned you at %(when)s"
-msgstr "vous a mentioné %(when)s"
-
-#: rhodecode/model/notification.py:223
-#, fuzzy, python-format
-msgid "registered in RhodeCode at %(when)s"
-msgstr "s’est enregistré sur RhodeCode %(when)s"
-
 #: rhodecode/model/notification.py:224
 #, fuzzy, python-format
-msgid "opened new pull request at %(when)s"
-msgstr "a ouvert une nouvelle requête de pull %(when)s"
+msgid "%(user)s commented on changeset at %(when)s"
+msgstr "%(user)s a posté un commentaire sur le commit %(when)s"
 
 #: rhodecode/model/notification.py:225
 #, fuzzy, python-format
-msgid "commented on pull request at %(when)s"
-msgstr "a commenté sur la requête de pull %(when)s"
-
-#: rhodecode/model/pull_request.py:100
-#, python-format
-msgid "%(user)s wants you to review pull request #%(pr_id)s"
-msgstr "%(user)s voudrait que vous examiniez sa requête de pull nº%(pr_id)s"
-
-#: rhodecode/model/scm.py:556
+msgid "%(user)s sent message at %(when)s"
+msgstr "%(user)s a envoyé un message  %(when)s"
+
+#: rhodecode/model/notification.py:226
+#, fuzzy, python-format
+msgid "%(user)s mentioned you at %(when)s"
+msgstr "%(user)s vous a mentioné %(when)s"
+
+#: rhodecode/model/notification.py:227
+#, fuzzy, python-format
+msgid "%(user)s registered in RhodeCode at %(when)s"
+msgstr "%(user)s s’est enregistré sur RhodeCode %(when)s"
+
+#: rhodecode/model/notification.py:228
+#, fuzzy, python-format
+msgid "%(user)s opened new pull request at %(when)s"
+msgstr "%(user)s a ouvert une nouvelle requête de pull %(when)s"
+
+#: rhodecode/model/notification.py:229
+#, fuzzy, python-format
+msgid "%(user)s commented on pull request at %(when)s"
+msgstr "%(user)s a commenté sur la requête de pull %(when)s"
+
+#: rhodecode/model/pull_request.py:104
+#, fuzzy, python-format
+msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
+msgstr ""
+"%(user)s voudrait que vous examiniez sa requête de pull nº%(pr_id)s: "
+"%(pr_title)s"
+
+#: rhodecode/model/scm.py:598
 msgid "latest tip"
 msgstr "Dernier sommet"
 
-#: rhodecode/model/user.py:231
-msgid "new user registration"
+#: rhodecode/model/user.py:232
+#, fuzzy
+msgid "New user registration"
 msgstr "Nouveau compte utilisateur enregistré"
 
-#: rhodecode/model/user.py:256 rhodecode/model/user.py:280
+#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon"
 " fonctionnement de l’application."
 
-#: rhodecode/model/user.py:302
+#: rhodecode/model/user.py:303
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 "Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le "
 "bon fonctionnement de l’application."
 
-#: rhodecode/model/user.py:308
+#: rhodecode/model/user.py:309
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch "
@@ -1218,21 +1347,36 b' msgstr ""'
 "L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez "
 "les propriétaires de ces dépôts. %s"
 
-#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38
+#: rhodecode/model/user.py:334
+#, fuzzy
+msgid "Password reset link"
+msgstr "Réinitialisation du mot de passe"
+
+#: rhodecode/model/user.py:366
+#, fuzzy
+msgid "Your new password"
+msgstr "Nouveau mot de passe"
+
+#: rhodecode/model/user.py:367
+#, python-format
+msgid "Your new RhodeCode password:%s"
+msgstr ""
+
+#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39
 msgid "Value cannot be an empty list"
 msgstr "Cette valeur ne peut être une liste vide."
 
-#: rhodecode/model/validators.py:84
+#: rhodecode/model/validators.py:85
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "Le nom d’utilisateur « %(username)s » existe déjà."
 
-#: rhodecode/model/validators.py:86
+#: rhodecode/model/validators.py:87
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr "Le nom d’utilisateur « %(username)s » n’est pas autorisé"
 
-#: rhodecode/model/validators.py:88
+#: rhodecode/model/validators.py:89
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
@@ -1241,124 +1385,132 b' msgstr ""'
 "numériques ainsi que les caractères suivants : « _ . - ». Il doit "
 "commencer par un caractère alpha-numérique."
 
-#: rhodecode/model/validators.py:116
+#: rhodecode/model/validators.py:117
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide."
 
-#: rhodecode/model/validators.py:135
-msgid "Invalid users group name"
+#: rhodecode/model/validators.py:136
+#, fuzzy
+msgid "Invalid user group name"
 msgstr "Nom de groupe d’utilisateurs invalide."
 
-#: rhodecode/model/validators.py:136
-#, python-format
-msgid "Users group \"%(usersgroup)s\" already exists"
-msgstr "Le groupe d’utilisateurs « %(usersgroup)s » existe déjà."
-
-#: rhodecode/model/validators.py:138
+#: rhodecode/model/validators.py:137
+#, fuzzy, python-format
+msgid "User group \"%(usergroup)s\" already exists"
+msgstr "Le groupe d’utilisateurs « %(usergroup)s » existe déjà."
+
+#: rhodecode/model/validators.py:139
+#, fuzzy
 msgid ""
-"users group name may only contain  alphanumeric characters underscores, "
+"user group name may only contain alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 "Le nom de groupe d’utilisateurs peut contenir uniquement des caractères "
 "alpha-numériques ainsi que les caractères suivants : « _ . - ». Il doit "
 "commencer par un caractère alpha-numérique."
 
-#: rhodecode/model/validators.py:176
+#: rhodecode/model/validators.py:177
 msgid "Cannot assign this group as parent"
 msgstr "Impossible d’assigner ce groupe en tant que parent."
 
-#: rhodecode/model/validators.py:177
+#: rhodecode/model/validators.py:178
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "Le groupe « %(group_name)s » existe déjà."
 
-#: rhodecode/model/validators.py:179
+#: rhodecode/model/validators.py:180
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "Un dépôt portant le nom « %(group_name)s » existe déjà."
 
-#: rhodecode/model/validators.py:237
+#: rhodecode/model/validators.py:238
 msgid "Invalid characters (non-ascii) in password"
 msgstr "Caractères incorrects (non-ASCII) dans le mot de passe."
 
-#: rhodecode/model/validators.py:252
+#: rhodecode/model/validators.py:253
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas."
 
-#: rhodecode/model/validators.py:269
+#: rhodecode/model/validators.py:270
 msgid "invalid password"
 msgstr "mot de passe invalide"
 
-#: rhodecode/model/validators.py:270
+#: rhodecode/model/validators.py:271
 msgid "invalid user name"
 msgstr "nom d’utilisateur invalide"
 
-#: rhodecode/model/validators.py:271
+#: rhodecode/model/validators.py:272
 msgid "Your account is disabled"
 msgstr "Votre compte est désactivé"
 
-#: rhodecode/model/validators.py:315
+#: rhodecode/model/validators.py:316
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "Le nom de dépôt « %(repo)s » n’est pas autorisé."
 
-#: rhodecode/model/validators.py:317
+#: rhodecode/model/validators.py:318
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "Un dépôt portant le nom « %(repo)s » existe déjà."
 
-#: rhodecode/model/validators.py:318
+#: rhodecode/model/validators.py:319
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "Le dépôt « %(repo)s » existe déjà dans le groupe « %(group)s »."
 
-#: rhodecode/model/validators.py:320
-#, python-format
-msgid "Repositories group with name \"%(repo)s\" already exists"
+#: rhodecode/model/validators.py:321
+#, fuzzy, python-format
+msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr "Un groupe de dépôts portant le nom « %(repo)s » existe déjà."
 
-#: rhodecode/model/validators.py:433
+#: rhodecode/model/validators.py:438
 msgid "invalid clone url"
 msgstr "URL de clonage invalide."
 
-#: rhodecode/model/validators.py:434
+#: rhodecode/model/validators.py:439
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 "URL à cloner invalide. Veuillez fournir une URL valide en http(s) ou "
 "svn+http(s)."
 
-#: rhodecode/model/validators.py:459
+#: rhodecode/model/validators.py:464
 msgid "Fork have to be the same type as parent"
 msgstr "Le fork doit être du même type que le parent."
 
-#: rhodecode/model/validators.py:474
+#: rhodecode/model/validators.py:479
 msgid "You don't have permissions to create repository in this group"
 msgstr "Vous n’avez pas la permission de créer un dépôt dans ce groupe."
 
-#: rhodecode/model/validators.py:501
+#: rhodecode/model/validators.py:481
+#, fuzzy
+msgid "no permission to create repository in root location"
+msgstr "Vous n’avez pas la permission de créer un dépôt dans ce groupe."
+
+#: rhodecode/model/validators.py:518
 #, fuzzy
 msgid "You don't have permissions to create a group in this location"
 msgstr "Vous n’avez pas la permission de créer un dépôt dans ce groupe."
 
-#: rhodecode/model/validators.py:540
-msgid "This username or users group name is not valid"
+#: rhodecode/model/validators.py:557
+#, fuzzy
+msgid "This username or user group name is not valid"
 msgstr "Ce nom d’utilisateur ou de groupe n’est pas valide."
 
-#: rhodecode/model/validators.py:636
+#: rhodecode/model/validators.py:650
 msgid "This is not a valid path"
 msgstr "Ceci n’est pas un chemin valide"
 
-#: rhodecode/model/validators.py:651
+#: rhodecode/model/validators.py:665
 msgid "This e-mail address is already taken"
 msgstr "Cette adresse e-mail est déjà enregistrée"
 
-#: rhodecode/model/validators.py:671
+#: rhodecode/model/validators.py:685
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "L’adresse e-mail « %(email)s » n’existe pas"
 
-#: rhodecode/model/validators.py:708
+#: rhodecode/model/validators.py:722
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
@@ -1366,23 +1518,27 b' msgstr ""'
 "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom"
 " d’utilisateur."
 
-#: rhodecode/model/validators.py:727
+#: rhodecode/model/validators.py:735
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 "Les révisions %(revs)s font déjà partie de la requête de pull ou on des "
 "statuts définis."
 
-#: rhodecode/model/validators.py:759
+#: rhodecode/model/validators.py:767
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
-#: rhodecode/model/validators.py:760
+#: rhodecode/model/validators.py:768
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 
-#: rhodecode/templates/index.html:3
+#: rhodecode/model/validators.py:800
+msgid "Key name can only consist of letters, underscore, dash or numbers"
+msgstr ""
+
+#: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
@@ -1391,223 +1547,229 b' msgstr "Tableau de bord"'
 #: rhodecode/templates/admin/repos/repos.html:9
 #: rhodecode/templates/admin/users/user_edit_my_account.html:31
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/bookmarks/bookmarks.html:10
+#: rhodecode/templates/bookmarks/bookmarks.html:9
 #: rhodecode/templates/branches/branches.html:9
 #: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:49
-#: rhodecode/templates/journal/journal.html:50
-#: rhodecode/templates/tags/tags.html:10
+#: rhodecode/templates/journal/journal.html:46
+#: rhodecode/templates/journal/journal.html:47
+#: rhodecode/templates/tags/tags.html:9
 msgid "quick filter..."
 msgstr "Filtre rapide…"
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:239
 msgid "repositories"
 msgstr "Dépôts"
 
-#: rhodecode/templates/index_base.html:14
-#: rhodecode/templates/index_base.html:17
+#: rhodecode/templates/index_base.html:13
+#: rhodecode/templates/index_base.html:18
 #: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
 #: rhodecode/templates/admin/repos/repos.html:21
 msgid "Add repository"
 msgstr "Ajouter un dépôt"
 
-#: rhodecode/templates/index_base.html:23
+#: rhodecode/templates/index_base.html:15
+#: rhodecode/templates/index_base.html:20
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31
+#, fuzzy
+msgid "Add group"
+msgstr "Édition du groupe de dépôt"
+
+#: rhodecode/templates/index_base.html:27
 #, fuzzy
 msgid "Edit group"
 msgstr "Édition du groupe de dépôt"
 
-#: rhodecode/templates/index_base.html:23
+#: rhodecode/templates/index_base.html:27
 msgid "You have admin right to this group, and can edit it"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:36
+#: rhodecode/templates/index_base.html:40
 #: rhodecode/templates/index_base.html:140
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
+#: 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
 msgid "Group name"
 msgstr "Nom de groupe"
 
-#: rhodecode/templates/index_base.html:37
-#: rhodecode/templates/index_base.html:79
+#: 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:273
+#: rhodecode/templates/index_base.html:270
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:73
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
-#: rhodecode/templates/forks/fork.html:59
-#: rhodecode/templates/settings/repo_settings.html:66
-#: rhodecode/templates/summary/summary.html:114
+#: 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/forks/fork.html:56
+#: rhodecode/templates/pullrequests/pullrequest.html:101
+#: rhodecode/templates/summary/summary.html:106
 msgid "Description"
 msgstr "Description"
 
-#: rhodecode/templates/index_base.html:47
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47
-msgid "Repositories group"
-msgstr "Groupe de dépôts"
-
-#: rhodecode/templates/index_base.html:78
+#: 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_groups/repos_groups_show.html:57
+#: rhodecode/templates/forks/fork.html:47
+msgid "Repository group"
+msgstr "Groupe de dépôt"
+
+#: rhodecode/templates/index_base.html:82
 #: rhodecode/templates/index_base.html:178
-#: rhodecode/templates/index_base.html:271
-#: rhodecode/templates/admin/permissions/permissions.html:117
+#: rhodecode/templates/index_base.html:268
 #: 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.html:200
-#: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:211
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:184
-#: rhodecode/templates/bookmarks/bookmarks.html:36
+#: 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/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:50
+#: 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:201
-#: rhodecode/templates/journal/journal.html:305
-#: rhodecode/templates/settings/repo_settings.html:31
-#: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:132
-#: rhodecode/templates/tags/tags.html:51
+#: rhodecode/templates/journal/journal.html:193
+#: rhodecode/templates/journal/journal.html:296
+#: 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 "Nom"
 
-#: rhodecode/templates/index_base.html:80
+#: rhodecode/templates/index_base.html:84
 msgid "Last change"
 msgstr "Dernière modification"
 
-#: rhodecode/templates/index_base.html:81
+#: rhodecode/templates/index_base.html:85
 #: rhodecode/templates/index_base.html:183
-#: rhodecode/templates/index_base.html:276
+#: rhodecode/templates/index_base.html:273
 #: rhodecode/templates/admin/repos/repos.html:74
-#: rhodecode/templates/admin/users/user_edit_my_account.html:213
-#: rhodecode/templates/journal/journal.html:203
-#: rhodecode/templates/journal/journal.html:307
+#: rhodecode/templates/admin/users/user_edit_my_account.html:174
+#: rhodecode/templates/journal/journal.html:195
+#: rhodecode/templates/journal/journal.html:298
 msgid "Tip"
 msgstr "Sommet"
 
-#: rhodecode/templates/index_base.html:82
+#: rhodecode/templates/index_base.html:86
 #: rhodecode/templates/index_base.html:185
-#: rhodecode/templates/index_base.html:278
+#: rhodecode/templates/index_base.html:275
 #: rhodecode/templates/admin/repos/repo_edit.html:121
 #: rhodecode/templates/admin/repos/repos.html:76
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: rhodecode/templates/index_base.html:83
-#: rhodecode/templates/summary/summary.html:48
-#: rhodecode/templates/summary/summary.html:51
-msgid "RSS"
-msgstr "RSS"
-
-#: rhodecode/templates/index_base.html:84
+#: rhodecode/templates/index_base.html:87
 msgid "Atom"
 msgstr "Atom"
 
 #: rhodecode/templates/index_base.html:171
-#: rhodecode/templates/index_base.html:211
-#: rhodecode/templates/index_base.html:300
+#: 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:235
+#: rhodecode/templates/admin/users/user_edit_my_account.html:196
 #: rhodecode/templates/admin/users/users.html:107
-#: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:225
-#: rhodecode/templates/journal/journal.html:329
-#: rhodecode/templates/tags/tags.html:77
+#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/branches/branches.html:73
+#: rhodecode/templates/journal/journal.html:217
+#: rhodecode/templates/journal/journal.html:320
+#: rhodecode/templates/tags/tags.html:74
 msgid "Click to sort ascending"
 msgstr "Tri ascendant"
 
 #: rhodecode/templates/index_base.html:172
-#: rhodecode/templates/index_base.html:212
-#: rhodecode/templates/index_base.html:301
+#: 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:236
+#: rhodecode/templates/admin/users/user_edit_my_account.html:197
 #: rhodecode/templates/admin/users/users.html:108
-#: rhodecode/templates/bookmarks/bookmarks.html:61
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:226
-#: rhodecode/templates/journal/journal.html:330
-#: rhodecode/templates/tags/tags.html:78
+#: rhodecode/templates/bookmarks/bookmarks.html:59
+#: rhodecode/templates/branches/branches.html:74
+#: rhodecode/templates/journal/journal.html:218
+#: rhodecode/templates/journal/journal.html:321
+#: rhodecode/templates/tags/tags.html:75
 msgid "Click to sort descending"
 msgstr "Tri descendant"
 
 #: rhodecode/templates/index_base.html:181
-#: rhodecode/templates/index_base.html:274
+#: rhodecode/templates/index_base.html:271
 msgid "Last Change"
 msgstr "Dernière modification"
 
-#: rhodecode/templates/index_base.html:213
-#: rhodecode/templates/index_base.html:302
+#: rhodecode/templates/index_base.html:211
 #: rhodecode/templates/admin/repos/repos.html:99
-#: rhodecode/templates/admin/users/user_edit_my_account.html:237
+#: rhodecode/templates/admin/users/user_edit_my_account.html:198
 #: rhodecode/templates/admin/users/users.html:109
-#: rhodecode/templates/bookmarks/bookmarks.html:62
-#: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:227
-#: rhodecode/templates/journal/journal.html:331
-#: rhodecode/templates/tags/tags.html:79
+#: 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 "Aucun élément n’a été trouvé."
 
-#: rhodecode/templates/index_base.html:214
-#: rhodecode/templates/index_base.html:303
+#: 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:238
+#: rhodecode/templates/admin/users/user_edit_my_account.html:199
 #: rhodecode/templates/admin/users/users.html:110
-#: rhodecode/templates/bookmarks/bookmarks.html:63
-#: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:228
-#: rhodecode/templates/journal/journal.html:332
-#: rhodecode/templates/tags/tags.html:80
+#: rhodecode/templates/bookmarks/bookmarks.html:61
+#: rhodecode/templates/branches/branches.html:76
+#: rhodecode/templates/journal/journal.html:220
+#: rhodecode/templates/journal/journal.html:323
+#: rhodecode/templates/tags/tags.html:77
 msgid "Data error."
 msgstr "Erreur d’intégrité des données."
 
-#: rhodecode/templates/index_base.html:215
-#: rhodecode/templates/index_base.html:304
+#: rhodecode/templates/index_base.html:213
+#: rhodecode/templates/index_base.html:300
 #: rhodecode/templates/admin/repos/repos.html:101
-#: rhodecode/templates/admin/users/user_edit_my_account.html:105
-#: rhodecode/templates/admin/users/user_edit_my_account.html:239
+#: rhodecode/templates/admin/users/user_edit_my_account.html:58
+#: rhodecode/templates/admin/users/user_edit_my_account.html:200
 #: rhodecode/templates/admin/users/users.html:111
-#: rhodecode/templates/bookmarks/bookmarks.html:64
-#: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:229
-#: rhodecode/templates/journal/journal.html:333
-#: rhodecode/templates/tags/tags.html:81
+#: rhodecode/templates/bookmarks/bookmarks.html:62
+#: rhodecode/templates/branches/branches.html:77
+#: rhodecode/templates/journal/journal.html:221
+#: rhodecode/templates/journal/journal.html:324
+#: rhodecode/templates/tags/tags.html:78
 msgid "Loading..."
 msgstr "Chargement…"
 
-#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
-msgid "Sign In"
+#: rhodecode/templates/index_base.html:298
+#, fuzzy
+msgid "No repositories found."
+msgstr "Groupes de dépôts"
+
+#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227
+msgid "Log In"
 msgstr "Connexion"
 
 #: rhodecode/templates/login.html:21
-msgid "Sign In to"
-msgstr "Connexion à"
+#, python-format
+msgid "Log In to %s"
+msgstr ""
 
 #: 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:54
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
-#: rhodecode/templates/base/base.html:89
-#: rhodecode/templates/summary/summary.html:131
+#: 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/summary/summary.html:123
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
 #: 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:98
+#: rhodecode/templates/base/base.html:212
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -1615,17 +1777,22 b' msgstr "Mot de passe"'
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
+#: rhodecode/templates/login.html:54
+msgid "Sign In"
+msgstr "Connexion"
+
 #: rhodecode/templates/login.html:60
 msgid "Forgot your password ?"
 msgstr "Mot de passe oublié ?"
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223
 msgid "Don't have an account ?"
 msgstr "Vous n’avez pas de compte ?"
 
 #: rhodecode/templates/password_reset.html:5
-msgid "Reset your password"
-msgstr "Mot de passe oublié ?"
+#, fuzzy
+msgid "Password Reset"
+msgstr "Réinitialisation du mot de passe"
 
 #: rhodecode/templates/password_reset.html:11
 msgid "Reset your password to"
@@ -1657,23 +1824,23 b' msgstr "Confirmation"'
 
 #: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57
+#: rhodecode/templates/admin/users/user_edit.html:97
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
 msgid "First Name"
 msgstr "Prénom"
 
 #: rhodecode/templates/register.html:56
 #: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:103
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66
+#: rhodecode/templates/admin/users/user_edit.html:106
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
 msgid "Last Name"
 msgstr "Nom"
 
 #: rhodecode/templates/register.html:65
 #: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:112
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75
-#: rhodecode/templates/summary/summary.html:133
+#: rhodecode/templates/admin/users/user_edit.html:115
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
+#: rhodecode/templates/summary/summary.html:125
 msgid "Email"
 msgstr "E-mail"
 
@@ -1685,44 +1852,31 b' msgstr "Votre compte utilisateur sera actif d\xc3\xa8s la fin de l\xe2\x80\x99enregistrement."'
 msgid "Your account must wait for activation by administrator"
 msgstr "Votre compte utilisateur devra être activé par un administrateur."
 
-#: rhodecode/templates/repo_switcher_list.html:11
+#: 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/settings/repo_settings.html:76
+#: rhodecode/templates/data_table/_dt_elements.html:61
+#: rhodecode/templates/summary/summary.html:77
 msgid "Private repository"
 msgstr "Dépôt privé"
 
-#: rhodecode/templates/repo_switcher_list.html:16
+#: rhodecode/templates/repo_switcher_list.html:12
+#: rhodecode/templates/data_table/_dt_elements.html:63
+#: rhodecode/templates/summary/summary.html:79
 msgid "Public repository"
 msgstr "Dépôt public"
 
-#: rhodecode/templates/switch_to_list.html:3
-#: rhodecode/templates/branches/branches.html:14
-msgid "branches"
-msgstr "Branches"
-
 #: rhodecode/templates/switch_to_list.html:10
 #: rhodecode/templates/branches/branches_data.html:57
 msgid "There are no branches yet"
 msgstr "Aucune branche n’a été créée pour le moment."
 
-#: rhodecode/templates/switch_to_list.html:15
-#: rhodecode/templates/shortlog/shortlog_data.html:10
-#: rhodecode/templates/tags/tags.html:15
-msgid "tags"
-msgstr "Tags"
-
 #: rhodecode/templates/switch_to_list.html:22
 #: rhodecode/templates/tags/tags_data.html:38
 msgid "There are no tags yet"
 msgstr "Aucun tag n’a été créé pour le moment."
 
-#: rhodecode/templates/switch_to_list.html:28
-#: rhodecode/templates/bookmarks/bookmarks.html:15
-msgid "bookmarks"
-msgstr "Signets"
-
 #: rhodecode/templates/switch_to_list.html:35
 #: rhodecode/templates/bookmarks/bookmarks_data.html:32
 msgid "There are no bookmarks yet"
@@ -1730,6 +1884,7 b' msgstr "Aucun signet n\xe2\x80\x99a \xc3\xa9t\xc3\xa9 cr\xc3\xa9\xc3\xa9."'
 
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:13
+#: rhodecode/templates/base/base.html:68
 msgid "Admin journal"
 msgstr "Historique d’administration"
 
@@ -1754,9 +1909,12 b' msgstr[1] ""'
 
 #: rhodecode/templates/admin/admin_log.html:6
 #: rhodecode/templates/admin/repos/repos.html:77
-#: rhodecode/templates/admin/users/user_edit_my_account.html:215
-#: rhodecode/templates/journal/journal.html:205
-#: rhodecode/templates/journal/journal.html:309
+#: 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/journal/journal.html:197
+#: rhodecode/templates/journal/journal.html:300
 msgid "Action"
 msgstr "Action"
 
@@ -1766,11 +1924,11 b' msgid "Repository"'
 msgstr "Dépôt"
 
 #: rhodecode/templates/admin/admin_log.html:8
-#: rhodecode/templates/bookmarks/bookmarks.html:37
+#: rhodecode/templates/bookmarks/bookmarks.html:35
 #: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:51
+#: rhodecode/templates/branches/branches.html:48
 #: rhodecode/templates/branches/branches_data.html:7
-#: rhodecode/templates/tags/tags.html:52
+#: rhodecode/templates/tags/tags.html:49
 #: rhodecode/templates/tags/tags_data.html:7
 msgid "Date"
 msgstr "Date"
@@ -1790,6 +1948,7 b' msgid "Repositories defaults"'
 msgstr "Groupes de dépôts"
 
 #: rhodecode/templates/admin/defaults/defaults.html:11
+#: rhodecode/templates/base/base.html:75
 #, fuzzy
 msgid "Defaults"
 msgstr "[Par défaut]"
@@ -1803,8 +1962,7 b' msgstr "Type"'
 #: 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/forks/fork.html:72
-#: rhodecode/templates/settings/repo_settings.html:80
+#: rhodecode/templates/forks/fork.html:69
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
@@ -1834,7 +1992,7 b' msgstr "Afficher le menu de t\xc3\xa9l\xc3\xa9chargements sur la page du d\xc3\xa9p\xc3\xb4t."'
 
 #: rhodecode/templates/admin/defaults/defaults.html:75
 #: rhodecode/templates/admin/repos/repo_edit.html:112
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
 msgid "Enable locking"
 msgstr "Activer le verrouillage"
 
@@ -1846,14 +2004,17 b' msgstr "Activer le verrouillage lors d\xe2\x80\x99un pull sur le d\xc3\xa9p\xc3\xb4t."'
 #: 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:141
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79
+#: 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/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_edit.html:137
-#: rhodecode/templates/admin/users/user_edit.html:182
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83
+#: 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/settings/repo_settings.html:94
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -1862,7 +2023,10 b' msgid "LDAP administration"'
 msgstr "Administration LDAP"
 
 #: rhodecode/templates/admin/ldap/ldap.html:11
-msgid "Ldap"
+#: rhodecode/templates/admin/users/users.html:86
+#: rhodecode/templates/base/base.html:74
+#, fuzzy
+msgid "LDAP"
 msgstr "LDAP"
 
 #: rhodecode/templates/admin/ldap/ldap.html:28
@@ -1943,8 +2107,7 b' msgid "Comments"'
 msgstr "Commentaires"
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:272
-#: rhodecode/templates/base/base.html:274
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
 msgid "Pull requests"
 msgstr "Requêtes de pull"
 
@@ -1962,6 +2125,7 b' msgid "Show notification"'
 msgstr "Notification"
 
 #: rhodecode/templates/admin/notifications/show_notification.html:9
+#: rhodecode/templates/base/base.html:241
 msgid "Notifications"
 msgstr "Notifications"
 
@@ -1970,11 +2134,12 b' msgid "Permissions administration"'
 msgstr "Gestion des permissions"
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:134
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63
-#: rhodecode/templates/admin/users/user_edit.html:147
+#: 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/users/user_edit.html:150
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
-#: rhodecode/templates/settings/repo_settings.html:86
+#: rhodecode/templates/base/base.html:73
 msgid "Permissions"
 msgstr "Permissions"
 
@@ -1987,8 +2152,9 b' msgid "Anonymous access"'
 msgstr "Accès anonyme"
 
 #: rhodecode/templates/admin/permissions/permissions.html:49
+#, fuzzy
 msgid ""
-"All default permissions on each repository will be reset to choosen "
+"All default permissions on each repository will be reset to chosen "
 "permission, note that all custom default permission on repositories will "
 "be lost"
 msgstr ""
@@ -1998,24 +2164,16 b' msgstr ""'
 
 #: rhodecode/templates/admin/permissions/permissions.html:50
 #: rhodecode/templates/admin/permissions/permissions.html:63
-msgid "overwrite existing settings"
+#, fuzzy
+msgid "Overwrite existing settings"
 msgstr "Écraser les permissions existantes"
 
-#: 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_groups/repos_groups.html:4
-#: rhodecode/templates/forks/fork.html:50
-#: rhodecode/templates/settings/repo_settings.html:48
-msgid "Repository group"
-msgstr "Groupe de dépôt"
-
 #: rhodecode/templates/admin/permissions/permissions.html:62
 #, fuzzy
 msgid ""
-"All default permissions on each repository group will be reset to choosen"
-" permission, note that all custom default permission on repositories "
-"group will be lost"
+"All default permissions on each repository group will be reset to chosen "
+"permission, note that all custom default permission on repository groups "
+"will be lost"
 msgstr ""
 "Les permissions par défaut de chaque dépôt vont être remplacées par la "
 "permission choisie. Toutes les permissions par défaut des dépôts seront "
@@ -2034,22 +2192,23 b' msgid "Repository forking"'
 msgstr "Fork de dépôt"
 
 #: rhodecode/templates/admin/permissions/permissions.html:93
-#: rhodecode/templates/admin/permissions/permissions.html:209
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80
-#: rhodecode/templates/admin/settings/settings.html:113
-#: rhodecode/templates/admin/settings/settings.html:179
-#: rhodecode/templates/admin/settings/settings.html:269
-#: rhodecode/templates/admin/users/user_edit.html:138
-#: rhodecode/templates/admin/users/user_edit.html:183
-#: rhodecode/templates/admin/users/user_edit.html:286
-#: rhodecode/templates/admin/users/user_edit.html:334
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84
+#: 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:82
-#: rhodecode/templates/files/files_edit.html:68
-#: rhodecode/templates/pullrequests/pullrequest.html:124
-#: rhodecode/templates/settings/repo_settings.html:95
+#: rhodecode/templates/files/files_add.html:80
+#: rhodecode/templates/files/files_edit.html:66
+#: rhodecode/templates/pullrequests/pullrequest.html:110
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -2058,106 +2217,73 b' msgstr "R\xc3\xa9initialiser"'
 msgid "Default User Permissions"
 msgstr "Permissions par défaut"
 
-#: rhodecode/templates/admin/permissions/permissions.html:111
-#: rhodecode/templates/admin/users/user_edit.html:194
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
-msgid "Nothing here yet"
-msgstr "Rien ici pour le moment"
-
-#: rhodecode/templates/admin/permissions/permissions.html:118
-#: rhodecode/templates/admin/users/user_edit.html:201
-#: rhodecode/templates/admin/users/user_edit_my_account.html:61
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
-msgid "Permission"
-msgstr "Permission"
-
-#: rhodecode/templates/admin/permissions/permissions.html:119
-#: rhodecode/templates/admin/users/user_edit.html:202
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
-msgid "Edit Permission"
-msgstr "Éditer"
-
-#: rhodecode/templates/admin/permissions/permissions.html:149
-#: rhodecode/templates/admin/permissions/permissions.html:151
-#: rhodecode/templates/admin/repos/repo_edit.html:13
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:232
-#: rhodecode/templates/admin/users/user_edit.html:234
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
-#: rhodecode/templates/data_table/_dt_elements.html:116
-#: rhodecode/templates/data_table/_dt_elements.html:117
-msgid "edit"
-msgstr "éditer"
-
-#: rhodecode/templates/admin/permissions/permissions.html:168
-#: rhodecode/templates/admin/users/user_edit.html:295
+#: rhodecode/templates/admin/permissions/permissions.html:113
+#: rhodecode/templates/admin/users/user_edit.html:244
 #, fuzzy
 msgid "Allowed IP addresses"
 msgstr "Adresses e-mail"
 
-#: rhodecode/templates/admin/permissions/permissions.html:182
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
-#: rhodecode/templates/admin/users/user_edit.html:263
-#: rhodecode/templates/admin/users/user_edit.html:308
-#: rhodecode/templates/admin/users_groups/users_groups.html:44
+#: rhodecode/templates/admin/permissions/permissions.html:127
+#: rhodecode/templates/admin/repos/repo_edit.html:347
+#: 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/data_table/_dt_elements.html:122
 #: rhodecode/templates/data_table/_dt_elements.html:130
 msgid "delete"
 msgstr "Supprimer"
 
-#: rhodecode/templates/admin/permissions/permissions.html:183
-#: rhodecode/templates/admin/users/user_edit.html:309
+#: rhodecode/templates/admin/permissions/permissions.html:128
+#: rhodecode/templates/admin/users/user_edit.html:258
 #, fuzzy, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr "Veuillez confirmer la suppression de l’e-mail : %s"
 
-#: rhodecode/templates/admin/permissions/permissions.html:189
-#: rhodecode/templates/admin/users/user_edit.html:315
+#: rhodecode/templates/admin/permissions/permissions.html:134
+#: rhodecode/templates/admin/users/user_edit.html:264
 msgid "All IP addresses are allowed"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:200
-#: rhodecode/templates/admin/users/user_edit.html:326
+#: rhodecode/templates/admin/permissions/permissions.html:145
+#: rhodecode/templates/admin/users/user_edit.html:275
 #, fuzzy
 msgid "New ip address"
 msgstr "Nouvelle adrese"
 
-#: rhodecode/templates/admin/permissions/permissions.html:208
-#: rhodecode/templates/admin/users/user_edit.html:285
-#: rhodecode/templates/admin/users/user_edit.html:333
+#: rhodecode/templates/admin/permissions/permissions.html:153
+#: 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
 msgid "Add"
 msgstr "Ajouter"
 
-#: rhodecode/templates/admin/repos/repo_add.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
-#: rhodecode/templates/base/base.html:154
+#: 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
 msgid "Repositories"
 msgstr "Dépôts"
 
-#: rhodecode/templates/admin/repos/repo_add.html:13
-msgid "add new"
+#: rhodecode/templates/admin/repos/repo_add.html:19
+#, fuzzy
+msgid "Add new"
 msgstr "ajouter un nouveau"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:104
-#: rhodecode/templates/summary/summary.html:105
+#: rhodecode/templates/summary/summary.html:96
+#: rhodecode/templates/summary/summary.html:97
 msgid "Clone from"
 msgstr "Cloner depuis"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:24
 #: rhodecode/templates/admin/repos/repo_edit.html:44
-#: rhodecode/templates/settings/repo_settings.html:43
 msgid "Optional http[s] url from which repository should be cloned."
 msgstr "URL http(s) depuis laquelle le dépôt doit être cloné."
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:33
-#: rhodecode/templates/forks/fork.html:54
+#: rhodecode/templates/forks/fork.html:51
 msgid "Optionaly select a group to put this repository into."
 msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt."
 
@@ -2167,15 +2293,13 b' msgstr "Type de d\xc3\xa9p\xc3\xb4t \xc3\xa0 cr\xc3\xa9er."'
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:47
 #: rhodecode/templates/admin/repos/repo_edit.html:66
-#: rhodecode/templates/forks/fork.html:41
-#: rhodecode/templates/settings/repo_settings.html:57
+#: rhodecode/templates/forks/fork.html:38
 msgid "Landing revision"
 msgstr "Révision d’arrivée"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:51
 #: rhodecode/templates/admin/repos/repo_edit.html:70
-#: rhodecode/templates/forks/fork.html:45
-#: rhodecode/templates/settings/repo_settings.html:61
+#: rhodecode/templates/forks/fork.html:42
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 "Révision par défaut pour les pages de fichiers, de téléchargements, de "
@@ -2183,32 +2307,29 b' msgstr ""'
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:60
 #: rhodecode/templates/admin/repos/repo_edit.html:79
-#: rhodecode/templates/forks/fork.html:63
-#: rhodecode/templates/settings/repo_settings.html:70
+#: rhodecode/templates/forks/fork.html:60
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 "Gardez cette description précise et concise. Utilisez un fichier README "
 "pour des descriptions plus détaillées."
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:73
-msgid "add"
-msgstr "Ajouter"
-
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9
-msgid "add new repository"
-msgstr "ajouter un nouveau dépôt"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:5
+#: rhodecode/templates/admin/repos/repo_edit.html:8
 msgid "Edit repository"
 msgstr "Éditer le dépôt"
 
+#: 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/summary/summary.html:212
+msgid "Settings"
+msgstr "Options"
+
 #: rhodecode/templates/admin/repos/repo_edit.html:40
-#: rhodecode/templates/settings/repo_settings.html:39
 msgid "Clone uri"
 msgstr "URL de clone"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:53
-#: rhodecode/templates/settings/repo_settings.html:52
 msgid "Optional select a group to put this repository into."
 msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt."
 
@@ -2216,55 +2337,56 b' msgstr "S\xc3\xa9lectionnez un groupe (optionel) dans lequel sera plac\xc3\xa9 le d\xc3\xa9p\xc3\xb4t."'
 msgid "Change owner of this repository."
 msgstr "Changer le propriétaire de ce dépôt."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:152
-msgid "Administration"
-msgstr "Administration"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:155
+#: rhodecode/templates/admin/repos/repo_edit.html:184
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Enregister les options"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:187
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:159
+#: rhodecode/templates/admin/repos/repo_edit.html:191
 msgid "Reset current statistics"
 msgstr "Réinitialiser les statistiques"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:159
+#: rhodecode/templates/admin/repos/repo_edit.html:191
 msgid "Confirm to remove current statistics"
 msgstr "Souhaitez-vous vraiment réinitialiser les statistiques de ce dépôt ?"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:162
+#: rhodecode/templates/admin/repos/repo_edit.html:194
 msgid "Fetched to rev"
 msgstr "Parcouru jusqu’à la révision"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:163
+#: rhodecode/templates/admin/repos/repo_edit.html:195
 msgid "Stats gathered"
 msgstr "Statistiques obtenues"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:171
+#: rhodecode/templates/admin/repos/repo_edit.html:203
 msgid "Remote"
 msgstr "Dépôt distant"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:175
+#: rhodecode/templates/admin/repos/repo_edit.html:207
 msgid "Pull changes from remote location"
 msgstr "Récupérer les changements depuis le site distant"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:175
+#: rhodecode/templates/admin/repos/repo_edit.html:207
 msgid "Confirm to pull changes from remote side"
 msgstr "Voulez-vous vraiment récupérer les changements depuis le site distant ?"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:186
+#: rhodecode/templates/admin/repos/repo_edit.html:218
 msgid "Cache"
 msgstr "Cache"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:190
+#: rhodecode/templates/admin/repos/repo_edit.html:222
 msgid "Invalidate repository cache"
 msgstr "Invalider le cache du dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:190
+#: rhodecode/templates/admin/repos/repo_edit.html:222
 msgid "Confirm to invalidate repository cache"
 msgstr "Voulez-vous vraiment invalider le cache du dépôt ?"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:193
+#: rhodecode/templates/admin/repos/repo_edit.html:225
 msgid ""
 "Manually invalidate cache for this repository. On first access repository"
 " will be cached again"
@@ -2272,43 +2394,44 b' msgstr ""'
 "Invalide manuellement le cache de ce dépôt. Au prochain accès sur ce "
 "dépôt, il sera à nouveau mis en cache."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:198
+#: rhodecode/templates/admin/repos/repo_edit.html:230
 msgid "List of cached values"
 msgstr "Liste des valeurs en cache"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:201
+#: rhodecode/templates/admin/repos/repo_edit.html:233
 msgid "Prefix"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:202
+#: rhodecode/templates/admin/repos/repo_edit.html:234
 #, fuzzy
 msgid "Key"
 msgstr "Clé d’API"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:203
+#: rhodecode/templates/admin/repos/repo_edit.html:235
 #: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:121
+#: 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
 msgid "Active"
 msgstr "Actif"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:218
-#: rhodecode/templates/base/base.html:306
-#: rhodecode/templates/base/base.html:308
-#: rhodecode/templates/base/base.html:310
+#: rhodecode/templates/admin/repos/repo_edit.html:250
+#: rhodecode/templates/base/base.html:280
+#: rhodecode/templates/base/base.html:281
 msgid "Public journal"
 msgstr "Journal public"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:224
+#: rhodecode/templates/admin/repos/repo_edit.html:256
 msgid "Remove from public journal"
 msgstr "Supprimer du journal public"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:226
+#: rhodecode/templates/admin/repos/repo_edit.html:258
 msgid "Add to public journal"
 msgstr "Ajouter le dépôt au journal public"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:231
+#: rhodecode/templates/admin/repos/repo_edit.html:263
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
@@ -2316,69 +2439,83 b' msgstr ""'
 "Le descriptif des actions réalisées sur ce dépôt sera visible à tous "
 "depuis le journal public."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:238
+#: rhodecode/templates/admin/repos/repo_edit.html:270
 msgid "Locking"
 msgstr "Verrouillage"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:243
+#: rhodecode/templates/admin/repos/repo_edit.html:275
 msgid "Unlock locked repo"
 msgstr "Déverrouiller le dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:243
+#: rhodecode/templates/admin/repos/repo_edit.html:275
 msgid "Confirm to unlock repository"
 msgstr "Veuillez confirmer le déverrouillage de ce dépôt."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:246
+#: rhodecode/templates/admin/repos/repo_edit.html:278
 msgid "lock repo"
 msgstr "Verrouiller le dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:246
+#: rhodecode/templates/admin/repos/repo_edit.html:278
 msgid "Confirm to lock repository"
 msgstr "Veuillez confirmer le verrouillage de ce dépôt."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:247
+#: rhodecode/templates/admin/repos/repo_edit.html:279
 msgid "Repository is not locked"
 msgstr "Ce dépôt n’est pas verrouillé."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:252
+#: rhodecode/templates/admin/repos/repo_edit.html:284
 msgid "Force locking on repository. Works only when anonymous access is disabled"
 msgstr ""
 "Forcer le verrouillage du dépôt. Ce réglage fonctionne uniquement quand "
 "l‘accès anonyme est désactivé."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:259
+#: rhodecode/templates/admin/repos/repo_edit.html:291
 msgid "Set as fork of"
 msgstr "Indiquer comme fork"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:264
+#: rhodecode/templates/admin/repos/repo_edit.html:296
 msgid "set"
 msgstr "Définir"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:268
+#: rhodecode/templates/admin/repos/repo_edit.html:300
 msgid "Manually set this repository as a fork of another from the list"
 msgstr "Marquer ce dépôt comme fork d’un autre dépôt de la liste."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:274
+#: rhodecode/templates/admin/repos/repo_edit.html:306
 #: rhodecode/templates/changeset/changeset_file_comment.html:41
 msgid "Delete"
 msgstr "Supprimer"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:278
-#: rhodecode/templates/settings/repo_settings.html:115
+#: rhodecode/templates/admin/repos/repo_edit.html:315
 msgid "Remove this repository"
 msgstr "Supprimer ce dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:278
-#: rhodecode/templates/settings/repo_settings.html:115
+#: rhodecode/templates/admin/repos/repo_edit.html:315
 msgid "Confirm to delete this repository"
 msgstr "Voulez-vous vraiment supprimer ce dépôt ?"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:282
-#: rhodecode/templates/settings/repo_settings.html:119
+#: rhodecode/templates/admin/repos/repo_edit.html:317
+#, fuzzy, python-format
+msgid "this repository has %s fork"
+msgid_plural "this repository has %s forks"
+msgstr[0] "[a créé] le dépôt en tant que %s fork"
+msgstr[1] "[a créé] le dépôt en tant que %s fork"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:318
+#, fuzzy
+msgid "Detach forks"
+msgstr "Indiquer comme fork"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:319
+#, fuzzy
+msgid "Delete forks"
+msgstr "Supprimer"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:322
 #, fuzzy
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for RhodeCode and VCS systems. If you need fully delete it "
+"unaccesible for RhodeCode and VCS systems. If you need to fully delete it"
 "from file system please do it manually"
 msgstr ""
 "Ce dépôt sera renommé de manière à le rendre inaccessible à RhodeCode et "
@@ -2389,6 +2526,37 b' msgstr ""'
 "Si vous voulez le supprimer complètement, effectuez la suppression "
 "manuellement."
 
+#: rhodecode/templates/admin/repos/repo_edit.html:336
+msgid "Extra fields"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:348
+#, fuzzy, python-format
+msgid "Confirm to delete this field: %s"
+msgstr "Veuillez confirmer la suppression de l’e-mail : %s"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:362
+#, fuzzy
+msgid "New field key"
+msgstr "Ajouter un fichier"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:370
+msgid "New field label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:373
+msgid "Enter short label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:379
+#, fuzzy
+msgid "New field description"
+msgstr "Description"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:382
+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
 msgid "none"
@@ -2406,8 +2574,6 b' msgstr "\xc3\x89criture"'
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
-#: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/base/base.html:235
 msgid "admin"
 msgstr "Administration"
 
@@ -2417,48 +2583,48 b' msgid "member"'
 msgstr "Membre"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-#: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/summary/summary.html:85
 msgid "private repository"
 msgstr "Dépôt privé"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:19
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35
 msgid "default"
 msgstr "[Par défaut]"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:33
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55
 msgid "revoke"
 msgstr "Révoquer"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:83
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80
 msgid "Add another member"
 msgstr "Ajouter un utilisateur"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:97
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100
 msgid "Failed to remove user"
 msgstr "Échec de suppression de l’utilisateur"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:112
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103
-msgid "Failed to remove users group"
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116
+#, fuzzy
+msgid "Failed to remove user group"
 msgstr "Erreur lors de la suppression du groupe d’utilisateurs."
 
 #: rhodecode/templates/admin/repos/repos.html:5
 msgid "Repositories administration"
 msgstr "Administration des dépôts"
 
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86
 msgid "apply to children"
 msgstr "Appliquer aux enfants"
 
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
 #, fuzzy
 msgid ""
 "Set or revoke permission to all children of that group, including non-"
@@ -2467,27 +2633,12 b' msgstr ""'
 "Applique ou révoque les permissions sur tous les éléments de ce groupe, "
 "notamment les dépôts et sous-groupes."
 
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
+#, python-format
+msgid "%s Group Dashboard"
+msgstr ""
+
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:9
-#: rhodecode/templates/base/base.html:128
-#: rhodecode/templates/bookmarks/bookmarks.html:11
-#: rhodecode/templates/branches/branches.html:10
-#: rhodecode/templates/changelog/changelog.html:10
-#: rhodecode/templates/changeset/changeset.html:10
-#: rhodecode/templates/changeset/changeset_range.html:9
-#: rhodecode/templates/compare/compare_diff.html:9
-#: rhodecode/templates/files/file_diff.html:8
-#: rhodecode/templates/files/files.html:8
-#: rhodecode/templates/files/files_add.html:15
-#: rhodecode/templates/files/files_edit.html:15
-#: rhodecode/templates/followers/followers.html:9
-#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9
-#: rhodecode/templates/pullrequests/pullrequest.html:8
-#: rhodecode/templates/pullrequests/pullrequest_show.html:8
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
-#: rhodecode/templates/settings/repo_settings.html:9
-#: rhodecode/templates/shortlog/shortlog.html:10
-#: rhodecode/templates/summary/summary.html:8
-#: rhodecode/templates/tags/tags.html:11
 msgid "Home"
 msgstr "Accueil"
 
@@ -2496,45 +2647,48 b' msgid "with"'
 msgstr "comprenant"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
-msgid "Add repos group"
-msgstr "Créer un groupe de dépôt"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10
-msgid "Repos groups"
-msgstr "Groupes de dépôts"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12
-msgid "add new repos group"
+#, fuzzy
+msgid "Add repository group"
+msgstr "Groupe de dépôt"
+
+#: 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
+#, fuzzy
+msgid "Repository groups"
+msgstr "Groupe de dépôt"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13
+#, fuzzy
+msgid "Add new repository group"
 msgstr "Nouveau groupe de dépôt"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56
 msgid "Group parent"
 msgstr "Parent du groupe"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58
-#: rhodecode/templates/admin/users/user_add.html:94
-#: rhodecode/templates/admin/users_groups/users_group_add.html:49
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/pullrequests/pullrequest_show.html:149
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59
 msgid "save"
 msgstr "Enregistrer"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
-msgid "Edit repos group"
-msgstr "Éditer le groupe de dépôt"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12
-msgid "edit repos group"
+#, fuzzy
+msgid "Edit repository group"
 msgstr "Édition du groupe de dépôt"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13
+#, fuzzy, python-format
+msgid "Edit repository group %s"
+msgstr "Édition du groupe de dépôt %s"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27
 #, fuzzy
-msgid "Add new child group"
+msgid "Add child group"
 msgstr "Ajouter un nouveau groupe"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76
 msgid ""
 "Enable lock-by-pulling on group. This option will be applied to all other"
 " groups and repositories inside"
@@ -2543,33 +2697,38 b' msgstr ""'
 "appliquée à tous les sous-groupes et dépôts de ce groupe."
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
-msgid "Repositories groups administration"
+#, fuzzy
+msgid "Repository groups administration"
 msgstr "Administration des groupes de dépôts"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
-#, fuzzy
-msgid "Add new group"
-msgstr "Ajouter un nouveau groupe"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45
 msgid "Number of toplevel repositories"
 msgstr "Nombre de sous-dépôts"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
-#: rhodecode/templates/admin/users/users.html:87
-#: rhodecode/templates/admin/users_groups/users_groups.html:35
-msgid "action"
-msgstr "Action"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64
+#, fuzzy
+msgid "Edit"
+msgstr "éditer"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65
+#: rhodecode/templates/base/perms_summary.html:29
+#: rhodecode/templates/base/perms_summary.html:48
+#: rhodecode/templates/base/perms_summary.html:50
+#: rhodecode/templates/data_table/_dt_elements.html:116
+#: rhodecode/templates/data_table/_dt_elements.html:117
+msgid "edit"
+msgstr "éditer"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
 #, fuzzy, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68
-msgid "There are no repositories groups yet"
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78
+#, fuzzy
+msgid "There are no repository groups yet"
 msgstr "Aucun groupe de dépôts n’a été créé pour le moment."
 
 #: rhodecode/templates/admin/settings/hooks.html:5
@@ -2577,12 +2736,6 b' msgstr "Aucun groupe de d\xc3\xa9p\xc3\xb4ts n\xe2\x80\x99a \xc3\xa9t\xc3\xa9 cr\xc3\xa9\xc3\xa9 pour le moment."'
 msgid "Settings administration"
 msgstr "Administration générale"
 
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:9
-#: rhodecode/templates/settings/repo_settings.html:13
-msgid "Settings"
-msgstr "Options"
-
 #: rhodecode/templates/admin/settings/hooks.html:24
 msgid "Built in hooks - read only"
 msgstr "Hooks prédéfinis (lecture seule)"
@@ -2599,15 +2752,16 b' msgstr "Enlever"'
 msgid "Failed to remove hook"
 msgstr "Erreur lors de la suppression du hook."
 
-#: rhodecode/templates/admin/settings/settings.html:24
+#: rhodecode/templates/admin/settings/settings.html:26
 msgid "Remap and rescan repositories"
 msgstr "Ré-associer et re-scanner les dépôts"
 
-#: rhodecode/templates/admin/settings/settings.html:32
-msgid "rescan option"
+#: rhodecode/templates/admin/settings/settings.html:34
+#, fuzzy
+msgid "Rescan option"
 msgstr "Option de re-scan"
 
-#: rhodecode/templates/admin/settings/settings.html:38
+#: rhodecode/templates/admin/settings/settings.html:40
 msgid ""
 "In case a repository was deleted from filesystem and there are leftovers "
 "in the database check this option to scan obsolete data in database and "
@@ -2616,11 +2770,12 b' msgstr ""'
 "Cochez cette option pour supprimer d’éventuelles données obsolètes "
 "(concernant des dépôts manuellement supprimés) de la base de données."
 
-#: rhodecode/templates/admin/settings/settings.html:39
-msgid "destroy old data"
+#: rhodecode/templates/admin/settings/settings.html:41
+#, fuzzy
+msgid "Destroy old data"
 msgstr "Supprimer les données obsolètes"
 
-#: rhodecode/templates/admin/settings/settings.html:41
+#: rhodecode/templates/admin/settings/settings.html:43
 msgid ""
 "Rescan repositories location for new repositories. Also deletes obsolete "
 "if `destroy` flag is checked "
@@ -2629,94 +2784,102 b' msgstr ""'
 "Supprime égalements les entrées de dépôts obsolètes si « Supprimer les "
 "données obsolètes » est coché."
 
-#: rhodecode/templates/admin/settings/settings.html:46
+#: rhodecode/templates/admin/settings/settings.html:48
 msgid "Rescan repositories"
 msgstr "Re-scanner les dépôts"
 
-#: rhodecode/templates/admin/settings/settings.html:52
+#: rhodecode/templates/admin/settings/settings.html:54
 msgid "Whoosh indexing"
 msgstr "Indexation Whoosh"
 
-#: rhodecode/templates/admin/settings/settings.html:60
-msgid "index build option"
+#: rhodecode/templates/admin/settings/settings.html:62
+#, fuzzy
+msgid "Index build option"
 msgstr "Option d’indexation"
 
-#: rhodecode/templates/admin/settings/settings.html:65
-msgid "build from scratch"
+#: rhodecode/templates/admin/settings/settings.html:67
+#, fuzzy
+msgid "Build from scratch"
 msgstr "Purger et reconstruire l’index"
 
-#: rhodecode/templates/admin/settings/settings.html:71
+#: rhodecode/templates/admin/settings/settings.html:73
 msgid "Reindex"
 msgstr "Mettre à jour l’index"
 
-#: rhodecode/templates/admin/settings/settings.html:77
+#: rhodecode/templates/admin/settings/settings.html:79
 msgid "Global application settings"
 msgstr "Réglages d’application globaux"
 
-#: rhodecode/templates/admin/settings/settings.html:86
-msgid "Application name"
-msgstr "Nom de l’application"
-
-#: rhodecode/templates/admin/settings/settings.html:95
-msgid "Realm text"
-msgstr "Texte du royaume"
-
-#: rhodecode/templates/admin/settings/settings.html:104
-msgid "GA code"
-msgstr "Code GA"
-
-#: rhodecode/templates/admin/settings/settings.html:112
-#: rhodecode/templates/admin/settings/settings.html:178
-#: rhodecode/templates/admin/settings/settings.html:268
+#: rhodecode/templates/admin/settings/settings.html:88
+msgid "Site branding"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:97
+msgid "HTTP authentication realm"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:106
+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
 msgid "Save settings"
 msgstr "Enregister les options"
 
-#: rhodecode/templates/admin/settings/settings.html:119
+#: rhodecode/templates/admin/settings/settings.html:121
 msgid "Visualisation settings"
 msgstr "Réglages d’affichage"
 
-#: rhodecode/templates/admin/settings/settings.html:127
+#: rhodecode/templates/admin/settings/settings.html:129
 #, fuzzy
 msgid "General"
 msgstr "Activer"
 
-#: rhodecode/templates/admin/settings/settings.html:132
+#: rhodecode/templates/admin/settings/settings.html:134
 msgid "Use lightweight dashboard"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:139
+#: rhodecode/templates/admin/settings/settings.html:140
+#, fuzzy
+msgid "Use repository extra fields"
+msgstr "Dépôts"
+
+#: rhodecode/templates/admin/settings/settings.html:147
 msgid "Icons"
 msgstr "Icônes"
 
-#: rhodecode/templates/admin/settings/settings.html:144
+#: rhodecode/templates/admin/settings/settings.html:152
 msgid "Show public repo icon on repositories"
 msgstr "Afficher l’icône de dépôt public sur les dépôts"
 
-#: rhodecode/templates/admin/settings/settings.html:148
+#: rhodecode/templates/admin/settings/settings.html:156
 msgid "Show private repo icon on repositories"
 msgstr "Afficher l’icône de dépôt privé sur les dépôts"
 
-#: rhodecode/templates/admin/settings/settings.html:155
+#: rhodecode/templates/admin/settings/settings.html:163
 msgid "Meta-Tagging"
 msgstr "Meta-Tagging"
 
-#: rhodecode/templates/admin/settings/settings.html:160
+#: rhodecode/templates/admin/settings/settings.html:168
 msgid "Stylify recognised metatags:"
 msgstr "Styliser les méta-tags reconnus :"
 
-#: rhodecode/templates/admin/settings/settings.html:187
+#: rhodecode/templates/admin/settings/settings.html:195
 msgid "VCS settings"
 msgstr "Réglages de gestionnaire de version"
 
-#: rhodecode/templates/admin/settings/settings.html:196
+#: rhodecode/templates/admin/settings/settings.html:204
 msgid "Web"
 msgstr "Web"
 
-#: rhodecode/templates/admin/settings/settings.html:201
-msgid "require ssl for vcs operations"
+#: rhodecode/templates/admin/settings/settings.html:209
+#, fuzzy
+msgid "Require SSL for vcs operations"
 msgstr "SSL requis pour les opérations de push/pull"
 
-#: rhodecode/templates/admin/settings/settings.html:203
+#: rhodecode/templates/admin/settings/settings.html:211
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
 "will return HTTP Error 406: Not Acceptable"
@@ -2724,55 +2887,59 b' msgstr ""'
 "RhodeCode requièrera SSL pour les pushs et pulls. Si le SSL n’est pas "
 "utilisé l’erreur HTTP 406 (Non Acceptable) sera renvoyée."
 
-#: rhodecode/templates/admin/settings/settings.html:209
+#: rhodecode/templates/admin/settings/settings.html:217
 msgid "Hooks"
 msgstr "Hooks"
 
-#: rhodecode/templates/admin/settings/settings.html:214
+#: rhodecode/templates/admin/settings/settings.html:222
 msgid "Update repository after push (hg update)"
 msgstr "Mettre à jour les dépôts après un push (hg update)"
 
-#: rhodecode/templates/admin/settings/settings.html:218
+#: rhodecode/templates/admin/settings/settings.html:226
 msgid "Show repository size after push"
 msgstr "Afficher la taille du dépôt après un push"
 
-#: rhodecode/templates/admin/settings/settings.html:222
+#: rhodecode/templates/admin/settings/settings.html:230
 msgid "Log user push commands"
 msgstr "Journaliser les commandes de push"
 
-#: rhodecode/templates/admin/settings/settings.html:226
+#: rhodecode/templates/admin/settings/settings.html:234
 msgid "Log user pull commands"
 msgstr "Journaliser les commandes de pull"
 
-#: rhodecode/templates/admin/settings/settings.html:230
-msgid "advanced setup"
+#: rhodecode/templates/admin/settings/settings.html:238
+#, fuzzy
+msgid "Advanced setup"
 msgstr "Avancé"
 
-#: rhodecode/templates/admin/settings/settings.html:235
+#: rhodecode/templates/admin/settings/settings.html:243
 msgid "Mercurial Extensions"
 msgstr "Extensions Mercurial"
 
-#: rhodecode/templates/admin/settings/settings.html:240
-msgid "largefiles extensions"
+#: rhodecode/templates/admin/settings/settings.html:248
+#, fuzzy
+msgid "Enable largefiles extension"
 msgstr "Extensions largefiles"
 
-#: rhodecode/templates/admin/settings/settings.html:244
-msgid "hgsubversion extensions"
+#: rhodecode/templates/admin/settings/settings.html:252
+#, fuzzy
+msgid "Enable hgsubversion extension"
 msgstr "Extensions hgsubversion"
 
-#: rhodecode/templates/admin/settings/settings.html:246
+#: rhodecode/templates/admin/settings/settings.html:254
+#, fuzzy
 msgid ""
-"Requires hgsubversion library installed. Allows clonning from svn remote "
+"Requires hgsubversion library installed. Allows cloning from svn remote "
 "locations"
 msgstr ""
 "Ceci nécessite l’installation de la bibliothèque hgsubversion. Permet de "
 "clôner à partir de dépôts Suversion."
 
-#: rhodecode/templates/admin/settings/settings.html:256
+#: rhodecode/templates/admin/settings/settings.html:264
 msgid "Repositories location"
 msgstr "Emplacement des dépôts"
 
-#: rhodecode/templates/admin/settings/settings.html:261
+#: rhodecode/templates/admin/settings/settings.html:269
 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 "
@@ -2782,12 +2949,13 b' msgstr ""'
 "vraiment le faire, redémarrer l’application une fois le changement "
 "effectué. Cliquez sur ce texte pour déverrouiller."
 
-#: rhodecode/templates/admin/settings/settings.html:262
-#: rhodecode/templates/base/base.html:227
-msgid "unlock"
+#: rhodecode/templates/admin/settings/settings.html:270
+#: rhodecode/templates/base/base.html:131
+#, fuzzy
+msgid "Unlock"
 msgstr "Déverrouiller"
 
-#: rhodecode/templates/admin/settings/settings.html:263
+#: rhodecode/templates/admin/settings/settings.html:272
 msgid ""
 "Location where repositories are stored. After changing this value a "
 "restart, and rescan is required"
@@ -2795,25 +2963,26 b' msgstr ""'
 "Emplacement de stockage des dépôts. Si cette valeur est changée, "
 "Rhodecode devra être redémarré les les dépôts rescannés."
 
-#: rhodecode/templates/admin/settings/settings.html:283
+#: rhodecode/templates/admin/settings/settings.html:292
 msgid "Test Email"
 msgstr "E-mail de test"
 
-#: rhodecode/templates/admin/settings/settings.html:291
+#: rhodecode/templates/admin/settings/settings.html:300
 msgid "Email to"
 msgstr "Envoyer l’e-mail à"
 
-#: rhodecode/templates/admin/settings/settings.html:299
+#: rhodecode/templates/admin/settings/settings.html:308
 msgid "Send"
 msgstr "Envoyer"
 
-#: rhodecode/templates/admin/settings/settings.html:305
+#: rhodecode/templates/admin/settings/settings.html:314
 msgid "System Info and Packages"
 msgstr "Information système et paquets"
 
-#: rhodecode/templates/admin/settings/settings.html:308
-msgid "show"
-msgstr "Montrer"
+#: rhodecode/templates/admin/settings/settings.html:317
+#: rhodecode/templates/changelog/changelog.html:42
+msgid "Show"
+msgstr "Afficher"
 
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
@@ -2821,11 +2990,14 b' msgstr "Ajouter un utilisateur"'
 
 #: rhodecode/templates/admin/users/user_add.html:10
 #: rhodecode/templates/admin/users/user_edit.html:11
+#: rhodecode/templates/base/base.html:71
 msgid "Users"
 msgstr "Utilisateurs"
 
 #: rhodecode/templates/admin/users/user_add.html:12
-msgid "add new user"
+#: rhodecode/templates/admin/users/users.html:23
+#, fuzzy
+msgid "Add new user"
 msgstr "nouvel utilisateur"
 
 #: rhodecode/templates/admin/users/user_add.html:50
@@ -2836,6 +3008,12 b' msgstr "Confirmation"'
 msgid "Edit user"
 msgstr "Éditer l'utilisateur"
 
+#: rhodecode/templates/admin/users/user_edit.html:13
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
+#, fuzzy, python-format
+msgid "Edit %s"
+msgstr "éditer %s"
+
 #: rhodecode/templates/admin/users/user_edit.html:34
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10
 msgid "Change your avatar at"
@@ -2851,30 +3029,31 b' msgstr "en utilisant l\xe2\x80\x99adresse"'
 msgid "API key"
 msgstr "Clé d’API"
 
-#: rhodecode/templates/admin/users/user_edit.html:48
-msgid "Your IP"
+#: rhodecode/templates/admin/users/user_edit.html:50
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25
+msgid "Current IP"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:67
+#: rhodecode/templates/admin/users/user_edit.html:70
 msgid "LDAP DN"
 msgstr "DN LDAP"
 
-#: rhodecode/templates/admin/users/user_edit.html:76
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39
+#: rhodecode/templates/admin/users/user_edit.html:79
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: rhodecode/templates/admin/users/user_edit.html:85
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48
+#: rhodecode/templates/admin/users/user_edit.html:88
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
 msgid "New password confirmation"
 msgstr "Confirmation du nouveau mot de passe"
 
-#: rhodecode/templates/admin/users/user_edit.html:155
+#: rhodecode/templates/admin/users/user_edit.html:158
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
 msgid "Inherit default permissions"
 msgstr "Utiliser les permissions par défaut"
 
-#: rhodecode/templates/admin/users/user_edit.html:160
+#: rhodecode/templates/admin/users/user_edit.html:163
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113
 #, python-format
 msgid ""
@@ -2884,31 +3063,31 b' msgstr ""'
 "Cochez pour utiliser les permissions des les réglages %s. Si cette option"
 " est activée, les réglages ci-dessous n’auront pas d’effet."
 
-#: rhodecode/templates/admin/users/user_edit.html:166
+#: rhodecode/templates/admin/users/user_edit.html:169
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr "Création de dépôts"
 
-#: rhodecode/templates/admin/users/user_edit.html:174
+#: rhodecode/templates/admin/users/user_edit.html:177
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127
 msgid "Fork repositories"
 msgstr "Forker les dépôts"
 
-#: rhodecode/templates/admin/users/user_edit.html:251
+#: rhodecode/templates/admin/users/user_edit.html:200
 msgid "Email addresses"
 msgstr "Adresses e-mail"
 
-#: rhodecode/templates/admin/users/user_edit.html:264
+#: rhodecode/templates/admin/users/user_edit.html:213
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr "Veuillez confirmer la suppression de l’e-mail : %s"
 
-#: rhodecode/templates/admin/users/user_edit.html:278
+#: rhodecode/templates/admin/users/user_edit.html:227
 msgid "New email address"
 msgstr "Nouvelle adrese"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:130
+#: rhodecode/templates/base/base.html:242
 msgid "My account"
 msgstr "Mon compte"
 
@@ -2921,7 +3100,7 b' msgid "My permissions"'
 msgstr "Mes permissions"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:57
+#: rhodecode/templates/journal/journal.html:54
 msgid "My repos"
 msgstr "Mes dépôts"
 
@@ -2929,30 +3108,44 b' msgstr "Mes d\xc3\xa9p\xc3\xb4ts"'
 msgid "My pull requests"
 msgstr "Mes requêtes de pull"
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:45
-#: rhodecode/templates/journal/journal.html:61
-msgid "Add repo"
-msgstr "Ajouter un dépôt"
-
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4
+#, fuzzy
+msgid "Show closed pull requests"
+msgstr "[a fermé] la requête de pull de"
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6
 msgid "Opened by me"
 msgstr "Ouvertes par moi"
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
 #, python-format
 msgid "Pull request #%s opened on %s"
 msgstr "Requête de pull nº%s ouverte le %s"
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
+#: 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_show.html:27
+#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+msgid "Closed"
+msgstr "Fermée"
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23
 msgid "Confirm to delete this pull request"
 msgstr "Veuillez confirmer la suppression de cette requête de pull."
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51
+msgid "Nothing here yet"
+msgstr "Rien ici pour le moment"
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34
 msgid "I participate in"
 msgstr "Je participe à"
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
 msgstr "Requête de pull nº%s ouverte par %s le %s"
@@ -2962,68 +3155,60 b' msgid "Users administration"'
 msgstr "Administration des utilisateurs"
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:241
 msgid "users"
 msgstr "Utilisateurs"
 
-#: rhodecode/templates/admin/users/users.html:23
+#: rhodecode/templates/admin/users/users.html:80
 #, fuzzy
-msgid "Add new user"
-msgstr "nouvel utilisateur"
-
-#: rhodecode/templates/admin/users/users.html:77
-msgid "username"
-msgstr "Nom d’utilisateur"
-
-#: rhodecode/templates/admin/users/users.html:80
-msgid "firstname"
+msgid "Firstname"
 msgstr "Prénom"
 
 #: rhodecode/templates/admin/users/users.html:81
-msgid "lastname"
+#, fuzzy
+msgid "Lastname"
 msgstr "Nom de famille"
 
 #: rhodecode/templates/admin/users/users.html:82
-msgid "last login"
+#, fuzzy
+msgid "Last login"
 msgstr "Dernière connexion"
 
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/admin/users_groups/users_groups.html:34
-msgid "active"
-msgstr "Actif"
-
-#: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:244
-msgid "ldap"
-msgstr "LDAP"
-
 #: rhodecode/templates/admin/users_groups/users_group_add.html:5
-msgid "Add users group"
+#, fuzzy
+msgid "Add user group"
 msgstr "Ajouter un groupe d’utilisateur"
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:10
-#: rhodecode/templates/admin/users_groups/users_groups.html:9
-msgid "Users groups"
+#: rhodecode/templates/admin/users_groups/users_groups.html:11
+#: rhodecode/templates/base/base.html:72
+#, fuzzy
+msgid "User groups"
 msgstr "Groupes d’utilisateurs"
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:12
-msgid "add new users group"
+#: rhodecode/templates/admin/users_groups/users_groups.html:25
+#, fuzzy
+msgid "Add new user group"
 msgstr "Ajouter un nouveau groupe"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:5
-msgid "Edit users group"
+#, fuzzy
+msgid "Edit user group"
 msgstr "Éditer le groupe d’utilisateurs"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:11
-msgid "UsersGroups"
-msgstr "UsersGroups"
+#, fuzzy
+msgid "UserGroups"
+msgstr "Groupes d’utilisateurs"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:50
+#: rhodecode/templates/admin/users_groups/users_groups.html:35
 msgid "Members"
 msgstr "Membres"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:58
-msgid "Choosen group members"
+#, fuzzy
+msgid "Chosen group members"
 msgstr "Membres du groupe"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:61
@@ -3038,269 +3223,265 b' msgstr "Membres disponibles"'
 msgid "Add all elements"
 msgstr "Tout ajouter"
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:146
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:150
 msgid "Group members"
 msgstr "Membres du groupe"
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:163
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:167
 #, fuzzy
 msgid "No members yet"
 msgstr "Membres"
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:171
-#, fuzzy
-msgid "Permissions defined for this group"
-msgstr "Gestion des permissions"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:178
-#, fuzzy
-msgid "No permissions set yet"
-msgstr "Copier les permissions"
-
 #: rhodecode/templates/admin/users_groups/users_groups.html:5
-msgid "Users groups administration"
-msgstr "Gestion des groupes d’utilisateurs"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:23
 #, fuzzy
-msgid "Add new user group"
-msgstr "Ajouter un nouveau groupe"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:32
-msgid "group name"
-msgstr "Nom du groupe"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:33
-#: rhodecode/templates/base/root.html:46
-msgid "members"
-msgstr "Membres"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:45
-#, python-format
-msgid "Confirm to delete this users group: %s"
+msgid "User groups administration"
+msgstr "Gestion des groupes d’utilisateurs"
+
+#: rhodecode/templates/admin/users_groups/users_groups.html:47
+#, fuzzy, python-format
+msgid "Confirm to delete this user group: %s"
 msgstr "Voulez-vous vraiment supprimer le groupe d‘utilisateurs « %s » ?"
 
-#: rhodecode/templates/base/base.html:41
+#: rhodecode/templates/base/base.html:42
 msgid "Submit a bug"
 msgstr "Signaler un bogue"
 
-#: rhodecode/templates/base/base.html:76
-#, fuzzy
-msgid "Not logged in"
-msgstr "Dernière connexion"
-
-#: rhodecode/templates/base/base.html:83
-msgid "Login to your account"
-msgstr "Connexion à votre compte"
-
-#: rhodecode/templates/base/base.html:106
-msgid "Forgot password ?"
-msgstr "Mot de passe oublié ?"
-
-#: rhodecode/templates/base/base.html:113
-msgid "Log In"
-msgstr "Connexion"
-
-#: rhodecode/templates/base/base.html:124
-msgid "Inbox"
-msgstr "Boîte de réception"
-
-#: rhodecode/templates/base/base.html:129
-#: rhodecode/templates/base/base.html:297
-#: rhodecode/templates/base/base.html:299
-#: rhodecode/templates/base/base.html:301
-#: rhodecode/templates/journal/journal.html:4
-#: rhodecode/templates/journal/public_journal.html:4
-msgid "Journal"
-msgstr "Historique"
-
-#: rhodecode/templates/base/base.html:131
-msgid "Log Out"
-msgstr "Se déconnecter"
-
-#: rhodecode/templates/base/base.html:150
-msgid "Switch repository"
-msgstr "Aller au dépôt"
-
-#: rhodecode/templates/base/base.html:152
-msgid "Products"
-msgstr "Produits"
-
-#: rhodecode/templates/base/base.html:158
-#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47
-msgid "loading..."
-msgstr "Chargement…"
-
-#: rhodecode/templates/base/base.html:166
-#: rhodecode/templates/base/base.html:168
-#: rhodecode/templates/base/base.html:170
+#: rhodecode/templates/base/base.html:108
 #: 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 "Résumé"
 
-#: rhodecode/templates/base/base.html:174
-#: rhodecode/templates/base/base.html:176
-#: rhodecode/templates/base/base.html:178
-#: rhodecode/templates/changelog/changelog.html:15
+#: rhodecode/templates/base/base.html:109
+#: rhodecode/templates/changelog/changelog.html:11
 #: 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 "Historique"
 
-#: rhodecode/templates/base/base.html:182
-#: rhodecode/templates/base/base.html:184
-#: rhodecode/templates/base/base.html:186
-msgid "Switch to"
-msgstr "Aller"
-
-#: rhodecode/templates/base/base.html:193
-#: rhodecode/templates/base/base.html:195
-#: rhodecode/templates/base/base.html:197
+#: rhodecode/templates/base/base.html:110
 #: rhodecode/templates/data_table/_dt_elements.html:25
 #: rhodecode/templates/data_table/_dt_elements.html:27
 #: rhodecode/templates/data_table/_dt_elements.html:29
+#: rhodecode/templates/files/files.html:12
 msgid "Files"
 msgstr "Fichiers"
 
-#: rhodecode/templates/base/base.html:201
-#: rhodecode/templates/base/base.html:205
+#: rhodecode/templates/base/base.html:112
+#, fuzzy
+msgid "Switch To"
+msgstr "Aller"
+
+#: rhodecode/templates/base/base.html:114
+#: rhodecode/templates/base/base.html:267
+msgid "loading..."
+msgstr "Chargement…"
+
+#: rhodecode/templates/base/base.html:118
 msgid "Options"
 msgstr "Options"
 
-#: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/base/base.html:212
-msgid "repository settings"
-msgstr "Réglages de dépôt"
-
-#: rhodecode/templates/base/base.html:216
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/forks/fork.html:13
-msgid "fork"
-msgstr "Fork"
-
-#: rhodecode/templates/base/base.html:218
-#: rhodecode/templates/changelog/changelog.html:43
+#: rhodecode/templates/base/base.html:124
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr "Comparer le fork"
+
+#: rhodecode/templates/base/base.html:126
+msgid "Lightweight changelog"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:127
+#: rhodecode/templates/base/base.html:287
+#: rhodecode/templates/search/search.html:14
+#: rhodecode/templates/search/search.html:54
+msgid "Search"
+msgstr "Rechercher"
+
+#: rhodecode/templates/base/base.html:133
 #, fuzzy
-msgid "open new pull request"
-msgstr "Nouvelle requête de pull"
-
-#: rhodecode/templates/base/base.html:221
+msgid "Lock"
+msgstr "Verrouiller"
+
+#: rhodecode/templates/base/base.html:141
+#, fuzzy
+msgid "Follow"
+msgstr "followers"
+
+#: rhodecode/templates/base/base.html:142
 #, fuzzy
-msgid "compare fork"
-msgstr "Comparer le fork"
-
-#: rhodecode/templates/base/base.html:223
-msgid "search"
-msgstr "Rechercher"
-
-#: rhodecode/templates/base/base.html:229
-msgid "lock"
-msgstr "Verrouiller"
-
-#: rhodecode/templates/base/base.html:240
-msgid "repositories groups"
-msgstr "Groupes de dépôts"
-
-#: rhodecode/templates/base/base.html:242
-msgid "users groups"
-msgstr "Groupes d’utilisateurs"
+msgid "Unfollow"
+msgstr "followers"
+
+#: rhodecode/templates/base/base.html:145
+#: rhodecode/templates/data_table/_dt_elements.html:33
+#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/data_table/_dt_elements.html:37
+#: rhodecode/templates/data_table/_dt_elements.html:74
+#: rhodecode/templates/forks/fork.html:9
+msgid "Fork"
+msgstr "Fork"
+
+#: rhodecode/templates/base/base.html:147
+#, fuzzy
+msgid "Create Pull Request"
+msgstr "Nouvelle requête de pull"
+
+#: rhodecode/templates/base/base.html:153
+#, fuzzy
+msgid "Show Pull Requests"
+msgstr "Nouvelle requête de pull"
+
+#: rhodecode/templates/base/base.html:153
+#, fuzzy
+msgid "Pull Requests"
+msgstr "Requêtes de pull"
+
+#: rhodecode/templates/base/base.html:190
+#, fuzzy
+msgid "Not logged in"
+msgstr "Dernière connexion"
+
+#: rhodecode/templates/base/base.html:197
+msgid "Login to your account"
+msgstr "Connexion à votre compte"
+
+#: rhodecode/templates/base/base.html:220
+msgid "Forgot password ?"
+msgstr "Mot de passe oublié ?"
 
 #: rhodecode/templates/base/base.html:243
-msgid "permissions"
-msgstr "Permissions"
-
-#: rhodecode/templates/base/base.html:245
+msgid "Log Out"
+msgstr "Se déconnecter"
+
+#: rhodecode/templates/base/base.html:262
+msgid "Switch repository"
+msgstr "Aller au dépôt"
+
+#: 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"
+msgstr "Historique"
+
+#: rhodecode/templates/base/base.html:286
 #, fuzzy
-msgid "defaults"
-msgstr "[Par défaut]"
-
-#: rhodecode/templates/base/base.html:246
-msgid "settings"
-msgstr "Réglages"
-
-#: rhodecode/templates/base/base.html:256
-#: rhodecode/templates/base/base.html:258
-msgid "Followers"
-msgstr "Followers"
-
-#: rhodecode/templates/base/base.html:264
-#: rhodecode/templates/base/base.html:266
-msgid "Forks"
-msgstr "Forks"
-
-#: rhodecode/templates/base/base.html:315
-#: rhodecode/templates/base/base.html:317
-#: rhodecode/templates/base/base.html:319
-#: rhodecode/templates/search/search.html:52
-msgid "Search"
-msgstr "Rechercher"
-
-#: rhodecode/templates/base/root.html:42
-msgid "add another comment"
-msgstr "Nouveau commentaire"
+msgid "Search in repositories"
+msgstr "Rechercher dans tous les dépôts"
+
+#: rhodecode/templates/base/perms_summary.html:8
+#, fuzzy
+msgid "No permissions defined yet"
+msgstr "Copier les permissions"
+
+#: rhodecode/templates/base/perms_summary.html:15
+msgid "Permission"
+msgstr "Permission"
+
+#: rhodecode/templates/base/perms_summary.html:16
+msgid "Edit Permission"
+msgstr "Éditer"
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/data_table/_dt_elements.html:140
-#: rhodecode/templates/summary/summary.html:57
-msgid "Stop following this repository"
-msgstr "Arrêter de suivre ce dépôt"
+#, fuzzy
+msgid "Add another comment"
+msgstr "Nouveau commentaire"
 
 #: rhodecode/templates/base/root.html:44
-#: rhodecode/templates/summary/summary.html:61
+#: rhodecode/templates/data_table/_dt_elements.html:140
+msgid "Stop following this repository"
+msgstr "Arrêter de suivre ce dépôt"
+
+#: rhodecode/templates/base/root.html:45
 msgid "Start following this repository"
 msgstr "Suivre ce dépôt"
 
-#: rhodecode/templates/base/root.html:45
+#: rhodecode/templates/base/root.html:46
 msgid "Group"
 msgstr "Groupe"
 
+#: rhodecode/templates/base/root.html:47
+msgid "members"
+msgstr "Membres"
+
 #: rhodecode/templates/base/root.html:48
-msgid "search truncated"
-msgstr "Résultats tronqués"
+#: rhodecode/templates/pullrequests/pullrequest.html:181
+#, fuzzy
+msgid "Loading ..."
+msgstr "Chargement…"
 
 #: rhodecode/templates/base/root.html:49
-msgid "no matching files"
-msgstr "Aucun fichier ne correspond"
+#, fuzzy
+msgid "Search truncated"
+msgstr "Résultats tronqués"
 
 #: rhodecode/templates/base/root.html:50
+#, fuzzy
+msgid "No matching files"
+msgstr "Aucun fichier ne correspond"
+
+#: rhodecode/templates/base/root.html:51
+#: rhodecode/templates/changelog/changelog.html:36
 msgid "Open new pull request"
 msgstr "Nouvelle requête de pull"
 
-#: rhodecode/templates/base/root.html:51
+#: rhodecode/templates/base/root.html:52
 #, fuzzy
 msgid "Open new pull request for selected changesets"
 msgstr "a ouvert une nouvelle requête de pull"
 
-#: rhodecode/templates/base/root.html:52
-msgid "Show selected changes __S -> __E"
+#: rhodecode/templates/base/root.html:53
+#, fuzzy
+msgid "Show selected changesets __S -> __E"
 msgstr "Afficher les changements sélections de __S à __E"
 
-#: rhodecode/templates/base/root.html:53
+#: rhodecode/templates/base/root.html:54
+#, fuzzy
+msgid "Show selected changeset __S"
+msgstr "Afficher les changements sélections de __S à __E"
+
+#: rhodecode/templates/base/root.html:55
 msgid "Selection link"
 msgstr "Lien vers la sélection"
 
+#: rhodecode/templates/base/root.html:56
+#: rhodecode/templates/changeset/diff_block.html:8
+#, fuzzy
+msgid "Collapse diff"
+msgstr "Diff de fichier"
+
+#: rhodecode/templates/base/root.html:57
+#, fuzzy
+msgid "Expand diff"
+msgstr "Diff brut"
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr "Signets de %s"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:39
+#: rhodecode/templates/bookmarks/bookmarks.html:37
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:53
+#: rhodecode/templates/branches/branches.html:50
 #: rhodecode/templates/branches/branches_data.html:8
-#: rhodecode/templates/tags/tags.html:54
+#: rhodecode/templates/shortlog/shortlog_data.html:8
+#: rhodecode/templates/tags/tags.html:51
 #: rhodecode/templates/tags/tags_data.html:8
 msgid "Author"
 msgstr "Auteur"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:40
+#: rhodecode/templates/bookmarks/bookmarks.html:38
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches.html:51
 #: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/shortlog/shortlog_data.html:5
+#: rhodecode/templates/tags/tags.html:52
 #: rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr "Révision"
@@ -3310,15 +3491,13 b' msgstr "R\xc3\xa9vision"'
 msgid "%s Branches"
 msgstr "Branches de %s"
 
-#: rhodecode/templates/branches/branches.html:29
+#: rhodecode/templates/branches/branches.html:26
 msgid "Compare branches"
 msgstr "Comparer les branches"
 
-#: rhodecode/templates/branches/branches.html:56
+#: rhodecode/templates/branches/branches.html:53
 #: rhodecode/templates/branches/branches_data.html:10
-#: rhodecode/templates/compare/compare_diff.html:5
-#: rhodecode/templates/compare/compare_diff.html:13
-#: rhodecode/templates/tags/tags.html:57
+#: rhodecode/templates/tags/tags.html:54
 #: rhodecode/templates/tags/tags_data.html:10
 msgid "Compare"
 msgstr "Comparer"
@@ -3328,118 +3507,85 b' msgstr "Comparer"'
 msgid "%s Changelog"
 msgstr "Historique de %s"
 
-#: rhodecode/templates/changelog/changelog.html:15
+#: rhodecode/templates/changelog/changelog.html:11
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
 msgstr[0] "Affichage de %d révision sur %d"
 msgstr[1] "Affichage de %d révisions sur %d"
 
-#: rhodecode/templates/changelog/changelog.html:37
+#: rhodecode/templates/changelog/changelog.html:30
 #, fuzzy
 msgid "Clear selection"
 msgstr "Réglages de recherche"
 
-#: rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/templates/changelog/changelog.html:33
 #: rhodecode/templates/forks/forks_data.html:19
-#, python-format
-msgid "compare fork with %s"
+#, fuzzy, python-format
+msgid "Compare fork with %s"
 msgstr "Comparer le fork avec %s"
 
-#: rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/templates/changelog/changelog.html:33
 #, fuzzy
 msgid "Compare fork with parent"
 msgstr "Comparer le fork avec %s"
 
-#: rhodecode/templates/changelog/changelog.html:49
-msgid "Show"
-msgstr "Afficher"
-
-#: rhodecode/templates/changelog/changelog.html:74
-#: rhodecode/templates/summary/summary.html:375
-msgid "show more"
+#: rhodecode/templates/changelog/changelog.html:76
+#: rhodecode/templates/summary/summary.html:404
+#, fuzzy
+msgid "Show more"
 msgstr "montrer plus"
 
-#: rhodecode/templates/changelog/changelog.html:78
-msgid "Affected number of files, click to show more details"
-msgstr "Nombre de fichiers modifiés, cliquez pour plus de détails"
-
-#: rhodecode/templates/changelog/changelog.html:91
-#: rhodecode/templates/changeset/changeset.html:65
-#: rhodecode/templates/changeset/changeset_file_comment.html:20
-#: rhodecode/templates/changeset/changeset_range.html:46
-msgid "Changeset status"
-msgstr "Statut du changeset"
-
-#: rhodecode/templates/changelog/changelog.html:94
-#: rhodecode/templates/shortlog/shortlog_data.html:20
-#, python-format
-msgid "Click to open associated pull request #%s"
-msgstr "Cliquez ici pour ouvrir la requête de pull associée #%s."
-
-#: rhodecode/templates/changelog/changelog.html:104
-msgid "Parent"
-msgstr "Parent"
-
-#: rhodecode/templates/changelog/changelog.html:110
-#: rhodecode/templates/changeset/changeset.html:42
-msgid "No parents"
-msgstr "Aucun parent"
-
-#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changelog/changelog.html:89
+#: rhodecode/templates/changeset/changeset_range.html:86
+#, fuzzy, python-format
+msgid "Bookmark %s"
+msgstr "Signets %s"
+
+#: rhodecode/templates/changelog/changelog.html:95
+#: rhodecode/templates/changeset/changeset.html:111
+#: rhodecode/templates/changeset/changeset_range.html:92
+#, fuzzy, python-format
+msgid "Tag %s"
+msgstr "Tags %s"
+
+#: rhodecode/templates/changelog/changelog.html:100
 #: rhodecode/templates/changeset/changeset.html:106
-#: rhodecode/templates/changeset/changeset_range.html:79
-msgid "merge"
-msgstr "Fusion"
-
-#: rhodecode/templates/changelog/changelog.html:118
-#: rhodecode/templates/changeset/changeset.html:109
-#: rhodecode/templates/changeset/changeset_range.html:82
-#: rhodecode/templates/files/files.html:29
-#: rhodecode/templates/files/files_add.html:33
-#: rhodecode/templates/files/files_edit.html:33
-#: rhodecode/templates/shortlog/shortlog_data.html:9
-msgid "branch"
-msgstr "Branche"
-
-#: rhodecode/templates/changelog/changelog.html:124
-#: rhodecode/templates/changeset/changeset_range.html:88
-msgid "bookmark"
-msgstr "Signet"
-
-#: rhodecode/templates/changelog/changelog.html:130
-#: rhodecode/templates/changeset/changeset.html:114
-#: rhodecode/templates/changeset/changeset_range.html:94
-msgid "tag"
-msgstr "Tag"
-
-#: rhodecode/templates/changelog/changelog.html:302
+#: rhodecode/templates/changeset/changeset_range.html:80
+#, fuzzy, python-format
+msgid "Branch %s"
+msgstr "Branches %s"
+
+#: rhodecode/templates/changelog/changelog.html:258
 msgid "There are no changes yet"
 msgstr "Il n’y a aucun changement pour le moment"
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:94
-msgid "removed"
+#: rhodecode/templates/changeset/changeset.html:91
+#, fuzzy
+msgid "Removed"
 msgstr "Supprimés"
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:95
-msgid "changed"
+#: rhodecode/templates/changeset/changeset.html:92
+#, fuzzy
+msgid "Changed"
 msgstr "Modifiés"
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:96
-msgid "added"
+#: rhodecode/templates/changeset/changeset.html:93
+#, fuzzy
+msgid "Added"
 msgstr "Ajoutés"
 
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changelog/changelog_details.html:9
 #: rhodecode/templates/changelog/changelog_details.html:10
-#: rhodecode/templates/changeset/changeset.html:98
-#: rhodecode/templates/changeset/changeset.html:99
-#: rhodecode/templates/changeset/changeset.html:100
-#, python-format
-msgid "affected %s files"
+#: rhodecode/templates/changeset/changeset.html:95
+#: rhodecode/templates/changeset/changeset.html:96
+#: rhodecode/templates/changeset/changeset.html:97
+#, fuzzy, python-format
+msgid "Affected %s files"
 msgstr "%s fichiers affectés"
 
 #: rhodecode/templates/changeset/changeset.html:6
@@ -3447,31 +3593,39 b' msgstr "%s fichiers affect\xc3\xa9s"'
 msgid "%s Changeset"
 msgstr "Changeset de %s"
 
-#: rhodecode/templates/changeset/changeset.html:14
-msgid "Changeset"
-msgstr "Changements"
-
-#: rhodecode/templates/changeset/changeset.html:52
+#: rhodecode/templates/changeset/changeset.html:39
+msgid "No parents"
+msgstr "Aucun parent"
+
+#: rhodecode/templates/changeset/changeset.html:49
 #, fuzzy
 msgid "No children"
 msgstr "Appliquer aux enfants"
 
-#: rhodecode/templates/changeset/changeset.html:70
-#: rhodecode/templates/changeset/diff_block.html:20
-msgid "raw diff"
-msgstr "Diff brut"
-
-#: rhodecode/templates/changeset/changeset.html:71
+#: rhodecode/templates/changeset/changeset.html:62
+#: rhodecode/templates/changeset/changeset_file_comment.html:20
+#: rhodecode/templates/changeset/changeset_range.html:44
+msgid "Changeset status"
+msgstr "Statut du changeset"
+
+#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/diff_block.html:23
 #, fuzzy
-msgid "patch diff"
+msgid "Raw diff"
+msgstr "Diff brut"
+
+#: rhodecode/templates/changeset/changeset.html:68
+#, fuzzy
+msgid "Patch diff"
 msgstr "Diff brut"
 
-#: rhodecode/templates/changeset/changeset.html:72
-#: rhodecode/templates/changeset/diff_block.html:21
-msgid "download diff"
+#: rhodecode/templates/changeset/changeset.html:69
+#: rhodecode/templates/changeset/diff_block.html:24
+#, fuzzy
+msgid "Download diff"
 msgstr "Télécharger le diff"
 
-#: rhodecode/templates/changeset/changeset.html:76
+#: rhodecode/templates/changeset/changeset.html:73
 #: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "%d comment"
@@ -3479,7 +3633,7 b' msgid_plural "%d comments"'
 msgstr[0] "%d commentaire"
 msgstr[1] "%d commentaires"
 
-#: rhodecode/templates/changeset/changeset.html:76
+#: rhodecode/templates/changeset/changeset.html:73
 #: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "(%d inline)"
@@ -3487,32 +3641,54 b' msgid_plural "(%d inline)"'
 msgstr[0] "(et %d en ligne)"
 msgstr[1] "(et %d en ligne)"
 
-#: rhodecode/templates/changeset/changeset.html:122
-#: rhodecode/templates/compare/compare_diff.html:44
-#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+#: rhodecode/templates/changeset/changeset.html:103
+#: rhodecode/templates/changeset/changeset_range.html:77
+msgid "merge"
+msgstr "Fusion"
+
+#: rhodecode/templates/changeset/changeset.html:119
+#: rhodecode/templates/compare/compare_diff.html:40
+#: rhodecode/templates/pullrequests/pullrequest_show.html:113
 #, fuzzy, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
 msgstr[0] "%s fichié modifié"
 msgstr[1] "%s fichié modifié"
 
-#: rhodecode/templates/changeset/changeset.html:124
-#: rhodecode/templates/compare/compare_diff.html:46
-#: rhodecode/templates/pullrequests/pullrequest_show.html:96
+#: rhodecode/templates/changeset/changeset.html:121
+#: rhodecode/templates/compare/compare_diff.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:115
 #, fuzzy, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
 msgstr[0] "%s fichiers affectés avec %s insertions et %s suppressions"
 msgstr[1] "%s fichiers affectés avec %s insertions et %s suppressions"
 
+#: rhodecode/templates/changeset/changeset.html:134
+#: rhodecode/templates/changeset/changeset.html:146
+#: 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/compare/compare_diff.html:58
+#: rhodecode/templates/compare/compare_diff.html:69
+#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#, fuzzy
+msgid "Show full diff"
+msgstr "Chargement de la liste des fichiers…"
+
 #: rhodecode/templates/changeset/changeset_file_comment.html:30
-#, python-format
-msgid "Status from pull request %s"
+#, fuzzy, python-format
+msgid "Status change on pull request #%s"
 msgstr "Requêtes de pull %s"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:32
-#, python-format
-msgid "Comment from pull request %s"
+#, fuzzy, python-format
+msgid "Comment on pull request #%s"
 msgstr "[a commenté] la requête de pull pour %s"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:57
@@ -3524,7 +3700,7 b' msgid "Commenting on line {1}."'
 msgstr "Commentaire sur la ligne {1}."
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:61
-#: rhodecode/templates/changeset/changeset_file_comment.html:140
+#: rhodecode/templates/changeset/changeset_file_comment.html:139
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr ""
@@ -3532,21 +3708,21 b' msgstr ""'
 "commande %s."
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:63
-#: rhodecode/templates/changeset/changeset_file_comment.html:142
+#: rhodecode/templates/changeset/changeset_file_comment.html:141
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 "Utilisez @nomutilisateur dans ce texte pour envoyer une notification à "
 "l’utilisateur RhodeCode en question."
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:74
-#: rhodecode/templates/changeset/changeset_file_comment.html:162
+#: rhodecode/templates/changeset/changeset_file_comment.html:161
 msgid "Comment"
 msgstr "Commentaire"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:75
-#: rhodecode/templates/changeset/changeset_file_comment.html:86
-msgid "Hide"
-msgstr "Masquer"
+#, fuzzy
+msgid "Cancel"
+msgstr "Modifiés"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:82
 msgid "You need to be logged in to comment."
@@ -3556,19 +3732,16 b' msgstr "Vous devez \xc3\xaatre connect\xc3\xa9 pour poster des commentaires."'
 msgid "Login now"
 msgstr "Se connecter maintenant"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:137
-msgid "Leave a comment"
-msgstr "Laisser un commentaire"
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:144
-msgid "Check this to change current status of code-review for this changeset"
-msgstr "Cochez pour changer le statut de la relecture de code pour ce changeset"
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:144
-msgid "change status"
+#: rhodecode/templates/changeset/changeset_file_comment.html:86
+msgid "Hide"
+msgstr "Masquer"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:143
+#, fuzzy
+msgid "Change status"
 msgstr "Modifier le statut"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:164
+#: rhodecode/templates/changeset/changeset_file_comment.html:163
 msgid "Comment and close"
 msgstr "Commenter et fermer"
 
@@ -3577,72 +3750,79 b' msgstr "Commenter et fermer"'
 msgid "%s Changesets"
 msgstr "Changesets de %s"
 
-#: rhodecode/templates/changeset/changeset_range.html:29
-#: rhodecode/templates/compare/compare_diff.html:29
-msgid "Compare View"
-msgstr "Comparaison"
-
-#: rhodecode/templates/changeset/changeset_range.html:29
-#, fuzzy
-msgid "Show combined compare"
-msgstr "Afficher les commentaires"
-
-#: rhodecode/templates/changeset/changeset_range.html:54
+#: rhodecode/templates/changeset/changeset_range.html:52
 msgid "Files affected"
 msgstr "Fichiers affectés"
 
-#: rhodecode/templates/changeset/diff_block.html:19
-msgid "show full diff for this file"
+#: rhodecode/templates/changeset/diff_block.html:22
+msgid "Show full diff for this file"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:27
-msgid "show inline comments"
+#: rhodecode/templates/changeset/diff_block.html:30
+#, fuzzy
+msgid "Show inline comments"
 msgstr "Afficher les commentaires"
 
-#: rhodecode/templates/compare/compare_cs.html:5
+#: rhodecode/templates/changeset/diff_block.html:55
+msgid "Show file at latest version in this repo"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:56
+msgid "Show file at initial version in this repo"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_cs.html:4
 msgid "No changesets"
 msgstr "Aucun changeset"
 
-#: rhodecode/templates/compare/compare_diff.html:37
-#: rhodecode/templates/pullrequests/pullrequest_show.html:87
+#: rhodecode/templates/compare/compare_cs.html:32
+#, fuzzy
+msgid "Ancestor"
+msgstr "Branches"
+
+#: rhodecode/templates/compare/compare_diff.html:5
+#, fuzzy, python-format
+msgid "%s Compare"
+msgstr "%s Comparer"
+
+#: rhodecode/templates/compare/compare_diff.html:9
+#, fuzzy
+msgid "Compare revisions"
+msgstr "révision précédente"
+
+#: rhodecode/templates/compare/compare_diff.html:33
+#: rhodecode/templates/pullrequests/pullrequest_show.html:106
 #, fuzzy, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
 msgstr[0] "Afficher %s les commentaires"
 msgstr[1] "Afficher %s les commentaires"
 
-#: rhodecode/templates/compare/compare_diff.html:52
-#: rhodecode/templates/pullrequests/pullrequest_show.html:102
+#: rhodecode/templates/compare/compare_diff.html:48
+#: rhodecode/templates/pullrequests/pullrequest_show.html:121
 #, fuzzy
 msgid "No files"
 msgstr "Fichiers"
 
-#: rhodecode/templates/data_table/_dt_elements.html:33
-#: rhodecode/templates/data_table/_dt_elements.html:35
-#: rhodecode/templates/data_table/_dt_elements.html:37
-msgid "Fork"
-msgstr "Fork"
+#: rhodecode/templates/compare/compare_diff.html:58
+#: rhodecode/templates/compare/compare_diff.html:69
+msgid "confirm to show potentially huge diff"
+msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/summary/summary.html:77
+#: rhodecode/templates/summary/summary.html:69
 msgid "Mercurial repository"
 msgstr "Dépôt Mercurial"
 
 #: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/summary/summary.html:80
+#: rhodecode/templates/summary/summary.html:72
 msgid "Git repository"
 msgstr "Dépôt Git"
 
-#: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/summary/summary.html:87
-msgid "public repository"
-msgstr "Dépôt public"
-
 #: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/summary/summary.html:96
-#: rhodecode/templates/summary/summary.html:97
-msgid "Fork of"
-msgstr "Fork de"
+#, fuzzy, python-format
+msgid "Fork of %s"
+msgstr "Nom du fork %s"
 
 #: rhodecode/templates/data_table/_dt_elements.html:88
 msgid "No changesets yet"
@@ -3670,30 +3850,46 b' msgstr "Voulez-vous vraiment supprimer le d\xc3\xa9p\xc3\xb4t %s\xc2\xa0?"'
 msgid "Confirm to delete this user: %s"
 msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?"
 
-#: rhodecode/templates/email_templates/changeset_comment.html:10
+#: rhodecode/templates/email_templates/changeset_comment.html:9
+#: rhodecode/templates/email_templates/pull_request_comment.html:15
 #, fuzzy
-msgid "New status$"
+msgid "New status"
 msgstr "Modifier le statut"
 
+#: rhodecode/templates/email_templates/changeset_comment.html:11
+#: rhodecode/templates/email_templates/pull_request_comment.html:9
+msgid "View this comment here"
+msgstr ""
+
+#: rhodecode/templates/email_templates/changeset_comment.html:14
+#, fuzzy
+msgid "Repo"
+msgstr "Mes dépôts"
+
+#: rhodecode/templates/email_templates/changeset_comment.html:16
+msgid "desc"
+msgstr ""
+
 #: rhodecode/templates/email_templates/main.html:8
 #, fuzzy
 msgid "This is a notification from RhodeCode."
 msgstr "Ceci est une notification de RhodeCode."
 
 #: rhodecode/templates/email_templates/password_reset.html:4
-msgid "Hello"
+#, python-format
+msgid "Hello %s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/password_reset.html:5
+msgid "We received a request to create a new password for your account."
 msgstr ""
 
 #: rhodecode/templates/email_templates/password_reset.html:6
-msgid "We received a request to create a new password for your account."
-msgstr ""
-
-#: rhodecode/templates/email_templates/password_reset.html:8
 msgid "You can generate it by clicking following URL"
 msgstr ""
 
-#: rhodecode/templates/email_templates/password_reset.html:12
-msgid "If you didn't request new password please ignore this email."
+#: 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
@@ -3705,36 +3901,31 b' msgstr ""'
 
 #: rhodecode/templates/email_templates/pull_request.html:5
 #, fuzzy
-msgid "title"
-msgstr "Titre"
+msgid "View this pull request here"
+msgstr "Ajouter un relecteur à cette requête de pull."
 
 #: rhodecode/templates/email_templates/pull_request.html:6
-#: rhodecode/templates/pullrequests/pullrequest.html:115
+#, fuzzy
+msgid "title"
+msgstr "Titre"
+
+#: rhodecode/templates/email_templates/pull_request.html:7
 msgid "description"
 msgstr "Description"
 
-#: rhodecode/templates/email_templates/pull_request.html:7
-#, fuzzy
-msgid "View this pull request here"
-msgstr "Ajouter un relecteur à cette requête de pull."
-
 #: rhodecode/templates/email_templates/pull_request.html:12
 msgid "revisions for reviewing"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_comment.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:3
 #, fuzzy, python-format
-msgid "User %s commented on pull request #%s for repository %s"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.html:10
+msgid "Pull request #%s for repository %s"
+msgstr "Requête de pull nº%s ouverte le %s"
+
+#: rhodecode/templates/email_templates/pull_request_comment.html:13
 #, fuzzy
-msgid "New status"
-msgstr "Modifier le statut"
-
-#: rhodecode/templates/email_templates/pull_request_comment.html:14
-msgid "View this comment here"
-msgstr ""
+msgid "Closing pull request with status"
+msgstr "Statut de la requête de pull"
 
 #: rhodecode/templates/email_templates/registration.html:4
 #, fuzzy
@@ -3745,109 +3936,115 b' msgstr "Vous vous \xc3\xaates inscrits avec succ\xc3\xa8s \xc3\xa0 RhodeCode"'
 msgid "View this user here"
 msgstr ""
 
-#: rhodecode/templates/errors/error_document.html:46
+#: rhodecode/templates/errors/error_document.html:55
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr "Vous serez redirigé vers %s dans %s secondes."
 
 #: rhodecode/templates/files/file_diff.html:4
-#, python-format
-msgid "%s File diff"
+#, fuzzy, python-format
+msgid "%s File Diff"
 msgstr "Diff de fichier de %s"
 
-#: rhodecode/templates/files/file_diff.html:12
+#: rhodecode/templates/files/file_diff.html:8
 msgid "File diff"
 msgstr "Diff de fichier"
 
 #: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:74
-#, python-format
-msgid "%s files"
+#: rhodecode/templates/files/files.html:76
+#, fuzzy, python-format
+msgid "%s Files"
 msgstr "Fichiers de %s"
 
-#: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:351
-msgid "files"
-msgstr "Fichiers"
+#: 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
+#, fuzzy
+msgid "Branch"
+msgstr "Branche"
 
 #: rhodecode/templates/files/files_add.html:4
-#: rhodecode/templates/files/files_edit.html:4
-#, python-format
-msgid "%s Edit file"
-msgstr "Edition de fichier de %s"
+#, fuzzy, python-format
+msgid "%s Files Add"
+msgstr "Fichiers de %s"
 
 #: rhodecode/templates/files/files_add.html:19
-msgid "add file"
+#, fuzzy
+msgid "Add file"
 msgstr "Ajouter un fichier"
 
-#: rhodecode/templates/files/files_add.html:40
+#: 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 "Ajouter un nouveau fichier"
 
-#: rhodecode/templates/files/files_add.html:45
+#: rhodecode/templates/files/files_add.html:43
 msgid "File Name"
 msgstr "Nom de fichier"
 
-#: rhodecode/templates/files/files_add.html:49
-#: rhodecode/templates/files/files_add.html:58
+#: rhodecode/templates/files/files_add.html:47
+#: rhodecode/templates/files/files_add.html:56
 msgid "or"
 msgstr "ou"
 
-#: rhodecode/templates/files/files_add.html:49
-#: rhodecode/templates/files/files_add.html:54
+#: rhodecode/templates/files/files_add.html:47
+#: rhodecode/templates/files/files_add.html:52
 msgid "Upload file"
 msgstr "Téléverser un fichier"
 
-#: rhodecode/templates/files/files_add.html:58
+#: rhodecode/templates/files/files_add.html:56
 msgid "Create new file"
 msgstr "Créer un nouveau fichier"
 
-#: rhodecode/templates/files/files_add.html:63
-#: rhodecode/templates/files/files_edit.html:39
+#: rhodecode/templates/files/files_add.html:61
+#: rhodecode/templates/files/files_edit.html:37
 #: rhodecode/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "Emplacement"
 
-#: rhodecode/templates/files/files_add.html:67
+#: rhodecode/templates/files/files_add.html:65
 msgid "use / to separate directories"
 msgstr "Utilisez / pour séparer les répertoires"
 
-#: rhodecode/templates/files/files_add.html:77
-#: rhodecode/templates/files/files_edit.html:63
+#: rhodecode/templates/files/files_add.html:75
+#: rhodecode/templates/files/files_edit.html:61
 #: rhodecode/templates/shortlog/shortlog_data.html:6
-msgid "commit message"
+#, fuzzy
+msgid "Commit message"
 msgstr "Message de commit"
 
-#: rhodecode/templates/files/files_add.html:81
-#: rhodecode/templates/files/files_edit.html:67
+#: rhodecode/templates/files/files_add.html:79
+#: rhodecode/templates/files/files_edit.html:65
 msgid "Commit changes"
 msgstr "Commiter les changements"
 
 #: rhodecode/templates/files/files_browser.html:13
-msgid "view"
+#, fuzzy
+msgid "View"
 msgstr "voir"
 
 #: rhodecode/templates/files/files_browser.html:14
-msgid "previous revision"
+#, fuzzy
+msgid "Previous revision"
 msgstr "révision précédente"
 
 #: rhodecode/templates/files/files_browser.html:16
-msgid "next revision"
+#, fuzzy
+msgid "Next revision"
 msgstr "révision suivante"
 
 #: rhodecode/templates/files/files_browser.html:23
-msgid "follow current branch"
+#, fuzzy
+msgid "Follow current branch"
 msgstr "Suivre la branche actuelle"
 
 #: rhodecode/templates/files/files_browser.html:27
-msgid "search file list"
+#, fuzzy
+msgid "Search file list"
 msgstr "Rechercher un fichier"
 
-#: rhodecode/templates/files/files_browser.html:31
-#: rhodecode/templates/shortlog/shortlog_data.html:78
-msgid "add new file"
-msgstr "Ajouter un fichier"
-
 #: rhodecode/templates/files/files_browser.html:35
 msgid "Loading file list..."
 msgstr "Chargement de la liste des fichiers…"
@@ -3872,31 +4069,41 b' msgstr "Derni\xc3\xa8re modification"'
 msgid "Last committer"
 msgstr "Dernier commiteur"
 
+#: rhodecode/templates/files/files_edit.html:4
+#, fuzzy, python-format
+msgid "%s Files Edit"
+msgstr "Fichiers de %s"
+
 #: rhodecode/templates/files/files_edit.html:19
-msgid "edit file"
+#, fuzzy
+msgid "Edit file"
 msgstr "Éditer le fichier"
 
-#: rhodecode/templates/files/files_edit.html:49
+#: rhodecode/templates/files/files_edit.html:47
 #: rhodecode/templates/files/files_source.html:23
-msgid "show annotation"
+#, fuzzy
+msgid "Show annotation"
 msgstr "Afficher les annotations"
 
-#: rhodecode/templates/files/files_edit.html:50
+#: 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"
+#, fuzzy
+msgid "Show as raw"
 msgstr "montrer le fichier brut"
 
-#: rhodecode/templates/files/files_edit.html:51
+#: rhodecode/templates/files/files_edit.html:49
 #: rhodecode/templates/files/files_source.html:26
-msgid "download as raw"
+#, fuzzy
+msgid "Download as raw"
 msgstr "télécharger le fichier brut"
 
-#: rhodecode/templates/files/files_edit.html:54
-msgid "source"
+#: rhodecode/templates/files/files_edit.html:52
+#, fuzzy
+msgid "Source"
 msgstr "Source"
 
-#: rhodecode/templates/files/files_edit.html:59
+#: rhodecode/templates/files/files_edit.html:57
 msgid "Editing file"
 msgstr "Édition du fichier"
 
@@ -3905,16 +4112,18 b' msgid "History"'
 msgstr "Historique"
 
 #: rhodecode/templates/files/files_history_box.html:9
-msgid "diff to revision"
+#, fuzzy
+msgid "Diff to revision"
 msgstr "Diff avec la révision"
 
 #: rhodecode/templates/files/files_history_box.html:10
-msgid "show at revision"
+#, fuzzy
+msgid "Show at revision"
 msgstr "Afficher à la révision"
 
 #: rhodecode/templates/files/files_history_box.html:11
 #, fuzzy
-msgid "show full history"
+msgid "Show full history"
 msgstr "Chargement de la liste des fichiers…"
 
 #: rhodecode/templates/files/files_history_box.html:16
@@ -3930,17 +4139,19 b' msgid "Load file history"'
 msgstr "Chargement de la liste des fichiers…"
 
 #: rhodecode/templates/files/files_source.html:21
-msgid "show source"
+#, fuzzy
+msgid "Show source"
 msgstr "montrer les sources"
 
 #: rhodecode/templates/files/files_source.html:29
 #, fuzzy, python-format
-msgid "edit on branch:%s"
+msgid "Edit on branch:%s"
 msgstr "Dépôt %s supprimé"
 
 #: rhodecode/templates/files/files_source.html:31
-msgid "edit on branch:?"
-msgstr ""
+#, fuzzy
+msgid "Edit on branch:?"
+msgstr "Dépôt %s supprimé"
 
 #: rhodecode/templates/files/files_source.html:31
 msgid "Editing files allowed only when on branch head revision"
@@ -3972,9 +4183,11 b' msgstr "Aucun fichier \xc3\xa0 cet endroit"'
 msgid "%s Followers"
 msgstr "Followers de %s"
 
-#: rhodecode/templates/followers/followers.html:13
-msgid "followers"
-msgstr "followers"
+#: rhodecode/templates/followers/followers.html:9
+#: rhodecode/templates/summary/summary.html:183
+#: rhodecode/templates/summary/summary.html:184
+msgid "Followers"
+msgstr "Followers"
 
 #: rhodecode/templates/followers/followers_data.html:12
 msgid "Started following -"
@@ -3985,32 +4198,33 b' msgstr "A commenc\xc3\xa9 \xc3\xa0 suivre le d\xc3\xa9p\xc3\xb4t\xc2\xa0:"'
 msgid "%s Fork"
 msgstr "Fork de %s"
 
-#: rhodecode/templates/forks/fork.html:31
+#: rhodecode/templates/forks/fork.html:28
 msgid "Fork name"
 msgstr "Nom du fork"
 
-#: rhodecode/templates/forks/fork.html:68
+#: rhodecode/templates/forks/fork.html:65
 msgid "Private"
 msgstr "Privé"
 
-#: rhodecode/templates/forks/fork.html:77
+#: rhodecode/templates/forks/fork.html:74
 msgid "Copy permissions"
 msgstr "Copier les permissions"
 
-#: rhodecode/templates/forks/fork.html:81
+#: rhodecode/templates/forks/fork.html:78
 msgid "Copy permissions from forked repository"
 msgstr "Copier les permissions depuis le dépôt forké"
 
-#: rhodecode/templates/forks/fork.html:86
+#: rhodecode/templates/forks/fork.html:84
 msgid "Update after clone"
 msgstr "MÀJ après le clonage"
 
-#: rhodecode/templates/forks/fork.html:90
+#: rhodecode/templates/forks/fork.html:88
 msgid "Checkout source after making a clone"
 msgstr "Mettre à jour depuis la source après clonage"
 
-#: rhodecode/templates/forks/fork.html:94
-msgid "fork this repository"
+#: rhodecode/templates/forks/fork.html:93
+#, fuzzy
+msgid "Fork this repository"
 msgstr "Forker ce dépôt"
 
 #: rhodecode/templates/forks/forks.html:5
@@ -4018,18 +4232,17 b' msgstr "Forker ce d\xc3\xa9p\xc3\xb4t"'
 msgid "%s Forks"
 msgstr "Forks de %s"
 
-#: rhodecode/templates/forks/forks.html:13
-msgid "forks"
-msgstr "forks"
+#: rhodecode/templates/forks/forks.html:9
+#: rhodecode/templates/summary/summary.html:189
+#: rhodecode/templates/summary/summary.html:190
+msgid "Forks"
+msgstr "Forks"
 
 #: rhodecode/templates/forks/forks_data.html:17
-msgid "forked"
+#, fuzzy
+msgid "Forked"
 msgstr "forké"
 
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
-msgstr "Comparer le fork"
-
 #: rhodecode/templates/forks/forks_data.html:42
 msgid "There are no forks yet"
 msgstr "Il n’y a pas encore de forks."
@@ -4043,21 +4256,15 b' msgid "RSS journal feed"'
 msgstr "Flux RSS du journal"
 
 #: rhodecode/templates/journal/journal.html:32
-#: rhodecode/templates/pullrequests/pullrequest.html:55
 msgid "Refresh"
 msgstr "Rafraîchir"
 
 #: rhodecode/templates/journal/journal.html:35
 #: rhodecode/templates/journal/public_journal.html:24
-msgid "RSS feed"
-msgstr "Flux RSS"
-
-#: rhodecode/templates/journal/journal.html:38
-#: rhodecode/templates/journal/public_journal.html:27
 msgid "ATOM feed"
 msgstr "Flux ATOM"
 
-#: rhodecode/templates/journal/journal.html:54
+#: rhodecode/templates/journal/journal.html:51
 msgid "Watched"
 msgstr "Surveillé"
 
@@ -4065,6 +4272,11 b' msgstr "Surveill\xc3\xa9"'
 msgid "No entries yet"
 msgstr "Aucune entrée pour le moment"
 
+#: rhodecode/templates/journal/public_journal.html:4
+#: rhodecode/templates/journal/public_journal.html:21
+msgid "Public Journal"
+msgstr "Journal public"
+
 #: rhodecode/templates/journal/public_journal.html:13
 msgid "ATOM public journal feed"
 msgstr "Flux ATOM du journal public"
@@ -4073,153 +4285,133 b' msgstr "Flux ATOM du journal public"'
 msgid "RSS public journal feed"
 msgstr "Flux RSS du journal public"
 
-#: rhodecode/templates/journal/public_journal.html:21
-msgid "Public Journal"
-msgstr "Journal public"
-
 #: rhodecode/templates/pullrequests/pullrequest.html:4
-#: rhodecode/templates/pullrequests/pullrequest.html:12
+#: rhodecode/templates/pullrequests/pullrequest.html:8
 msgid "New pull request"
 msgstr "Nouvelle requête de pull"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:54
-msgid "refresh overview"
-msgstr "Rafraîchir les informations"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:66
+#: rhodecode/templates/pullrequests/pullrequest.html:52
 msgid "Detailed compare view"
 msgstr "Comparaison détaillée"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:118
+#: rhodecode/templates/pullrequests/pullrequest.html:56
+#: rhodecode/templates/pullrequests/pullrequest_show.html:137
 msgid "Pull request reviewers"
 msgstr "Relecteurs de la requête de pull"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:130
+#: rhodecode/templates/pullrequests/pullrequest.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "owner"
 msgstr "Propriétaire"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:145
+#: rhodecode/templates/pullrequests/pullrequest.html:77
 msgid "Add reviewer to this pull request."
 msgstr "Ajouter un relecteur à cette requête de pull."
 
-#: rhodecode/templates/pullrequests/pullrequest.html:97
+#: rhodecode/templates/pullrequests/pullrequest.html:83
 msgid "Create new pull request"
 msgstr "Nouvelle requête de pull"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:106
+#: rhodecode/templates/pullrequests/pullrequest.html:92
+#: rhodecode/templates/pullrequests/pullrequest_data.html:14
 #: rhodecode/templates/pullrequests/pullrequest_show.html:25
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
 msgid "Title"
 msgstr "Titre"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:123
+#: rhodecode/templates/pullrequests/pullrequest.html:109
 msgid "Send pull request"
 msgstr "Envoyer la requête de pull"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:23
-#, python-format
-msgid "Closed %s"
-msgstr "Fermée %s"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:23
-#, python-format
-msgid "with status %s"
-msgstr "avec %s comme statut."
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:31
-msgid "Status"
-msgstr "Statut"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:36
+#: rhodecode/templates/pullrequests/pullrequest_show.html:4
+#, fuzzy, python-format
+msgid "%s Pull Request #%s"
+msgstr "%s Requête de pull #%s"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+#, fuzzy
+msgid "Review status"
+msgstr "Modifier le statut"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:40
 msgid "Pull request status"
 msgstr "Statut de la requête de pull"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:44
+#: rhodecode/templates/pullrequests/pullrequest_show.html:53
 msgid "Still not reviewed by"
 msgstr "Pas encore relue par"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:48
+#: rhodecode/templates/pullrequests/pullrequest_show.html:57
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
 msgstr[0] "%d relecteur"
 msgstr[1] "%d relecteurs"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:50
-msgid "pull request was reviewed by all reviewers"
+#: rhodecode/templates/pullrequests/pullrequest_show.html:59
+#, fuzzy
+msgid "Pull request was reviewed by all reviewers"
 msgstr "La requête de pull a été relue par tous les relecteurs."
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:56
+#: rhodecode/templates/pullrequests/pullrequest_show.html:65
 #, fuzzy
 msgid "Origin repository"
 msgstr "Dépôt Git"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:76
+#: rhodecode/templates/pullrequests/pullrequest_show.html:89
 msgid "Created on"
 msgstr "Créé le"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:83
+#: rhodecode/templates/pullrequests/pullrequest_show.html:102
 msgid "Compare view"
 msgstr "Vue de comparaison"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:130
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 #, fuzzy
 msgid "reviewer"
 msgstr "%d relecteur"
 
+#: rhodecode/templates/pullrequests/pullrequest_show.html:164
+#, fuzzy
+msgid "Add or remove reviewer to this pull request."
+msgstr "Ajouter un relecteur à cette requête de pull."
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:168
+#, fuzzy
+msgid "Save changes"
+msgstr "Aucun changement"
+
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
-msgid "all pull requests"
-msgstr "Requêtes de pull"
-
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
-msgid "All pull requests"
-msgstr "Toutes les requêtes de pull"
-
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27
-msgid "Closed"
-msgstr "Fermée"
+#, fuzzy, python-format
+msgid "%s Pull Requests"
+msgstr "%s Mes requêtes de pull"
 
 #: rhodecode/templates/search/search.html:6
-#, python-format
-msgid "Search \"%s\" in repository: %s"
-msgstr "Rechercher « %s » dans le dépôt : %s"
+#, fuzzy
+msgid "Search repository"
+msgstr "Rechercher dans le dépôt : %s"
 
 #: rhodecode/templates/search/search.html:8
-#, python-format
-msgid "Search \"%s\" in all repositories"
-msgstr "Rechercher « %s » dans tous les dépôts"
-
-#: rhodecode/templates/search/search.html:12
-#: rhodecode/templates/search/search.html:32
-#, python-format
-msgid "Search in repository: %s"
-msgstr "Rechercher dans le dépôt : %s"
-
-#: rhodecode/templates/search/search.html:14
-#: rhodecode/templates/search/search.html:34
+#: rhodecode/templates/search/search.html:16
 msgid "Search in all repositories"
 msgstr "Rechercher dans tous les dépôts"
 
-#: rhodecode/templates/search/search.html:48
+#: rhodecode/templates/search/search.html:50
 msgid "Search term"
 msgstr "Termes de la recherches"
 
-#: rhodecode/templates/search/search.html:60
+#: rhodecode/templates/search/search.html:62
 msgid "Search in"
 msgstr "Rechercher dans"
 
-#: rhodecode/templates/search/search.html:63
+#: rhodecode/templates/search/search.html:65
 msgid "File contents"
 msgstr "Le contenu des fichiers"
 
-#: rhodecode/templates/search/search.html:64
+#: rhodecode/templates/search/search.html:66
 msgid "Commit messages"
 msgstr "Les messages de commit"
 
-#: rhodecode/templates/search/search.html:65
+#: rhodecode/templates/search/search.html:67
 msgid "File names"
 msgstr "Les noms de fichiers"
 
@@ -4229,42 +4421,25 b' msgstr "Les noms de fichiers"'
 msgid "Permission denied"
 msgstr "Permission refusée"
 
-#: rhodecode/templates/settings/repo_settings.html:5
-#, python-format
-msgid "%s Settings"
-msgstr "Réglages de %s"
-
-#: rhodecode/templates/settings/repo_settings.html:102
-#, fuzzy
-msgid "Delete repository"
-msgstr "[a supprimé] le dépôt"
-
-#: rhodecode/templates/settings/repo_settings.html:109
-#, fuzzy
-msgid "Remove repo"
-msgstr "Enlever"
-
 #: rhodecode/templates/shortlog/shortlog.html:5
-#, python-format
-msgid "%s Shortlog"
-msgstr "Résumé de %s"
-
+#, fuzzy, python-format
+msgid "%s Lightweight Changelog"
+msgstr "%s fichié modifié"
+
+#: rhodecode/templates/shortlog/shortlog.html:11
 #: rhodecode/templates/shortlog/shortlog.html:15
-#: rhodecode/templates/shortlog/shortlog.html:19
-msgid "shortlog"
-msgstr "Résumé"
-
-#: rhodecode/templates/shortlog/shortlog_data.html:5
-msgid "revision"
-msgstr "Révision"
+msgid "Lightweight Changelog"
+msgstr ""
 
 #: rhodecode/templates/shortlog/shortlog_data.html:7
-msgid "age"
+#, fuzzy
+msgid "Age"
 msgstr "Âge"
 
-#: rhodecode/templates/shortlog/shortlog_data.html:8
-msgid "author"
-msgstr "Auteur"
+#: rhodecode/templates/shortlog/shortlog_data.html:20
+#, python-format
+msgid "Click to open associated pull request #%s"
+msgstr "Cliquez ici pour ouvrir la requête de pull associée #%s."
 
 #: rhodecode/templates/shortlog/shortlog_data.html:75
 msgid "Add or upload files directly via RhodeCode"
@@ -4283,157 +4458,171 b' msgstr "Le d\xc3\xa9p\xc3\xb4t existe d\xc3\xa9j\xc3\xa0\xc2\xa0?"'
 msgid "%s Summary"
 msgstr "Résumé de %s"
 
-#: rhodecode/templates/summary/summary.html:12
-msgid "summary"
-msgstr "résumé"
-
-#: rhodecode/templates/summary/summary.html:20
-#, python-format
-msgid "repo %s ATOM feed"
-msgstr "Flux ATOM du dépôt %s"
-
-#: rhodecode/templates/summary/summary.html:21
-#, python-format
-msgid "repo %s RSS feed"
-msgstr "Flux RSS du dépôt %s"
-
-#: rhodecode/templates/summary/summary.html:49
-#: rhodecode/templates/summary/summary.html:52
-msgid "ATOM"
-msgstr "ATOM"
-
-#: rhodecode/templates/summary/summary.html:70
+#: rhodecode/templates/summary/summary.html:16
+#, fuzzy, python-format
+msgid "%s ATOM feed"
+msgstr "Flux %s de"
+
+#: rhodecode/templates/summary/summary.html:17
+#, fuzzy, python-format
+msgid "%s RSS feed"
+msgstr "Flux %s de"
+
+#: rhodecode/templates/summary/summary.html:62
 #, fuzzy, python-format
 msgid "Repository locked by %s"
 msgstr "Ce dépôt n’est pas verrouillé %s."
 
-#: rhodecode/templates/summary/summary.html:72
+#: rhodecode/templates/summary/summary.html:64
 #, fuzzy
 msgid "Repository unlocked"
 msgstr "Ce dépôt n’est pas verrouillé."
 
-#: rhodecode/templates/summary/summary.html:91
+#: rhodecode/templates/summary/summary.html:83
 #, python-format
 msgid "Non changable ID %s"
 msgstr "Identifiant permanent : %s"
 
-#: rhodecode/templates/summary/summary.html:96
-msgid "public"
+#: rhodecode/templates/summary/summary.html:88
+#, fuzzy
+msgid "Public"
 msgstr "publique"
 
-#: rhodecode/templates/summary/summary.html:104
-msgid "remote clone"
+#: rhodecode/templates/summary/summary.html:88
+#: rhodecode/templates/summary/summary.html:89
+msgid "Fork of"
+msgstr "Fork de"
+
+#: rhodecode/templates/summary/summary.html:96
+#, fuzzy
+msgid "Remote clone"
 msgstr "Clone distant"
 
-#: rhodecode/templates/summary/summary.html:125
+#: rhodecode/templates/summary/summary.html:117
 msgid "Contact"
 msgstr "Contact"
 
-#: rhodecode/templates/summary/summary.html:139
+#: rhodecode/templates/summary/summary.html:131
 msgid "Clone url"
 msgstr "URL de clone"
 
-#: rhodecode/templates/summary/summary.html:142
+#: rhodecode/templates/summary/summary.html:136
 msgid "Show by Name"
 msgstr "Afficher par nom"
 
-#: rhodecode/templates/summary/summary.html:143
+#: rhodecode/templates/summary/summary.html:137
 msgid "Show by ID"
 msgstr "Afficher par ID"
 
+#: rhodecode/templates/summary/summary.html:143
+msgid "Trending files"
+msgstr "Populaires"
+
 #: rhodecode/templates/summary/summary.html:151
-msgid "Trending files"
-msgstr "Populaires"
+#: rhodecode/templates/summary/summary.html:167
+#: rhodecode/templates/summary/summary.html:232
+msgid "enable"
+msgstr "Activer"
 
 #: rhodecode/templates/summary/summary.html:159
-#: rhodecode/templates/summary/summary.html:175
-#: rhodecode/templates/summary/summary.html:203
-msgid "enable"
-msgstr "Activer"
-
-#: rhodecode/templates/summary/summary.html:167
 msgid "Download"
 msgstr "Téléchargements"
 
-#: rhodecode/templates/summary/summary.html:171
+#: rhodecode/templates/summary/summary.html:163
 msgid "There are no downloads yet"
 msgstr "Il n’y a pas encore de téléchargements proposés."
 
-#: rhodecode/templates/summary/summary.html:173
+#: rhodecode/templates/summary/summary.html:165
 msgid "Downloads are disabled for this repository"
 msgstr "Les téléchargements sont désactivés pour ce dépôt."
 
-#: rhodecode/templates/summary/summary.html:179
+#: rhodecode/templates/summary/summary.html:171
 msgid "Download as zip"
 msgstr "Télécharger en ZIP"
 
-#: rhodecode/templates/summary/summary.html:182
+#: rhodecode/templates/summary/summary.html:174
 msgid "Check this to download archive with subrepos"
 msgstr "Télécharger une archive contenant également les sous-dépôts éventuels"
 
-#: rhodecode/templates/summary/summary.html:182
+#: rhodecode/templates/summary/summary.html:174
 msgid "with subrepos"
 msgstr "avec les sous-dépôts"
 
-#: rhodecode/templates/summary/summary.html:195
+#: rhodecode/templates/summary/summary.html:197
+#, fuzzy
+msgid "Repository Size"
+msgstr "Dépôts"
+
+#: rhodecode/templates/summary/summary.html:204
+#: rhodecode/templates/summary/summary.html:206
+#, fuzzy
+msgid "Feed"
+msgstr "Flux RSS"
+
+#: rhodecode/templates/summary/summary.html:224
 msgid "Commit activity by day / author"
 msgstr "Activité de commit par jour et par auteur"
 
-#: rhodecode/templates/summary/summary.html:206
+#: rhodecode/templates/summary/summary.html:235
 msgid "Stats gathered: "
 msgstr "Statistiques obtenues :"
 
-#: rhodecode/templates/summary/summary.html:227
-msgid "Shortlog"
-msgstr "Résumé des changements"
-
-#: rhodecode/templates/summary/summary.html:229
+#: rhodecode/templates/summary/summary.html:256
+#, fuzzy
+msgid "Latest changes"
+msgstr "Dernière modification"
+
+#: rhodecode/templates/summary/summary.html:258
 msgid "Quick start"
 msgstr "Démarrage rapide"
 
-#: rhodecode/templates/summary/summary.html:243
+#: rhodecode/templates/summary/summary.html:272
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr "Fichier « Lisez-moi » à la révision « %s »"
 
-#: rhodecode/templates/summary/summary.html:246
+#: rhodecode/templates/summary/summary.html:275
 msgid "Permalink to this readme"
 msgstr "Lien permanent vers ce fichier « Lisez-moi »"
 
-#: rhodecode/templates/summary/summary.html:304
+#: rhodecode/templates/summary/summary.html:333
 #, python-format
 msgid "Download %s as %s"
 msgstr "Télécharger %s comme archive %s"
 
-#: rhodecode/templates/summary/summary.html:661
+#: rhodecode/templates/summary/summary.html:380
+msgid "files"
+msgstr "Fichiers"
+
+#: rhodecode/templates/summary/summary.html:690
 msgid "commits"
 msgstr "commits"
 
-#: rhodecode/templates/summary/summary.html:662
+#: rhodecode/templates/summary/summary.html:691
 msgid "files added"
 msgstr "fichiers ajoutés"
 
-#: rhodecode/templates/summary/summary.html:663
+#: rhodecode/templates/summary/summary.html:692
 msgid "files changed"
 msgstr "fichiers modifiés"
 
-#: rhodecode/templates/summary/summary.html:664
+#: rhodecode/templates/summary/summary.html:693
 msgid "files removed"
 msgstr "fichiers supprimés"
 
-#: rhodecode/templates/summary/summary.html:667
+#: rhodecode/templates/summary/summary.html:695
 msgid "commit"
 msgstr "commit"
 
-#: rhodecode/templates/summary/summary.html:668
+#: rhodecode/templates/summary/summary.html:696
 msgid "file added"
 msgstr "fichier ajouté"
 
-#: rhodecode/templates/summary/summary.html:669
+#: rhodecode/templates/summary/summary.html:697
 msgid "file changed"
 msgstr "fichié modifié"
 
-#: rhodecode/templates/summary/summary.html:670
+#: rhodecode/templates/summary/summary.html:698
 msgid "file removed"
 msgstr "fichier supprimé"
 
@@ -4442,7 +4631,7 b' msgstr "fichier supprim\xc3\xa9"'
 msgid "%s Tags"
 msgstr "Tags de %s"
 
-#: rhodecode/templates/tags/tags.html:29
+#: rhodecode/templates/tags/tags.html:26
 #, fuzzy
 msgid "Compare tags"
 msgstr "Comparer"

rhodecode/i18n/how_to

@@ -8,17 +8,17 b' python setup.py extract_messages <- get '
 python setup.py init_catalog -l pl <- create a language directory for <pl> lang
 #edit the new po file with poedit or any other editor
 msgfmt -f -c <updated_file.po> <- check format and errors
-python setup.py compile_catalog <- create translation files
+python setup.py compile_catalog -l pl <- create translation files
 
 ############# 
 # to update #
 #############
 
 python setup.py extract_messages <- get messages from project
-python setup.py update_catalog <- to update the translations
+python setup.py update_catalog -l pl<- to update the translations
 #edit the new updated po file with poedit
 msgfmt -f -c <updated_file.po> <- check format and errors
-python setup.py compile_catalog <- create translation files
+python setup.py compile_catalog -l pl <- create translation files
 
 
 ###################