General translation updates.

rhodecode/i18n/en/LC_MESSAGES/rhodecode.po

@@ -1,3883 +1,4068 b''
 # English translations for rhodecode.
 # Copyright (C) 2010 ORGANIZATION
 # This file is distributed under the same license as the rhodecode project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rhodecode 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-09-02 20:30+0200\n"
+"POT-Creation-Date: 2012-11-27 20:56+0100\n"
 "PO-Revision-Date: 2011-02-25 19:13+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <[e-mail]>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: rhodecode/controllers/changelog.py:94
+#: rhodecode/controllers/changelog.py:95
 msgid "All Branches"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:83
+#: rhodecode/controllers/changeset.py:84
 msgid "show white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
+#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
 msgid "ignore white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:157
+#: rhodecode/controllers/changeset.py:164
 #, python-format
 msgid "%s line context"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:333
-#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70
-msgid "binary file"
-msgstr ""
-
-#: rhodecode/controllers/changeset.py:408
+#: rhodecode/controllers/changeset.py:315
+#: rhodecode/controllers/pullrequests.py:411
+#, python-format
+msgid "Status change -> %s"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:346
 msgid ""
 "Changing status on a changeset associated witha closed pull request is "
 "not allowed"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:69
+#: rhodecode/controllers/compare.py:75
+#: rhodecode/controllers/pullrequests.py:117
 msgid "There are no changesets yet"
 msgstr ""
 
 #: rhodecode/controllers/error.py:69
 msgid "Home page"
 msgstr ""
 
 #: rhodecode/controllers/error.py:98
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr ""
 
 #: rhodecode/controllers/error.py:101
 msgid "Unauthorized access to resource"
 msgstr ""
 
 #: rhodecode/controllers/error.py:103
 msgid "You don't have permission to view this page"
 msgstr ""
 
 #: rhodecode/controllers/error.py:105
 msgid "The resource could not be found"
 msgstr ""
 
 #: rhodecode/controllers/error.py:107
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr ""
 
-#: rhodecode/controllers/feed.py:49
+#: rhodecode/controllers/feed.py:52
 #, python-format
 msgid "Changes on %s repository"
 msgstr ""
 
-#: rhodecode/controllers/feed.py:50
+#: rhodecode/controllers/feed.py:53
 #, python-format
 msgid "%s %s feed"
 msgstr ""
 
-#: rhodecode/controllers/feed.py:75
+#: rhodecode/controllers/feed.py:86
+#: rhodecode/templates/changeset/changeset.html:126
+#: rhodecode/templates/changeset/changeset.html:138
+#: rhodecode/templates/compare/compare_diff.html:62
+#: rhodecode/templates/compare/compare_diff.html:73
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+#: rhodecode/templates/pullrequests/pullrequest_show.html:153
+msgid "Changeset was too big and was cut off..."
+msgstr ""
+
+#: rhodecode/controllers/feed.py:92
 msgid "commited on"
 msgstr ""
 
-#: rhodecode/controllers/files.py:84
+#: rhodecode/controllers/files.py:86
 msgid "click here to add new file"
 msgstr ""
 
-#: rhodecode/controllers/files.py:85
+#: rhodecode/controllers/files.py:87
 #, python-format
 msgid "There are no files yet %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299
+#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:266
+#: rhodecode/controllers/files.py:292
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:271
+#: rhodecode/controllers/files.py:297
 msgid "No changes"
 msgstr ""
 
-#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346
+#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372
 #, python-format
 msgid "Successfully committed to %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352
+#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/controllers/files.py:318
+#: rhodecode/controllers/files.py:344
 #, python-format
 msgid "Added %s via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:332
+#: rhodecode/controllers/files.py:358
 msgid "No content"
 msgstr ""
 
-#: rhodecode/controllers/files.py:336
+#: rhodecode/controllers/files.py:362
 msgid "No filename"
 msgstr ""
 
-#: rhodecode/controllers/files.py:378
+#: rhodecode/controllers/files.py:404
 msgid "downloads disabled"
 msgstr ""
 
-#: rhodecode/controllers/files.py:389
+#: rhodecode/controllers/files.py:415
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:391
+#: rhodecode/controllers/files.py:417
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/controllers/files.py:393
+#: rhodecode/controllers/files.py:419
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/controllers/files.py:494
+#: rhodecode/controllers/files.py:564
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72
-#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543
+#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76
+#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76
-#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554
+#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80
+#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90
+#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
 "the filesystem please run the application again in order to rescan "
 "repositories"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72
+#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
 "the file system please run the application again in order to rescan "
 "repositories"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:167
+#: rhodecode/controllers/forks.py:168
 #, python-format
 msgid "forked %s repository as %s"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:181
+#: rhodecode/controllers/forks.py:182
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239
-msgid "public journal"
-msgstr ""
-
 #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243
-#: rhodecode/templates/base/base.html:220
+msgid "public journal"
+msgstr ""
+
+#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247
+#: rhodecode/templates/base/base.html:232
 msgid "journal"
 msgstr ""
 
 #: rhodecode/controllers/login.py:143
 msgid "You have successfully registered into rhodecode"
 msgstr ""
 
 #: rhodecode/controllers/login.py:164
 msgid "Your password reset link was sent"
 msgstr ""
 
 #: rhodecode/controllers/login.py:184
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549
+#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:158
+#: rhodecode/controllers/pullrequests.py:186
 msgid "Pull request requires a title with min. 3 chars"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:160
+#: rhodecode/controllers/pullrequests.py:188
 msgid "error during creation of pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:181
+#: rhodecode/controllers/pullrequests.py:220
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:184
+#: rhodecode/controllers/pullrequests.py:223
 msgid "Error occurred during sending pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:217
+#: rhodecode/controllers/pullrequests.py:256
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/controllers/search.py:131
+#: rhodecode/controllers/search.py:134
 msgid "Invalid search query. Try quoting it."
 msgstr ""
 
-#: rhodecode/controllers/search.py:136
+#: rhodecode/controllers/search.py:139
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr ""
 
-#: rhodecode/controllers/search.py:140
+#: rhodecode/controllers/search.py:143
 msgid "An error occurred during this search operation"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:107
-#: rhodecode/controllers/admin/repos.py:266
+#: rhodecode/controllers/settings.py:108
+#: rhodecode/controllers/admin/repos.py:267
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:125
-#: rhodecode/controllers/admin/repos.py:284
+#: rhodecode/controllers/settings.py:126
+#: rhodecode/controllers/admin/repos.py:285
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:143
-#: rhodecode/controllers/admin/repos.py:302
+#: rhodecode/controllers/settings.py:144
+#: rhodecode/controllers/admin/repos.py:303
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from "
 "the filesystem please run the application again in order to rescan "
 "repositories"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:155
-#: rhodecode/controllers/admin/repos.py:314
+#: rhodecode/controllers/settings.py:156
+#: rhodecode/controllers/admin/repos.py:315
 #, python-format
 msgid "deleted repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:159
-#: rhodecode/controllers/admin/repos.py:324
-#: rhodecode/controllers/admin/repos.py:330
+#: rhodecode/controllers/settings.py:160
+#: rhodecode/controllers/admin/repos.py:325
+#: rhodecode/controllers/admin/repos.py:331
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:138
+#: rhodecode/controllers/settings.py:179
+msgid "unlocked"
+msgstr ""
+
+#: rhodecode/controllers/settings.py:182
+msgid "locked"
+msgstr ""
+
+#: rhodecode/controllers/settings.py:184
+#, python-format
+msgid "Repository has been %s"
+msgstr ""
+
+#: rhodecode/controllers/settings.py:188
+#: rhodecode/controllers/admin/repos.py:423
+msgid "An error occurred during unlocking"
+msgstr ""
+
+#: rhodecode/controllers/summary.py:140
 msgid "No data loaded yet"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:142
-#: rhodecode/templates/summary/summary.html:148
+#: rhodecode/controllers/summary.py:144
+#: rhodecode/templates/summary/summary.html:157
 msgid "Statistics are disabled for this repository"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:50
 msgid "BASE"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:51
 msgid "ONELEVEL"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:52
 msgid "SUBTREE"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:56
 msgid "NEVER"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:57
 msgid "ALLOW"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:58
 msgid "TRY"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:59
 msgid "DEMAND"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:60
 msgid "HARD"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:64
 msgid "No encryption"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:65
 msgid "LDAPS connection"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:66
 msgid "START_TLS on LDAP connection"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:126
 msgid "Ldap settings updated successfully"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:130
 msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:147
 msgid "error occurred during update of ldap settings"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:59
 msgid "None"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:60
 msgid "Read"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:61
 msgid "Write"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:62
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
 #: rhodecode/templates/admin/repos/repo_add.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:9
 #: rhodecode/templates/admin/repos/repos.html: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/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:122
+#: rhodecode/templates/admin/users/user_edit.html:126
 #: rhodecode/templates/admin/users/users.html:9
 #: 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:197
-#: rhodecode/templates/base/base.html:337
-#: rhodecode/templates/base/base.html:339
-#: rhodecode/templates/base/base.html:341
+#: rhodecode/templates/base/base.html:349
+#: rhodecode/templates/base/base.html:351
+#: rhodecode/templates/base/base.html:353
 msgid "Admin"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:65
 msgid "disabled"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:67
 msgid "allowed with manual account activation"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:69
 msgid "allowed with automatic account activation"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:71
 #: rhodecode/controllers/admin/permissions.py:74
 msgid "Disabled"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:72
 #: rhodecode/controllers/admin/permissions.py:75
 msgid "Enabled"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:116
 msgid "Default permissions updated successfully"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:130
 msgid "error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:123
+#: rhodecode/controllers/admin/repos.py:124
 msgid "--REMOVE FORK--"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:192
+#: rhodecode/controllers/admin/repos.py:193
 #, python-format
 msgid "created repository %s from %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:196
+#: rhodecode/controllers/admin/repos.py:197
 #, python-format
 msgid "created repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:227
+#: rhodecode/controllers/admin/repos.py:228
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:319
+#: rhodecode/controllers/admin/repos.py:320
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:348
+#: rhodecode/controllers/admin/repos.py:349
 msgid "An error occurred during deletion of repository user"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:367
+#: rhodecode/controllers/admin/repos.py:368
 msgid "An error occurred during deletion of repository users groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:385
+#: rhodecode/controllers/admin/repos.py:386
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:402
+#: rhodecode/controllers/admin/repos.py:403
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:422
-msgid "An error occurred during unlocking"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:442
+#: rhodecode/controllers/admin/repos.py:443
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:446
+#: rhodecode/controllers/admin/repos.py:447
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299
+#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300
 msgid "Token mismatch"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:464
+#: rhodecode/controllers/admin/repos.py:465
 msgid "Pulled from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:466
+#: rhodecode/controllers/admin/repos.py:467
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:482
+#: rhodecode/controllers/admin/repos.py:483
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:484
+#: rhodecode/controllers/admin/repos.py:485
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:488
+#: rhodecode/controllers/admin/repos.py:489
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:116
+#: rhodecode/controllers/admin/repos_groups.py:120
 #, python-format
 msgid "created repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:129
+#: rhodecode/controllers/admin/repos_groups.py:133
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:163
+#: rhodecode/controllers/admin/repos_groups.py:167
 #, python-format
 msgid "updated repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:176
+#: rhodecode/controllers/admin/repos_groups.py:180
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:194
+#: rhodecode/controllers/admin/repos_groups.py:198
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:202
+#: rhodecode/controllers/admin/repos_groups.py:206
 #, python-format
 msgid "removed repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:208
+#: rhodecode/controllers/admin/repos_groups.py:212
 msgid "Cannot delete this group it still contains subgroups"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:213
-#: rhodecode/controllers/admin/repos_groups.py:218
+#: rhodecode/controllers/admin/repos_groups.py:217
+#: rhodecode/controllers/admin/repos_groups.py:222
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:238
+#: rhodecode/controllers/admin/repos_groups.py:243
 msgid "An error occurred during deletion of group user"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:258
+#: rhodecode/controllers/admin/repos_groups.py:264
 msgid "An error occurred during deletion of group users groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:121
+#: rhodecode/controllers/admin/settings.py:123
 #, python-format
 msgid "Repositories successfully rescanned added: %s,removed: %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:129
+#: rhodecode/controllers/admin/settings.py:131
 msgid "Whoosh reindex task scheduled"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:160
+#: rhodecode/controllers/admin/settings.py:162
 msgid "Updated application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:164
-#: rhodecode/controllers/admin/settings.py:275
+#: rhodecode/controllers/admin/settings.py:166
+#: rhodecode/controllers/admin/settings.py:299
 msgid "error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:200
+#: rhodecode/controllers/admin/settings.py:207
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:205
+#: rhodecode/controllers/admin/settings.py:212
 msgid "error occurred during updating visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:271
+#: rhodecode/controllers/admin/settings.py:295
 msgid "Updated VCS settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:285
+#: rhodecode/controllers/admin/settings.py:309
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:297
+#: rhodecode/controllers/admin/settings.py:321
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:301
+#: rhodecode/controllers/admin/settings.py:325
 msgid "error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:320
+#: rhodecode/controllers/admin/settings.py:344
 msgid "Email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:375
+#: rhodecode/controllers/admin/settings.py:399
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:406
+#: rhodecode/controllers/admin/settings.py:430
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:421
-#: rhodecode/controllers/admin/users.py:191
+#: rhodecode/controllers/admin/settings.py:445
+#: rhodecode/controllers/admin/users.py:196
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:130
 #, python-format
 msgid "created user %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:171
+#: rhodecode/controllers/admin/users.py:176
 msgid "User updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:207
-msgid "successfully deleted user"
-msgstr ""
-
 #: rhodecode/controllers/admin/users.py:212
+msgid "successfully deleted user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:217
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:226
+#: rhodecode/controllers/admin/users.py:231
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:266
+#: rhodecode/controllers/admin/users.py:272
 msgid "Granted 'repository create' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:271
-msgid "Revoked 'repository create' permission to user"
-msgstr ""
-
 #: rhodecode/controllers/admin/users.py:277
+msgid "Revoked 'repository create' permission to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:283
 msgid "Granted 'repository fork' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:282
-msgid "Revoked 'repository fork' permission to user"
-msgstr ""
-
 #: rhodecode/controllers/admin/users.py:288
-#: rhodecode/controllers/admin/users_groups.py:255
+msgid "Revoked 'repository fork' permission to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users_groups.py:279
 msgid "An error occurred during permissions saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:303
-#, python-format
-msgid "Added email %s to user"
-msgstr ""
-
 #: rhodecode/controllers/admin/users.py:309
+#, python-format
+msgid "Added email %s to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:315
 msgid "An error occurred during email saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:319
+#: rhodecode/controllers/admin/users.py:325
 msgid "Removed email from user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:84
+#: rhodecode/controllers/admin/users_groups.py:86
 #, python-format
 msgid "created users group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:95
+#: 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:135
+#: rhodecode/controllers/admin/users_groups.py:164
 #, python-format
 msgid "updated users group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:157
+#: rhodecode/controllers/admin/users_groups.py:186
 #, python-format
 msgid "error occurred during update of users group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:174
+#: rhodecode/controllers/admin/users_groups.py:203
 msgid "successfully deleted users group"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:179
+#: rhodecode/controllers/admin/users_groups.py:208
 msgid "An error occurred during deletion of users group"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:233
+#: rhodecode/controllers/admin/users_groups.py:257
 msgid "Granted 'repository create' permission to users group"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:238
+#: rhodecode/controllers/admin/users_groups.py:262
 msgid "Revoked 'repository create' permission to users group"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:244
+#: rhodecode/controllers/admin/users_groups.py:268
 msgid "Granted 'repository fork' permission to users group"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:249
+#: rhodecode/controllers/admin/users_groups.py:273
 msgid "Revoked 'repository fork' permission to users group"
 msgstr ""
 
 #: rhodecode/lib/auth.py:499
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
 #: rhodecode/lib/auth.py:540
 msgid "You need to be a signed in to view this page"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:86
+#: rhodecode/lib/diffs.py:74
+msgid "binary file"
+msgstr ""
+
+#: rhodecode/lib/diffs.py:90
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:96
+#: rhodecode/lib/diffs.py:100
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:372
+#: rhodecode/lib/helpers.py:373
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:484
+#: rhodecode/lib/helpers.py:485
 msgid "True"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:488
+#: rhodecode/lib/helpers.py:489
 msgid "False"
 msgstr ""
 
+#: rhodecode/lib/helpers.py:529
+#, python-format
+msgid "Deleted branch: %s"
+msgstr ""
+
 #: rhodecode/lib/helpers.py:532
+#, python-format
+msgid "Created tag: %s"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:545
 msgid "Changeset not found"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:555
+#: rhodecode/lib/helpers.py:588
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:561
+#: rhodecode/lib/helpers.py:594
 msgid "compare view"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:581
+#: rhodecode/lib/helpers.py:614
 msgid "and"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:582
+#: rhodecode/lib/helpers.py:615
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48
+#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51
 msgid "revisions"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:606
-msgid "fork name "
-msgstr ""
-
-#: rhodecode/lib/helpers.py:620
+#: rhodecode/lib/helpers.py:640
+#, python-format
+msgid "fork name %s"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:653
 #: 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:626
+#: rhodecode/lib/helpers.py:659
 msgid "[deleted] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638
+#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671
 msgid "[created] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:630
+#: rhodecode/lib/helpers.py:663
 msgid "[created] repository as fork"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640
+#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673
 msgid "[forked] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642
+#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675
 msgid "[updated] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:636
+#: rhodecode/lib/helpers.py:669
 msgid "[delete] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:644
+#: rhodecode/lib/helpers.py:677
 msgid "[created] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:646
+#: rhodecode/lib/helpers.py:679
 msgid "[updated] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:648
+#: rhodecode/lib/helpers.py:681
 msgid "[created] users group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:650
+#: rhodecode/lib/helpers.py:683
 msgid "[updated] users group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:652
+#: rhodecode/lib/helpers.py:685
 msgid "[commented] on revision in repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:654
+#: rhodecode/lib/helpers.py:687
 msgid "[commented] on pull request for"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:656
+#: rhodecode/lib/helpers.py:689
 msgid "[closed] pull request for"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:658
+#: rhodecode/lib/helpers.py:691
 msgid "[pushed] into"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:660
+#: rhodecode/lib/helpers.py:693
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:662
+#: rhodecode/lib/helpers.py:695
 msgid "[pulled from remote] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:664
+#: rhodecode/lib/helpers.py:697
 msgid "[pulled] from"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:666
+#: rhodecode/lib/helpers.py:699
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:668
+#: rhodecode/lib/helpers.py:701
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:840
+#: rhodecode/lib/helpers.py:877
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:844
+#: rhodecode/lib/helpers.py:881
 msgid "No Files"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:335
+#: rhodecode/lib/utils2.py:403
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:336
+#: rhodecode/lib/utils2.py:404
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:337
+#: rhodecode/lib/utils2.py:405
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:338
+#: rhodecode/lib/utils2.py:406
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:339
+#: rhodecode/lib/utils2.py:407
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:340
+#: rhodecode/lib/utils2.py:408
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:355
+#: rhodecode/lib/utils2.py:424
+#, python-format
+msgid "in %s"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:426
 #, python-format
 msgid "%s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:357
+#: 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:360
+#: rhodecode/lib/utils2.py:434
 msgid "just now"
 msgstr ""
 
-#: rhodecode/lib/celerylib/tasks.py:269
+#: rhodecode/lib/celerylib/tasks.py:270
 msgid "password reset link"
 msgstr ""
 
 #: rhodecode/model/comment.py:110
 #, python-format
 msgid "on line %s"
 msgstr ""
 
-#: rhodecode/model/comment.py:157
+#: rhodecode/model/comment.py:173
 msgid "[Mention]"
 msgstr ""
 
-#: rhodecode/model/db.py:1140
+#: rhodecode/model/db.py:1163
 msgid "Repository no access"
 msgstr ""
 
-#: rhodecode/model/db.py:1141
+#: rhodecode/model/db.py:1164
 msgid "Repository read access"
 msgstr ""
 
-#: rhodecode/model/db.py:1142
+#: rhodecode/model/db.py:1165
 msgid "Repository write access"
 msgstr ""
 
-#: rhodecode/model/db.py:1143
+#: rhodecode/model/db.py:1166
 msgid "Repository admin access"
 msgstr ""
 
-#: rhodecode/model/db.py:1145
+#: rhodecode/model/db.py:1168
 msgid "Repositories Group no access"
 msgstr ""
 
-#: rhodecode/model/db.py:1146
+#: rhodecode/model/db.py:1169
 msgid "Repositories Group read access"
 msgstr ""
 
-#: rhodecode/model/db.py:1147
+#: rhodecode/model/db.py:1170
 msgid "Repositories Group write access"
 msgstr ""
 
-#: rhodecode/model/db.py:1148
+#: rhodecode/model/db.py:1171
 msgid "Repositories Group admin access"
 msgstr ""
 
-#: rhodecode/model/db.py:1150
+#: rhodecode/model/db.py:1173
 msgid "RhodeCode Administrator"
 msgstr ""
 
-#: rhodecode/model/db.py:1151
+#: rhodecode/model/db.py:1174
 msgid "Repository creation disabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1152
+#: rhodecode/model/db.py:1175
 msgid "Repository creation enabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1153
+#: rhodecode/model/db.py:1176
 msgid "Repository forking disabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1154
+#: rhodecode/model/db.py:1177
 msgid "Repository forking enabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1155
+#: rhodecode/model/db.py:1178
 msgid "Register disabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1156
+#: rhodecode/model/db.py:1179
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1159
+#: rhodecode/model/db.py:1182
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1579
+#: rhodecode/model/db.py:1623
 msgid "Not Reviewed"
 msgstr ""
 
-#: rhodecode/model/db.py:1580
+#: rhodecode/model/db.py:1624
 msgid "Approved"
 msgstr ""
 
-#: rhodecode/model/db.py:1581
+#: rhodecode/model/db.py:1625
 msgid "Rejected"
 msgstr ""
 
-#: rhodecode/model/db.py:1582
+#: rhodecode/model/db.py:1626
 msgid "Under Review"
 msgstr ""
 
 #: rhodecode/model/forms.py:43
 msgid "Please enter a login"
 msgstr ""
 
 #: rhodecode/model/forms.py:44
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
 #: rhodecode/model/forms.py:52
 msgid "Please enter a password"
 msgstr ""
 
 #: rhodecode/model/forms.py:53
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
 #: rhodecode/model/notification.py:220
-msgid "commented on commit"
+#, python-format
+msgid "commented on commit at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:221
-msgid "sent message"
+#, python-format
+msgid "sent message at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:222
-msgid "mentioned you"
+#, python-format
+msgid "mentioned you at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:223
-msgid "registered in RhodeCode"
+#, python-format
+msgid "registered in RhodeCode at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:224
-msgid "opened new pull request"
+#, python-format
+msgid "opened new pull request at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:225
-msgid "commented on pull request"
-msgstr ""
-
-#: rhodecode/model/pull_request.py:84
+#, python-format
+msgid "commented on pull request at %(when)s"
+msgstr ""
+
+#: rhodecode/model/pull_request.py:90
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:535
+#: rhodecode/model/scm.py:542
 msgid "latest tip"
 msgstr ""
 
 #: rhodecode/model/user.py:230
 msgid "new user registration"
 msgstr ""
 
-#: rhodecode/model/user.py:255 rhodecode/model/user.py:277
-#: rhodecode/model/user.py:299
+#: rhodecode/model/user.py:255 rhodecode/model/user.py:279
+#: rhodecode/model/user.py:301
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:323
+#: rhodecode/model/user.py:325
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:329
+#: rhodecode/model/user.py:331
 #, 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:35 rhodecode/model/validators.py:36
+#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37
 msgid "Value cannot be an empty list"
 msgstr ""
 
-#: rhodecode/model/validators.py:82
+#: rhodecode/model/validators.py:83
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:84
+#: rhodecode/model/validators.py:85
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr ""
 
-#: rhodecode/model/validators.py:86
+#: rhodecode/model/validators.py:87
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
 msgstr ""
 
-#: rhodecode/model/validators.py:114
+#: rhodecode/model/validators.py:115
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:133
-msgid "Invalid users group name"
-msgstr ""
-
 #: rhodecode/model/validators.py:134
+msgid "Invalid users group name"
+msgstr ""
+
+#: rhodecode/model/validators.py:135
 #, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:136
+#: rhodecode/model/validators.py:137
 msgid ""
 "users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 
-#: rhodecode/model/validators.py:174
+#: rhodecode/model/validators.py:175
 msgid "Cannot assign this group as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:175
+#: rhodecode/model/validators.py:176
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:177
+#: rhodecode/model/validators.py:178
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:235
+#: rhodecode/model/validators.py:236
 msgid "Invalid characters (non-ascii) in password"
 msgstr ""
 
-#: rhodecode/model/validators.py:250
+#: rhodecode/model/validators.py:251
 msgid "Passwords do not match"
 msgstr ""
 
-#: rhodecode/model/validators.py:267
-msgid "invalid password"
-msgstr ""
-
 #: rhodecode/model/validators.py:268
-msgid "invalid user name"
+msgid "invalid password"
 msgstr ""
 
 #: rhodecode/model/validators.py:269
+msgid "invalid user name"
+msgstr ""
+
+#: rhodecode/model/validators.py:270
 msgid "Your account is disabled"
 msgstr ""
 
-#: rhodecode/model/validators.py:313
+#: rhodecode/model/validators.py:314
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr ""
 
-#: rhodecode/model/validators.py:315
-#, python-format
-msgid "Repository named %(repo)s already exists"
-msgstr ""
-
 #: rhodecode/model/validators.py:316
 #, python-format
+msgid "Repository named %(repo)s already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:317
+#, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:318
+#: rhodecode/model/validators.py:319
 #, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:431
-msgid "invalid clone url"
-msgstr ""
-
 #: rhodecode/model/validators.py:432
+msgid "invalid clone url"
+msgstr ""
+
+#: rhodecode/model/validators.py:433
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 
-#: rhodecode/model/validators.py:457
+#: rhodecode/model/validators.py:458
 msgid "Fork have to be the same type as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:478
+#: rhodecode/model/validators.py:473
+msgid "You don't have permissions to create repository in this group"
+msgstr ""
+
+#: rhodecode/model/validators.py:498
 msgid "This username or users group name is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:562
+#: rhodecode/model/validators.py:582
 msgid "This is not a valid path"
 msgstr ""
 
-#: rhodecode/model/validators.py:577
-msgid "This e-mail address is already taken"
-msgstr ""
-
 #: rhodecode/model/validators.py:597
+msgid "This e-mail address is already taken"
+msgstr ""
+
+#: rhodecode/model/validators.py:617
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
-#: rhodecode/model/validators.py:634
+#: rhodecode/model/validators.py:654
 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:653
+#: rhodecode/model/validators.py:673
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/repo_switcher_list.html:4
 #: 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/branches/branches.html:9
 #: rhodecode/templates/journal/journal.html:40
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
 msgstr ""
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:221
+#: rhodecode/templates/base/base.html:233
 msgid "repositories"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:13
 #: rhodecode/templates/index_base.html:15
 #: rhodecode/templates/admin/repos/repos.html:21
 msgid "ADD REPOSITORY"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:29
+#: rhodecode/templates/index_base.html:136
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
 #: rhodecode/templates/admin/users_groups/users_group_add.html:32
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33
 msgid "Group name"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/index_base.html:142
-#: rhodecode/templates/index_base.html:168
+#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/index_base.html:138
+#: rhodecode/templates/index_base.html:176
+#: rhodecode/templates/index_base.html:266
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:72
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
 #: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:66
-#: rhodecode/templates/summary/summary.html:105
+#: rhodecode/templates/summary/summary.html:114
 msgid "Description"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:40
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47
 msgid "Repositories group"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:70
-#: rhodecode/templates/index_base.html:166
+#: rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:174
+#: rhodecode/templates/index_base.html:264
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
 #: rhodecode/templates/admin/repos/repos.html:70
-#: rhodecode/templates/admin/users/user_edit.html:192
+#: rhodecode/templates/admin/users/user_edit.html:196
 #: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:157
-#: rhodecode/templates/admin/users/user_edit_my_account.html:193
+#: rhodecode/templates/admin/users/user_edit_my_account.html:180
+#: rhodecode/templates/admin/users/user_edit_my_account.html:216
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:184
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:51
+#: rhodecode/templates/branches/branches.html:50
+#: rhodecode/templates/branches/branches_data.html:6
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:59
-#: rhodecode/templates/journal/journal.html:107
-#: rhodecode/templates/journal/journal.html:186
+#: rhodecode/templates/journal/journal.html:62
+#: rhodecode/templates/journal/journal.html:168
+#: rhodecode/templates/journal/journal_page_repos.html:7
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:123
-#: rhodecode/templates/tags/tags.html:36
+#: rhodecode/templates/summary/summary.html:132
+#: rhodecode/templates/tags/tags.html:51
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:72
-msgid "Last change"
-msgstr ""
-
 #: rhodecode/templates/index_base.html:73
-#: rhodecode/templates/index_base.html:171
-#: rhodecode/templates/admin/users/user_edit_my_account.html:159
-#: rhodecode/templates/journal/journal.html:188
-msgid "Tip"
+msgid "Last change"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:74
-#: rhodecode/templates/index_base.html:173
+#: rhodecode/templates/index_base.html:179
+#: rhodecode/templates/admin/users/user_edit_my_account.html:182
+#: rhodecode/templates/journal/journal.html:170
+msgid "Tip"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:75
+#: rhodecode/templates/index_base.html:181
+#: rhodecode/templates/index_base.html:269
 #: rhodecode/templates/admin/repos/repo_edit.html:121
 #: rhodecode/templates/admin/repos/repos.html:73
 msgid "Owner"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:75
-#: rhodecode/templates/summary/summary.html:48
-#: rhodecode/templates/summary/summary.html:51
-msgid "RSS"
-msgstr ""
-
 #: rhodecode/templates/index_base.html:76
+#: rhodecode/templates/summary/summary.html:48
+#: rhodecode/templates/summary/summary.html:51
+msgid "RSS"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:77
 msgid "Atom"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:110
-#: rhodecode/templates/index_base.html:112
-#, python-format
-msgid "Subscribe to %s rss feed"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:117
-#: rhodecode/templates/index_base.html:119
-#, python-format
-msgid "Subscribe to %s atom feed"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:140
-msgid "Group Name"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:158
-#: rhodecode/templates/index_base.html:198
+#: rhodecode/templates/index_base.html:167
+#: rhodecode/templates/index_base.html:207
+#: rhodecode/templates/index_base.html:291
 #: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:179
+#: rhodecode/templates/admin/users/user_edit_my_account.html:202
 #: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:211
-#: rhodecode/templates/tags/tags.html:60
+#: rhodecode/templates/branches/branches.html:76
+#: rhodecode/templates/journal/journal.html:193
+#: rhodecode/templates/tags/tags.html:77
 msgid "Click to sort ascending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:159
-#: rhodecode/templates/index_base.html:199
+#: rhodecode/templates/index_base.html:168
+#: rhodecode/templates/index_base.html:208
+#: rhodecode/templates/index_base.html:292
 #: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:180
+#: rhodecode/templates/admin/users/user_edit_my_account.html:203
 #: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
-#: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:212
-#: rhodecode/templates/tags/tags.html:61
+#: rhodecode/templates/branches/branches.html:77
+#: rhodecode/templates/journal/journal.html:194
+#: rhodecode/templates/tags/tags.html:78
 msgid "Click to sort descending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:169
+#: rhodecode/templates/index_base.html:177
+#: rhodecode/templates/index_base.html:267
 msgid "Last Change"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:200
+#: rhodecode/templates/index_base.html:209
+#: rhodecode/templates/index_base.html:293
 #: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:181
+#: rhodecode/templates/admin/users/user_edit_my_account.html:204
 #: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
-#: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:213
-#: rhodecode/templates/tags/tags.html:62
+#: rhodecode/templates/branches/branches.html:78
+#: rhodecode/templates/journal/journal.html:195
+#: rhodecode/templates/tags/tags.html:79
 msgid "No records found."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:201
+#: rhodecode/templates/index_base.html:210
+#: rhodecode/templates/index_base.html:294
 #: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:182
+#: rhodecode/templates/admin/users/user_edit_my_account.html:205
 #: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
-#: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:214
-#: rhodecode/templates/tags/tags.html:63
+#: rhodecode/templates/branches/branches.html:79
+#: rhodecode/templates/journal/journal.html:196
+#: rhodecode/templates/tags/tags.html:80
 msgid "Data error."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:202
+#: rhodecode/templates/index_base.html:211
+#: rhodecode/templates/index_base.html:295
 #: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:183
+#: rhodecode/templates/admin/users/user_edit_my_account.html:206
 #: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
-#: rhodecode/templates/branches/branches.html:81
-#: rhodecode/templates/journal/journal.html:215
-#: rhodecode/templates/tags/tags.html:64
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:54
+#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/tags/tags.html:81
 msgid "Loading..."
 msgstr ""
 
 #: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
 msgid "Sign In"
 msgstr ""
 
 #: rhodecode/templates/login.html:21
 msgid "Sign In to"
 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:50
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
 #: rhodecode/templates/base/base.html:83
-#: rhodecode/templates/summary/summary.html:122
+#: rhodecode/templates/summary/summary.html:131
 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:92
 msgid "Password"
 msgstr ""
 
 #: rhodecode/templates/login.html:50
 msgid "Remember me"
 msgstr ""
 
 #: rhodecode/templates/login.html:60
 msgid "Forgot your password ?"
 msgstr ""
 
 #: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103
 msgid "Don't have an account ?"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:5
 msgid "Reset your password"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:11
 msgid "Reset your password to"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:21
 msgid "Email address"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:30
 msgid "Reset my password"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:31
 msgid "Password reset link will be send to matching email address"
 msgstr ""
 
 #: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74
 msgid "Sign Up"
 msgstr ""
 
 #: rhodecode/templates/register.html:11
 msgid "Sign Up to"
 msgstr ""
 
 #: rhodecode/templates/register.html:38
 msgid "Re-enter password"
 msgstr ""
 
 #: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:86
+#: rhodecode/templates/admin/users/user_edit.html:90
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
 msgid "First Name"
 msgstr ""
 
 #: rhodecode/templates/register.html:56
 #: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:95
+#: rhodecode/templates/admin/users/user_edit.html:99
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
 msgid "Last Name"
 msgstr ""
 
 #: rhodecode/templates/register.html:65
 #: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:104
+#: rhodecode/templates/admin/users/user_edit.html:108
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:124
+#: rhodecode/templates/summary/summary.html:133
 msgid "Email"
 msgstr ""
 
 #: rhodecode/templates/register.html:76
 msgid "Your account will be activated right after registration"
 msgstr ""
 
 #: rhodecode/templates/register.html:78
 msgid "Your account must wait for activation by administrator"
 msgstr ""
 
 #: rhodecode/templates/repo_switcher_list.html:11
 #: rhodecode/templates/admin/repos/repo_add_base.html:65
 #: rhodecode/templates/admin/repos/repo_edit.html:85
 #: rhodecode/templates/settings/repo_settings.html:76
 msgid "Private repository"
 msgstr ""
 
 #: rhodecode/templates/repo_switcher_list.html:16
 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:33
+#: 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"
 msgstr ""
 
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:9
 msgid "Admin journal"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:6
 #: rhodecode/templates/admin/repos/repos.html:74
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9
-#: rhodecode/templates/journal/journal.html:61
-#: rhodecode/templates/journal/journal.html:62
+#: rhodecode/templates/journal/journal_page_repos.html:9
+#: rhodecode/templates/journal/journal_page_repos.html:10
 msgid "Action"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:7
 msgid "Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:8
 #: rhodecode/templates/bookmarks/bookmarks.html:37
 #: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:52
-#: rhodecode/templates/tags/tags.html:37
+#: rhodecode/templates/branches/branches.html:51
+#: rhodecode/templates/branches/branches_data.html:7
+#: rhodecode/templates/tags/tags.html:52
 #: rhodecode/templates/tags/tags_data.html:7
 msgid "Date"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:9
 msgid "From IP"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:53
+#: rhodecode/templates/admin/admin_log.html:57
 msgid "No actions yet"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:5
 msgid "LDAP administration"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:11
 msgid "Ldap"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:28
 msgid "Connection settings"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:30
 msgid "Enable LDAP"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:34
 msgid "Host"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:38
 msgid "Port"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:42
 msgid "Account"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:50
 msgid "Connection security"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:54
 msgid "Certificate Checks"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:57
 msgid "Search settings"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:59
 msgid "Base DN"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:63
 msgid "LDAP Filter"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:67
 msgid "LDAP Search Scope"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:70
 msgid "Attribute mappings"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:72
 msgid "Login Attribute"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:76
 msgid "First Name Attribute"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:80
 msgid "Last Name Attribute"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:84
 msgid "E-mail Attribute"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:89
 #: rhodecode/templates/admin/repos/repo_edit.html:141
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
 #: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_edit.html:129
-#: rhodecode/templates/admin/users/user_edit.html:174
+#: rhodecode/templates/admin/users/user_edit.html:133
+#: rhodecode/templates/admin/users/user_edit.html:178
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:93
 msgid "Save"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:5
 #: rhodecode/templates/admin/notifications/notifications.html:9
 msgid "My Notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:29
 msgid "All"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:30
 #, fuzzy
 msgid "Comments"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:254
-#: rhodecode/templates/base/base.html:256
+#: rhodecode/templates/base/base.html:266
+#: rhodecode/templates/base/base.html:268
 msgid "Pull requests"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:35
 msgid "Mark all read"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_data.html:39
 msgid "No notifications here yet"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/show_notification.html:5
 #: rhodecode/templates/admin/notifications/show_notification.html:11
 msgid "Show notification"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/show_notification.html:9
 msgid "Notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:5
 msgid "Permissions administration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:134
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
-#: rhodecode/templates/admin/users/user_edit.html:139
+#: rhodecode/templates/admin/users/user_edit.html:143
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
 #: rhodecode/templates/settings/repo_settings.html:86
 msgid "Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:24
 msgid "Default permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:31
 msgid "Anonymous access"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:41
 msgid "Repository permission"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:49
 msgid ""
 "All default permissions on each repository will be reset to choosen "
 "permission, note that all custom default permission on repositories will "
 "be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:50
 msgid "overwrite existing settings"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:55
 msgid "Registration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:63
 msgid "Repository creation"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:71
 msgid "Repository forking"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:78
-#: rhodecode/templates/admin/repos/repo_edit.html:241
+#: rhodecode/templates/admin/repos/repo_edit.html:264
 msgid "set"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add.html:5
 #: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
 msgid "Add repository"
 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
 msgid "Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add.html:13
 msgid "add new"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:95
-#: rhodecode/templates/summary/summary.html:96
+#: rhodecode/templates/summary/summary.html:104
+#: rhodecode/templates/summary/summary.html:105
 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: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 ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:33
 #: rhodecode/templates/forks/fork.html:54
 msgid "Optionaly select a group to put this repository into."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:38
 #: rhodecode/templates/admin/repos/repo_edit.html:58
 msgid "Type"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:42
 msgid "Type of repository to create."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:47
 #: rhodecode/templates/admin/repos/repo_edit.html:66
 #: rhodecode/templates/forks/fork.html:41
 #: rhodecode/templates/settings/repo_settings.html:57
 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
 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
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 
 #: 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
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
 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
 msgid "Edit repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:13
 #: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:224
-#: rhodecode/templates/admin/users/user_edit.html:226
+#: rhodecode/templates/admin/users/user_edit.html:228
+#: rhodecode/templates/admin/users/user_edit.html:230
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/files/files_source.html:44
-#: rhodecode/templates/journal/journal.html:81
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
+#: rhodecode/templates/files/files_source.html:29
+#: rhodecode/templates/journal/journal_page_repos.html:29
 msgid "edit"
 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 ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:94
 msgid "Enable statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:98
 msgid "Enable statistics window on summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:103
 msgid "Enable downloads"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:107
 msgid "Enable download menu on summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:112
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
 msgid "Enable locking"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:116
 msgid "Enable lock-by-pulling on repository."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:126
 msgid "Change owner of this repository."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:142
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
 #: rhodecode/templates/admin/settings/settings.html:113
-#: rhodecode/templates/admin/settings/settings.html:168
-#: rhodecode/templates/admin/settings/settings.html:258
-#: rhodecode/templates/admin/users/user_edit.html:130
-#: rhodecode/templates/admin/users/user_edit.html:175
-#: rhodecode/templates/admin/users/user_edit.html:278
+#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:269
+#: rhodecode/templates/admin/users/user_edit.html:134
+#: rhodecode/templates/admin/users/user_edit.html:179
+#: rhodecode/templates/admin/users/user_edit.html:282
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
 #: 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:94
 msgid "Reset"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:155
 msgid "Statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Reset current statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Confirm to remove current statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Fetched to rev"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:163
 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:195
-#: rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:320
-#: rhodecode/templates/base/base.html:322
-msgid "Public journal"
+#: 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 "Remove from public journal"
+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:117
+#: rhodecode/templates/admin/users_groups/users_group_add.html:41
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
+msgid "Active"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:218
+#: rhodecode/templates/base/base.html:330
+#: rhodecode/templates/base/base.html:332
+#: rhodecode/templates/base/base.html:334
+msgid "Public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:224
+msgid "Remove from public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:226
 msgid "Add to public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:208
+#: rhodecode/templates/admin/repos/repo_edit.html:231
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:215
+#: rhodecode/templates/admin/repos/repo_edit.html:238
 msgid "Locking"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:220
+#: rhodecode/templates/admin/repos/repo_edit.html:243
 msgid "Unlock locked repo"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:220
+#: rhodecode/templates/admin/repos/repo_edit.html:243
 msgid "Confirm to unlock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:223
+#: rhodecode/templates/admin/repos/repo_edit.html:246
 msgid "lock repo"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:223
+#: rhodecode/templates/admin/repos/repo_edit.html:246
 msgid "Confirm to lock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:224
+#: rhodecode/templates/admin/repos/repo_edit.html:247
 msgid "Repository is not locked"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:229
+#: 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:236
-msgid "Set as fork of"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:245
-msgid "Manually set this repository as a fork of another from the list"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:251
-#: rhodecode/templates/changeset/changeset_file_comment.html:26
-msgid "Delete"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:255
-msgid "Remove this repository"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:255
-#: rhodecode/templates/journal/journal.html:84
-msgid "Confirm to delete this repository"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:259
+msgid "Set as fork of"
+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:26
+msgid "Delete"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:278
+msgid "Remove this repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:278
+msgid "Confirm to delete this repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:282
 msgid ""
 "This repository will be renamed in a special way in order to be "
 "unaccesible for RhodeCode and VCS systems.\n"
 "                         If you need fully delete it from filesystem "
 "please do it manually"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
 msgid "none"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:4
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
 msgid "read"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:5
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
 msgid "write"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
 #: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/base/base.html:217
+#: rhodecode/templates/base/base.html:229
 msgid "admin"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:7
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7
 msgid "member"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
 #: rhodecode/templates/data_table/_dt_elements.html:67
-#: rhodecode/templates/journal/journal.html:132
-#: rhodecode/templates/summary/summary.html:76
+#: rhodecode/templates/journal/journal.html:87
+#: 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
 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
 msgid "revoke"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:83
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67
 msgid "Add another member"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:97
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
 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:96
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103
 msgid "Failed to remove users group"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:5
 msgid "Repositories administration"
 msgstr ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:8
-msgid "Groups"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:12
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73
+msgid "apply to children"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74
+msgid ""
+"Set or revoke permission to all children of that group, including "
+"repositories and other groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:9
+#: rhodecode/templates/base/base.html:122
+#: rhodecode/templates/base/base.html:312
+#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:316
+#: 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 ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:13
 msgid "with"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
 msgid "Add repos group"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10
 msgid "Repos groups"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12
 msgid "add new repos group"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50
 msgid "Group parent"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58
 #: rhodecode/templates/admin/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:113
+#: rhodecode/templates/pullrequests/pullrequest_show.html:131
 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:70
 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 "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:54
-#: rhodecode/templates/admin/users/user_edit.html:255
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/users/user_edit.html:259
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 #: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:121
 msgid "delete"
 msgstr ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
 #, python-format
-msgid "Confirm to delete this group: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62
+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:63
 msgid "There are no repositories groups yet"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/hooks.html:5
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:9
 #: rhodecode/templates/settings/repo_settings.html:13
 msgid "Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/hooks.html:24
 msgid "Built in hooks - read only"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/hooks.html:40
 msgid "Custom hooks"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/hooks.html:56
 msgid "remove"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/hooks.html:88
 msgid "Failed to remove hook"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:24
 msgid "Remap and rescan repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:32
 msgid "rescan option"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:38
 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 ""
 "Rescan repositories location for new repositories. Also deletes obsolete "
 "if `destroy` flag is checked "
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:46
 msgid "Rescan repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:52
 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
 msgid "Reindex"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:77
 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:167
-#: rhodecode/templates/admin/settings/settings.html:257
+#: rhodecode/templates/admin/settings/settings.html:178
+#: rhodecode/templates/admin/settings/settings.html:268
 msgid "Save settings"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:119
 msgid "Visualisation settings"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:128
+#: rhodecode/templates/admin/settings/settings.html:127
+msgid "General"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:132
+msgid "Use lightweight dashboard"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:139
 msgid "Icons"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:133
-msgid "Show public repo icon on repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:137
-msgid "Show private repo icon on repositories"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:144
+msgid "Show public repo icon on repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:148
+msgid "Show private repo icon on repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:155
 msgid "Meta-Tagging"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:149
+#: rhodecode/templates/admin/settings/settings.html:160
 msgid "Stylify recognised metatags:"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:176
+#: rhodecode/templates/admin/settings/settings.html:187
 msgid "VCS settings"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:185
+#: rhodecode/templates/admin/settings/settings.html:196
 msgid "Web"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:190
+#: rhodecode/templates/admin/settings/settings.html:201
 msgid "require ssl for vcs operations"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:192
-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:198
-msgid "Hooks"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:203
+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
+msgid "Hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:214
 msgid "Update repository after push (hg update)"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:207
+#: rhodecode/templates/admin/settings/settings.html:218
 msgid "Show repository size after push"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:211
+#: rhodecode/templates/admin/settings/settings.html:222
 msgid "Log user push commands"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:215
+#: rhodecode/templates/admin/settings/settings.html:226
 msgid "Log user pull commands"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:219
+#: rhodecode/templates/admin/settings/settings.html:230
 msgid "advanced setup"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:224
-msgid "Mercurial Extensions"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:229
-msgid "largefiles extensions"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:233
-msgid "hgsubversion extensions"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:235
+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
 msgid ""
 "Requires hgsubversion library installed. Allows clonning from svn remote "
 "locations"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:245
+#: rhodecode/templates/admin/settings/settings.html:256
 msgid "Repositories location"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:250
+#: rhodecode/templates/admin/settings/settings.html:261
 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:251
+#: rhodecode/templates/admin/settings/settings.html:262
+#: rhodecode/templates/base/base.html:221
 msgid "unlock"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:252
+#: rhodecode/templates/admin/settings/settings.html:263
 msgid ""
 "Location where repositories are stored. After changing this value a "
 "restart, and rescan is required"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:272
+#: rhodecode/templates/admin/settings/settings.html:283
 msgid "Test Email"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:280
+#: rhodecode/templates/admin/settings/settings.html:291
 msgid "Email to"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:288
+#: rhodecode/templates/admin/settings/settings.html:299
 msgid "Send"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:294
+#: rhodecode/templates/admin/settings/settings.html:305
 msgid "System Info and Packages"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:297
+#: rhodecode/templates/admin/settings/settings.html:308
 msgid "show"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:10
 #: rhodecode/templates/admin/users/user_edit.html:11
 msgid "Users"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:12
 msgid "add new user"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:50
 msgid "Password confirmation"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:113
-#: rhodecode/templates/admin/users_groups/users_group_add.html:41
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-msgid "Active"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit.html:5
 msgid "Edit user"
 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"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:35
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:11
 msgid "Using"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:43
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:20
 msgid "API key"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:59
+#: rhodecode/templates/admin/users/user_edit.html:63
 msgid "LDAP DN"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:68
+#: rhodecode/templates/admin/users/user_edit.html:72
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:35
 msgid "New password"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:77
+#: rhodecode/templates/admin/users/user_edit.html:81
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
 msgid "New password confirmation"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:147
+#: rhodecode/templates/admin/users/user_edit.html:151
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
 msgid "Inherit default permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:152
+#: rhodecode/templates/admin/users/user_edit.html:156
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113
 #, python-format
 msgid ""
 "Select to inherit permissions from %s settings. With this selected below "
 "options does not have any action"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:158
+#: rhodecode/templates/admin/users/user_edit.html:162
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:166
+#: rhodecode/templates/admin/users/user_edit.html:170
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127
 msgid "Fork repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:186
+#: rhodecode/templates/admin/users/user_edit.html:190
 #: 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/users/user_edit.html:193
+#: rhodecode/templates/admin/users/user_edit.html:197
 #: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:194
+#: rhodecode/templates/admin/users/user_edit_my_account.html:217
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
 msgid "Permission"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:194
+#: rhodecode/templates/admin/users/user_edit.html:198
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
 msgid "Edit Permission"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:243
+#: rhodecode/templates/admin/users/user_edit.html:247
 msgid "Email addresses"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:256
+#: rhodecode/templates/admin/users/user_edit.html:260
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:270
+#: rhodecode/templates/admin/users/user_edit.html:274
 msgid "New email address"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:277
+#: rhodecode/templates/admin/users/user_edit.html:281
 msgid "Add"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
 #: rhodecode/templates/base/base.html:124
 msgid "My account"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:9
 msgid "My Account"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:35
 msgid "My permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:38
 #: rhodecode/templates/journal/journal.html:41
 msgid "My repos"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:41
 msgid "My pull requests"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:45
 msgid "Add repo"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
 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
 msgid "Confirm to delete this pull request"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26
 msgid "I participate in"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7
 #: rhodecode/templates/bookmarks/bookmarks.html:40
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:55
-#: rhodecode/templates/journal/journal.html:60
-#: rhodecode/templates/tags/tags.html:40
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/journal/journal_page_repos.html:8
+#: rhodecode/templates/tags/tags.html:55
 #: rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/journal/journal.html:81
+#: rhodecode/templates/journal/journal_page_repos.html:29
 msgid "private"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31
 #: rhodecode/templates/data_table/_dt_elements.html:7
+#: rhodecode/templates/journal/journal_page_repos.html:32
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38
-#: rhodecode/templates/journal/journal.html:94
+#: rhodecode/templates/journal/journal_page_repos.html:42
 msgid "No repositories yet"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40
-#: rhodecode/templates/journal/journal.html:96
+#: rhodecode/templates/journal/journal_page_repos.html:44
 msgid "create one now"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:223
+#: rhodecode/templates/base/base.html:235
 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"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:81
 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:226
+#: rhodecode/templates/base/base.html:238
 msgid "ldap"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:5
 msgid "Add users group"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:10
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
 msgid "Users groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:12
 msgid "add new users group"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:5
 msgid "Edit users group"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:11
 msgid "UsersGroups"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:50
 msgid "Members"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:58
 msgid "Choosen group members"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:61
 msgid "Remove all elements"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:75
 msgid "Available members"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:79
 msgid "Add all elements"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:146
 msgid "Group members"
 msgstr ""
 
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:163
+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 "Submit a bug"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:77
 msgid "Login to your account"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:100
 msgid "Forgot password ?"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:107
 msgid "Log In"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:118
 msgid "Inbox"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:300
-#: rhodecode/templates/base/base.html:302
-#: rhodecode/templates/base/base.html:304
-#: 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 ""
-
 #: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:309
-#: rhodecode/templates/base/base.html:311
-#: rhodecode/templates/base/base.html:313
+#: rhodecode/templates/base/base.html:321
+#: rhodecode/templates/base/base.html:323
+#: rhodecode/templates/base/base.html:325
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:125
 msgid "Log Out"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:144
 msgid "Switch repository"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:146
 msgid "Products"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:152
-#: rhodecode/templates/base/base.html:182
+#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47
 msgid "loading..."
 msgstr ""
 
 #: rhodecode/templates/base/base.html:158
 #: rhodecode/templates/base/base.html:160
 #: rhodecode/templates/base/base.html:162
 #: rhodecode/templates/data_table/_dt_elements.html:15
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
 msgid "Summary"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:166
 #: rhodecode/templates/base/base.html:168
 #: rhodecode/templates/base/base.html:170
 #: rhodecode/templates/changelog/changelog.html:15
 #: rhodecode/templates/data_table/_dt_elements.html:23
 #: rhodecode/templates/data_table/_dt_elements.html:25
 #: rhodecode/templates/data_table/_dt_elements.html:27
 msgid "Changelog"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:175
 #: rhodecode/templates/base/base.html:177
 #: rhodecode/templates/base/base.html:179
 msgid "Switch to"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:186
 #: rhodecode/templates/base/base.html:188
 #: rhodecode/templates/base/base.html:190
 #: rhodecode/templates/data_table/_dt_elements.html:31
 #: rhodecode/templates/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 msgid "Files"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:195
 #: rhodecode/templates/base/base.html:199
 msgid "Options"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:204
 #: rhodecode/templates/base/base.html:206
-#: rhodecode/templates/base/base.html:227
-msgid "settings"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:209
+msgid "repository settings"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:210
 #: rhodecode/templates/data_table/_dt_elements.html:80
 #: rhodecode/templates/forks/fork.html:13
 msgid "fork"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:211
-#: rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50
+#: rhodecode/templates/changelog/changelog.html:43
 msgid "Open new pull request"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:213
+#: rhodecode/templates/base/base.html:215
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:217
 msgid "search"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:222
+#: rhodecode/templates/base/base.html:223
+msgid "lock"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:234
 msgid "repositories groups"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:224
+#: rhodecode/templates/base/base.html:236
 msgid "users groups"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:225
+#: rhodecode/templates/base/base.html:237
 msgid "permissions"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:238
-#: rhodecode/templates/base/base.html:240
+#: rhodecode/templates/base/base.html:239
+msgid "settings"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:250
+#: rhodecode/templates/base/base.html:252
 msgid "Followers"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:246
-#: rhodecode/templates/base/base.html:248
+#: rhodecode/templates/base/base.html:258
+#: rhodecode/templates/base/base.html:260
 msgid "Forks"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:327
-#: rhodecode/templates/base/base.html:329
-#: rhodecode/templates/base/base.html:331
+#: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:341
+#: rhodecode/templates/base/base.html:343
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:42
 msgid "add another comment"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:120
+#: rhodecode/templates/journal/journal.html:75
 #: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:44
 #: rhodecode/templates/summary/summary.html:61
 msgid "Start following this repository"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:45
 msgid "Group"
 msgstr ""
 
-#: rhodecode/templates/base/root.html:47
+#: rhodecode/templates/base/root.html:48
 msgid "search truncated"
 msgstr ""
 
-#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/base/root.html:49
 msgid "no matching files"
 msgstr ""
 
+#: rhodecode/templates/base/root.html:51
+msgid "Open new pull request for selected changesets"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:52
+msgid "Show selected changes __S -> __E"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:53
+msgid "Selection link"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.html:39
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:54
-#: rhodecode/templates/tags/tags.html:39
+#: rhodecode/templates/branches/branches.html:53
+#: rhodecode/templates/branches/branches_data.html:8
+#: rhodecode/templates/tags/tags.html:54
 #: rhodecode/templates/tags/tags_data.html:8
 msgid "Author"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.html:29
 msgid "Compare branches"
 msgstr ""
 
-#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/branches/branches.html:56
+#: 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_data.html:10
 msgid "Compare"
 msgstr ""
 
-#: rhodecode/templates/branches/branches_data.html:6
-msgid "name"
-msgstr ""
-
-#: rhodecode/templates/branches/branches_data.html:7
-msgid "date"
-msgstr ""
-
-#: rhodecode/templates/branches/branches_data.html:8
-#: rhodecode/templates/shortlog/shortlog_data.html:8
-msgid "author"
-msgstr ""
-
-#: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/shortlog/shortlog_data.html:5
-msgid "revision"
-msgstr ""
-
-#: rhodecode/templates/branches/branches_data.html:10
-msgid "compare"
-msgstr ""
-
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:15
 #, 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
+msgid "Clear selection"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:40
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "compare fork with %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:37
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:46
+#: rhodecode/templates/changelog/changelog.html:40
+msgid "Compare fork with parent"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:49
 msgid "Show"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:72
-#: rhodecode/templates/summary/summary.html:364
+#: rhodecode/templates/changelog/changelog.html:74
+#: rhodecode/templates/summary/summary.html:375
 msgid "show more"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:76
+#: rhodecode/templates/changelog/changelog.html:78
 msgid "Affected number of files, click to show more details"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:89
-#: rhodecode/templates/changeset/changeset.html:38
+#: rhodecode/templates/changelog/changelog.html:91
+#: rhodecode/templates/changeset/changeset.html:44
 #: rhodecode/templates/changeset/changeset_file_comment.html:20
 #: rhodecode/templates/changeset/changeset_range.html:46
 msgid "Changeset status"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:92
+#: rhodecode/templates/changelog/changelog.html:94
+#: rhodecode/templates/shortlog/shortlog_data.html:20
 msgid "Click to open associated pull request"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:102
-#: rhodecode/templates/changeset/changeset.html:78
+#: rhodecode/templates/changelog/changelog.html:104
+#: rhodecode/templates/changeset/changeset.html:85
 msgid "Parent"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:108
-#: rhodecode/templates/changeset/changeset.html:84
+#: rhodecode/templates/changelog/changelog.html:110
+#: rhodecode/templates/changeset/changeset.html:91
 msgid "No parents"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:113
-#: rhodecode/templates/changeset/changeset.html:88
+#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changeset/changeset.html:95
+#: rhodecode/templates/changeset/changeset_range.html:79
 msgid "merge"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:116
-#: rhodecode/templates/changeset/changeset.html:91
+#: rhodecode/templates/changelog/changelog.html:118
+#: rhodecode/templates/changeset/changeset.html:98
+#: 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:122
+#: rhodecode/templates/changelog/changelog.html:124
+#: rhodecode/templates/changeset/changeset_range.html:88
 msgid "bookmark"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:128
-#: rhodecode/templates/changeset/changeset.html:96
+#: rhodecode/templates/changelog/changelog.html:130
+#: rhodecode/templates/changeset/changeset.html:103
+#: rhodecode/templates/changeset/changeset_range.html:94
 msgid "tag"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:164
-msgid "Show selected changes __S -> __E"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:255
+#: rhodecode/templates/changelog/changelog.html:301
 msgid "There are no changes yet"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:66
+#: rhodecode/templates/changeset/changeset.html:73
 msgid "removed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/changeset.html:74
 msgid "changed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:68
+#: rhodecode/templates/changeset/changeset.html:75
 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:70
-#: rhodecode/templates/changeset/changeset.html:71
-#: rhodecode/templates/changeset/changeset.html:72
+#: rhodecode/templates/changeset/changeset.html:77
+#: rhodecode/templates/changeset/changeset.html:78
+#: rhodecode/templates/changeset/changeset.html:79
 #, python-format
 msgid "affected %s files"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:6
 #, python-format
 msgid "%s Changeset"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:14
 msgid "Changeset"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:43
+#: rhodecode/templates/changeset/changeset.html:49
 #: rhodecode/templates/changeset/diff_block.html:20
 msgid "raw diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:44
+#: rhodecode/templates/changeset/changeset.html:50
+msgid "patch diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:51
 #: rhodecode/templates/changeset/diff_block.html:21
 msgid "download diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:48
+#: rhodecode/templates/changeset/changeset.html:55
 #: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:48
+#: rhodecode/templates/changeset/changeset.html:55
 #: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:103
+#: rhodecode/templates/changeset/changeset.html:111
+#: rhodecode/templates/compare/compare_diff.html:44
+#: rhodecode/templates/pullrequests/pullrequest_show.html:76
 #, python-format
-msgid "%s files affected with %s insertions and %s deletions:"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:119
-msgid "Changeset was too big and was cut off..."
-msgstr ""
+msgid "%s file changed"
+msgid_plural "%s files changed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/changeset/changeset.html:113
+#: rhodecode/templates/compare/compare_diff.html:46
+#: rhodecode/templates/pullrequests/pullrequest_show.html:78
+#, 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_file_comment.html:42
 msgid "Submitting..."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:45
 msgid "Commenting on line {1}."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:46
 #: rhodecode/templates/changeset/changeset_file_comment.html:121
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:48
 #: rhodecode/templates/changeset/changeset_file_comment.html:123
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:59
 #: rhodecode/templates/changeset/changeset_file_comment.html:138
 msgid "Comment"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:60
 #: rhodecode/templates/changeset/changeset_file_comment.html:71
 msgid "Hide"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "You need to be logged in to comment."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "Login now"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:118
 msgid "Leave a comment"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:124
 msgid "Check this to change current status of code-review for this changeset"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:124
 msgid "change status"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:140
 msgid "Comment and close"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.html:5
 #, python-format
 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/compare/compare_diff.html:41
-#: rhodecode/templates/pullrequests/pullrequest_show.html:69
 msgid "Files affected"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:19
-msgid "diff"
+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
 msgid "No changesets"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.html:37
-msgid "Outgoing changesets"
+#: rhodecode/templates/pullrequests/pullrequest_show.html:69
+#, 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:84
+msgid "No files"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:39
 #: rhodecode/templates/data_table/_dt_elements.html:41
 #: rhodecode/templates/data_table/_dt_elements.html:43
 msgid "Fork"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:60
-#: rhodecode/templates/journal/journal.html:126
-#: rhodecode/templates/summary/summary.html:68
+#: rhodecode/templates/journal/journal.html:81
+#: rhodecode/templates/summary/summary.html:77
 msgid "Mercurial repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:62
-#: rhodecode/templates/journal/journal.html:128
-#: rhodecode/templates/summary/summary.html:71
+#: rhodecode/templates/journal/journal.html:83
+#: rhodecode/templates/summary/summary.html:80
 msgid "Git repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:69
-#: rhodecode/templates/journal/journal.html:134
-#: rhodecode/templates/summary/summary.html:78
+#: rhodecode/templates/journal/journal.html:89
+#: rhodecode/templates/summary/summary.html:87
 msgid "public repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:80
-#: rhodecode/templates/summary/summary.html:87
-#: rhodecode/templates/summary/summary.html:88
+#: rhodecode/templates/summary/summary.html:96
+#: rhodecode/templates/summary/summary.html:97
 msgid "Fork of"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:92
+#: rhodecode/templates/data_table/_dt_elements.html:94
 msgid "No changesets yet"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:104
+#: rhodecode/templates/data_table/_dt_elements.html:101
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#, python-format
+msgid "Subscribe to %s rss feed"
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:109
+#: rhodecode/templates/data_table/_dt_elements.html:111
+#, python-format
+msgid "Subscribe to %s atom feed"
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:122
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
 
 #: rhodecode/templates/email_templates/main.html:8
-msgid "This is an notification from RhodeCode."
+msgid "This is a notification from RhodeCode."
 msgstr ""
 
 #: rhodecode/templates/errors/error_document.html:46
 #, 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
 msgid "File diff"
 msgstr ""
 
 #: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:72
+#: rhodecode/templates/files/files.html:74
 #, python-format
 msgid "%s files"
 msgstr ""
 
 #: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:340
+#: rhodecode/templates/summary/summary.html:351
 msgid "files"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:4
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
 msgid "%s Edit file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:19
 msgid "add file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:40
 msgid "Add new file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:45
 msgid "File Name"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:49
 #: rhodecode/templates/files/files_add.html:58
 msgid "or"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:49
 #: rhodecode/templates/files/files_add.html:54
 msgid "Upload file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:58
 msgid "Create new file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:63
 #: rhodecode/templates/files/files_edit.html:39
 #: rhodecode/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:67
 msgid "use / to separate directories"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:77
 #: rhodecode/templates/files/files_edit.html:63
 #: 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 changes"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:13
 msgid "view"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:14
 msgid "previous revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:16
 msgid "next revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:23
 msgid "follow current branch"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:27
 msgid "search file list"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:31
-#: rhodecode/templates/shortlog/shortlog_data.html:65
+#: rhodecode/templates/shortlog/shortlog_data.html:80
 msgid "add new file"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:35
 msgid "Loading file list..."
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:48
 msgid "Size"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:49
 msgid "Mimetype"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:50
 msgid "Last Revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:51
 msgid "Last modified"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:52
 msgid "Last commiter"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:19
 msgid "edit file"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:38
+#: rhodecode/templates/files/files_source.html:23
 msgid "show annotation"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:50
-#: rhodecode/templates/files/files_source.html:40
-#: rhodecode/templates/files/files_source.html:68
+#: rhodecode/templates/files/files_source.html:25
+#: rhodecode/templates/files/files_source.html:53
 msgid "show as raw"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:51
-#: rhodecode/templates/files/files_source.html:41
+#: 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 "Editing file"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:2
+#: rhodecode/templates/files/files_history_box.html:2
 msgid "History"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:9
+#: rhodecode/templates/files/files_history_box.html:9
 msgid "diff to revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:10
+#: rhodecode/templates/files/files_history_box.html:10
 #, fuzzy
 msgid "show at revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:14
+#: rhodecode/templates/files/files_history_box.html:15
 #, fuzzy, python-format
 msgid "%s author"
 msgid_plural "%s authors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/files/files_source.html:36
+#: rhodecode/templates/files/files_source.html:6
+msgid "Load file history"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:21
 msgid "show source"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:59
+#: rhodecode/templates/files/files_source.html:44
 #, python-format
 msgid "Binary file (%s)"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:68
+#: rhodecode/templates/files/files_source.html:53
 msgid "File is too big to display"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:124
-msgid "Selection link"
-msgstr ""
-
 #: rhodecode/templates/files/files_ypjax.html:5
 msgid "annotation"
 msgstr ""
 
 #: rhodecode/templates/files/files_ypjax.html:15
 msgid "Go back"
 msgstr ""
 
 #: rhodecode/templates/files/files_ypjax.html:16
 msgid "No files at given path"
 msgstr ""
 
 #: rhodecode/templates/followers/followers.html:5
 #, python-format
 msgid "%s Followers"
 msgstr ""
 
 #: rhodecode/templates/followers/followers.html:13
 msgid "followers"
 msgstr ""
 
 #: rhodecode/templates/followers/followers_data.html:12
 msgid "Started following -"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:5
 #, python-format
 msgid "%s Fork"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:31
 msgid "Fork name"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:68
 msgid "Private"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:77
 msgid "Copy permissions"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:81
 msgid "Copy permissions from forked repository"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:86
 msgid "Update after clone"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:90
 msgid "Checkout source after making a clone"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:94
 msgid "fork this repository"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.html:5
 #, python-format
 msgid "%s Forks"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.html:13
 msgid "forks"
 msgstr ""
 
 #: rhodecode/templates/forks/forks_data.html:17
 msgid "forked"
 msgstr ""
 
-#: rhodecode/templates/forks/forks_data.html:38
+#: rhodecode/templates/forks/forks_data.html:42
 msgid "There are no forks yet"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.html:13
 msgid "ATOM journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.html:14
 msgid "RSS journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.html:24
-#: rhodecode/templates/pullrequests/pullrequest.html:27
+#: rhodecode/templates/pullrequests/pullrequest.html:55
 msgid "Refresh"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.html:27
 #: rhodecode/templates/journal/public_journal.html:24
 msgid "RSS feed"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.html:30
 #: rhodecode/templates/journal/public_journal.html:27
 msgid "ATOM feed"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.html:41
 msgid "Watched"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.html:46
 msgid "ADD"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:114
+#: rhodecode/templates/journal/journal.html:69
 msgid "following user"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:114
+#: rhodecode/templates/journal/journal.html:69
 msgid "user"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:147
+#: rhodecode/templates/journal/journal.html:102
 msgid "You are not following any users or repositories"
 msgstr ""
 
-#: rhodecode/templates/journal/journal_data.html:47
+#: rhodecode/templates/journal/journal_data.html:51
 msgid "No entries yet"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.html:13
 msgid "ATOM public journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.html:14
 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
 msgid "New pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:28
+#: rhodecode/templates/pullrequests/pullrequest.html:54
 msgid "refresh overview"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:66
 msgid "Detailed compare view"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:82
+#: rhodecode/templates/pullrequests/pullrequest_show.html:100
 msgid "Pull request reviewers"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+#: rhodecode/templates/pullrequests/pullrequest_show.html:112
 msgid "owner"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:109
+#: rhodecode/templates/pullrequests/pullrequest_show.html:127
 msgid "Add reviewer to this pull request."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:97
 msgid "Create new pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:106
 #: rhodecode/templates/pullrequests/pullrequest_show.html:25
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
 msgid "Title"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:115
 msgid "description"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:123
 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
+#, 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 "Pull request status"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:44
 msgid "Still not reviewed by"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:47
+#: rhodecode/templates/pullrequests/pullrequest_show.html:48
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:54
+#: rhodecode/templates/pullrequests/pullrequest_show.html:50
+msgid "pull request was reviewed by all reviewers"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:58
 msgid "Created on"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:61
-msgid "Compare view"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest_show.html:65
-msgid "Incoming changesets"
+msgid "Compare view"
 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"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:6
 #, python-format
 msgid "Search \"%s\" in repository: %s"
 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
 msgid "Search in all repositories"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:48
 msgid "Search term"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:60
 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 names"
 msgstr ""
 
 #: rhodecode/templates/search/search_commit.html:35
 #: rhodecode/templates/search/search_content.html:21
 #: rhodecode/templates/search/search_path.html:15
 msgid "Permission denied"
 msgstr ""
 
 #: rhodecode/templates/settings/repo_settings.html:5
 #, python-format
 msgid "%s Settings"
 msgstr ""
 
 #: rhodecode/templates/shortlog/shortlog.html:5
 #, python-format
 msgid "%s Shortlog"
 msgstr ""
 
 #: rhodecode/templates/shortlog/shortlog.html:14
 msgid "shortlog"
 msgstr ""
 
+#: rhodecode/templates/shortlog/shortlog_data.html:5
+msgid "revision"
+msgstr ""
+
 #: rhodecode/templates/shortlog/shortlog_data.html:7
 msgid "age"
 msgstr ""
 
-#: rhodecode/templates/shortlog/shortlog_data.html:18
+#: rhodecode/templates/shortlog/shortlog_data.html:8
+msgid "author"
+msgstr ""
+
+#: rhodecode/templates/shortlog/shortlog_data.html:33
 msgid "No commit message"
 msgstr ""
 
-#: rhodecode/templates/shortlog/shortlog_data.html:62
+#: rhodecode/templates/shortlog/shortlog_data.html:77
 msgid "Add or upload files directly via RhodeCode"
 msgstr ""
 
-#: rhodecode/templates/shortlog/shortlog_data.html:71
+#: rhodecode/templates/shortlog/shortlog_data.html:86
 msgid "Push new repo"
 msgstr ""
 
-#: rhodecode/templates/shortlog/shortlog_data.html:79
+#: rhodecode/templates/shortlog/shortlog_data.html:94
 msgid "Existing repository?"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:12
 msgid "summary"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:20
 #, python-format
 msgid "repo %s ATOM feed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:21
 #, 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:82
+#: rhodecode/templates/summary/summary.html:70
+#, python-format
+msgid "Repository locked by %s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:72
+msgid "Repository unlocked"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:91
 #, python-format
 msgid "Non changable ID %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:87
+#: rhodecode/templates/summary/summary.html:96
 msgid "public"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:95
+#: rhodecode/templates/summary/summary.html:104
 msgid "remote clone"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:116
+#: rhodecode/templates/summary/summary.html:125
 msgid "Contact"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:130
+#: rhodecode/templates/summary/summary.html:139
 msgid "Clone url"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:133
-msgid "Show by Name"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:134
-msgid "Show by ID"
-msgstr ""
-
 #: rhodecode/templates/summary/summary.html:142
+msgid "Show by Name"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:143
+msgid "Show by ID"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:151
 msgid "Trending files"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:150
-#: rhodecode/templates/summary/summary.html:166
-#: rhodecode/templates/summary/summary.html:194
+#: 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:158
+#: rhodecode/templates/summary/summary.html:167
 msgid "Download"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:162
+#: rhodecode/templates/summary/summary.html:171
 msgid "There are no downloads yet"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:164
-msgid "Downloads are disabled for this repository"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:170
-msgid "Download as zip"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:173
-msgid "Check this to download archive with subrepos"
-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
+msgid "Check this to download archive with subrepos"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:182
 msgid "with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:186
+#: rhodecode/templates/summary/summary.html:195
 msgid "Commit activity by day / author"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:197
+#: rhodecode/templates/summary/summary.html:206
 msgid "Stats gathered: "
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:218
+#: rhodecode/templates/summary/summary.html:227
 msgid "Shortlog"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:220
+#: rhodecode/templates/summary/summary.html:229
 msgid "Quick start"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:233
+#: rhodecode/templates/summary/summary.html:243
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:236
+#: rhodecode/templates/summary/summary.html:246
 msgid "Permalink to this readme"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:293
+#: rhodecode/templates/summary/summary.html:304
 #, python-format
 msgid "Download %s as %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:650
+#: rhodecode/templates/summary/summary.html:661
 msgid "commits"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:651
+#: rhodecode/templates/summary/summary.html:662
 msgid "files added"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:652
+#: rhodecode/templates/summary/summary.html:663
 msgid "files changed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:653
+#: rhodecode/templates/summary/summary.html:664
 msgid "files removed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:656
+#: rhodecode/templates/summary/summary.html:667
 msgid "commit"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:657
+#: rhodecode/templates/summary/summary.html:668
 msgid "file added"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:658
+#: rhodecode/templates/summary/summary.html:669
 msgid "file changed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:659
+#: rhodecode/templates/summary/summary.html:670
 msgid "file removed"
 msgstr ""
 
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr ""
 
+#: rhodecode/templates/tags/tags.html:29
+msgid "Compare tags"
+msgstr ""
+

rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po

@@ -1,3928 +1,4180 b''
 # French translations for RhodeCode.
 # Copyright (C) 2011 ORGANIZATION
 # This file is distributed under the same license as the RhodeCode project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: RhodeCode 1.1.5\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-10-02 11:23+0200\n"
+"POT-Creation-Date: 2012-11-27 20:56+0100\n"
 "PO-Revision-Date: 2012-10-02 11:32+0100\n"
 "Last-Translator: Vincent Duvert <[e-mail]>\n"
 "Language-Team: fr <[e-mail]>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
 #: rhodecode/controllers/changelog.py:95
 msgid "All Branches"
 msgstr "Toutes les branches"
 
-#: rhodecode/controllers/changeset.py:83
+#: rhodecode/controllers/changeset.py:84
 msgid "show white space"
 msgstr "Afficher les espaces et tabulations"
 
-#: rhodecode/controllers/changeset.py:90
-#: rhodecode/controllers/changeset.py:97
+#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
 msgid "ignore white space"
 msgstr "Ignorer les espaces et tabulations"
 
-#: rhodecode/controllers/changeset.py:157
+#: rhodecode/controllers/changeset.py:164
 #, python-format
 msgid "%s line context"
 msgstr "Afficher %s lignes de contexte"
 
-#: rhodecode/controllers/changeset.py:333
-#: rhodecode/controllers/changeset.py:348
-#: rhodecode/lib/diffs.py:71
-msgid "binary file"
-msgstr "Fichier binaire"
-
-#: rhodecode/controllers/changeset.py:381
-#: rhodecode/controllers/pullrequests.py:376
+#: rhodecode/controllers/changeset.py:315
+#: rhodecode/controllers/pullrequests.py:411
 #, python-format
 msgid "Status change -> %s"
 msgstr "Changement de statut -> %s"
 
-#: rhodecode/controllers/changeset.py:412
-msgid "Changing status on a changeset associated witha closed pull request is not allowed"
-msgstr "Le changement de statut d’un changeset associé à une pull request fermée n’est pas autorisé."
-
-#: rhodecode/controllers/compare.py:72
-#: rhodecode/controllers/pullrequests.py:114
+#: rhodecode/controllers/changeset.py:346
+msgid ""
+"Changing status on a changeset associated witha closed pull request is "
+"not allowed"
+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:117
 msgid "There are no changesets yet"
 msgstr "Il n’y a aucun changement pour le moment"
 
 #: rhodecode/controllers/error.py:69
 msgid "Home page"
 msgstr "Accueil"
 
 #: rhodecode/controllers/error.py:98
 msgid "The request could not be understood by the server due to malformed syntax."
-msgstr "Le serveur n’a pas pu interpréter la requête à cause d’une erreur de syntaxe"
+msgstr ""
+"Le serveur n’a pas pu interpréter la requête à cause d’une erreur de "
+"syntaxe"
 
 #: rhodecode/controllers/error.py:101
 msgid "Unauthorized access to resource"
 msgstr "Accès interdit à cet ressource"
 
 #: rhodecode/controllers/error.py:103
 msgid "You don't have permission to view this page"
 msgstr "Vous n’avez pas la permission de voir cette page"
 
 #: rhodecode/controllers/error.py:105
 msgid "The resource could not be found"
 msgstr "Ressource introuvable"
 
 #: rhodecode/controllers/error.py:107
-msgid "The server encountered an unexpected condition which prevented it from fulfilling the request."
-msgstr "La requête n’a pu être traitée en raison d’une erreur survenue sur le serveur."
-
-#: rhodecode/controllers/feed.py:49
+msgid ""
+"The server encountered an unexpected condition which prevented it from "
+"fulfilling the request."
+msgstr ""
+"La requête n’a pu être traitée en raison d’une erreur survenue sur le "
+"serveur."
+
+#: rhodecode/controllers/feed.py:52
 #, python-format
 msgid "Changes on %s repository"
 msgstr "Changements sur le dépôt %s"
 
-#: rhodecode/controllers/feed.py:50
+#: rhodecode/controllers/feed.py:53
 #, python-format
 msgid "%s %s feed"
 msgstr "Flux %s de %s"
 
-#: rhodecode/controllers/feed.py:67
-#: rhodecode/templates/changeset/changeset.html:119
+#: rhodecode/controllers/feed.py:86
+#: rhodecode/templates/changeset/changeset.html:126
+#: rhodecode/templates/changeset/changeset.html:138
+#: rhodecode/templates/compare/compare_diff.html:62
+#: rhodecode/templates/compare/compare_diff.html:73
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+#: rhodecode/templates/pullrequests/pullrequest_show.html:153
 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:81
+#: rhodecode/controllers/feed.py:92
 msgid "commited on"
 msgstr "a commité, le"
 
-#: rhodecode/controllers/files.py:84
+#: rhodecode/controllers/files.py:86
 msgid "click here to add new file"
 msgstr "Ajouter un nouveau fichier"
 
-#: rhodecode/controllers/files.py:85
+#: rhodecode/controllers/files.py:87
 #, python-format
 msgid "There are no files yet %s"
 msgstr "Il n’y a pas encore de fichiers %s"
 
-#: rhodecode/controllers/files.py:239
-#: rhodecode/controllers/files.py:299
+#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325
 #, 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:266
+#: rhodecode/controllers/files.py:292
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr "%s édité via RhodeCode"
 
-#: rhodecode/controllers/files.py:271
+#: rhodecode/controllers/files.py:297
 msgid "No changes"
 msgstr "Aucun changement"
 
-#: rhodecode/controllers/files.py:282
-#: rhodecode/controllers/files.py:346
+#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Commit réalisé avec succès sur %s"
 
-#: rhodecode/controllers/files.py:287
-#: rhodecode/controllers/files.py:352
+#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378
 msgid "Error occurred during commit"
 msgstr "Une erreur est survenue durant le commit"
 
-#: rhodecode/controllers/files.py:318
+#: rhodecode/controllers/files.py:344
 #, python-format
 msgid "Added %s via RhodeCode"
 msgstr "%s ajouté par RhodeCode"
 
-#: rhodecode/controllers/files.py:332
+#: rhodecode/controllers/files.py:358
 msgid "No content"
 msgstr "Aucun contenu"
 
-#: rhodecode/controllers/files.py:336
+#: rhodecode/controllers/files.py:362
 msgid "No filename"
 msgstr "Aucun nom de fichier"
 
-#: rhodecode/controllers/files.py:378
+#: rhodecode/controllers/files.py:404
 msgid "downloads disabled"
 msgstr "Les téléchargements sont désactivés"
 
-#: rhodecode/controllers/files.py:389
+#: rhodecode/controllers/files.py:415
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Révision %s inconnue."
 
-#: rhodecode/controllers/files.py:391
+#: rhodecode/controllers/files.py:417
 msgid "Empty repository"
 msgstr "Dépôt vide."
 
-#: rhodecode/controllers/files.py:393
+#: rhodecode/controllers/files.py:419
 msgid "Unknown archive type"
 msgstr "Type d’archive inconnu"
 
-#: rhodecode/controllers/files.py:494
+#: rhodecode/controllers/files.py:564
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "Changesets"
 
-#: rhodecode/controllers/files.py:495
-#: rhodecode/controllers/pullrequests.py:73
-#: rhodecode/controllers/summary.py:236
-#: rhodecode/model/scm.py:543
+#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76
+#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550
 msgid "Branches"
 msgstr "Branches"
 
-#: rhodecode/controllers/files.py:496
-#: rhodecode/controllers/pullrequests.py:77
-#: rhodecode/controllers/summary.py:237
-#: rhodecode/model/scm.py:554
+#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80
+#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561
 msgid "Tags"
 msgstr "Tags"
 
-#: rhodecode/controllers/forks.py:74
-#: rhodecode/controllers/admin/repos.py:90
+#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91
 #, python-format
-msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories"
-msgstr "Le dépôt %s n’est pas représenté dans la base de données. Il a probablement été créé ou renommé manuellement. Veuillez relancer l’application pour rescanner les dépôts."
-
-#: rhodecode/controllers/forks.py:134
-#: rhodecode/controllers/settings.py:73
+msgid ""
+"%s repository is not mapped to db perhaps it was created or renamed from "
+"the filesystem please run the application again in order to rescan "
+"repositories"
+msgstr ""
+"Le dépôt %s n’est pas représenté dans la base de données. Il a "
+"probablement été créé ou renommé manuellement. Veuillez relancer "
+"l’application pour rescanner les dépôts."
+
+#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73
 #, python-format
-msgid "%s repository is not mapped to db perhaps it was created or renamed from the file system please run the application again in order to rescan repositories"
-msgstr "Le dépôt %s n’est pas représenté dans la base de données. Il a probablement été créé ou renommé manuellement. Veuillez relancer l’application pour rescanner les dépôts."
+msgid ""
+"%s repository is not mapped to db perhaps it was created or renamed from "
+"the file system please run the application again in order to rescan "
+"repositories"
+msgstr ""
+"Le dépôt %s n’est pas représenté dans la base de données. Il a "
+"probablement été créé ou renommé manuellement. Veuillez relancer "
+"l’application pour rescanner les dépôts."
 
 #: rhodecode/controllers/forks.py:168
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "dépôt %s forké en tant que %s"
 
 #: rhodecode/controllers/forks.py:182
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "Une erreur est survenue durant le fork du dépôt %s."
 
-#: rhodecode/controllers/journal.py:203
-#: rhodecode/controllers/journal.py:240
+#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243
 msgid "public journal"
 msgstr "Journal public"
 
-#: rhodecode/controllers/journal.py:207
-#: rhodecode/controllers/journal.py:244
-#: rhodecode/templates/base/base.html:229
+#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247
+#: rhodecode/templates/base/base.html:232
 msgid "journal"
 msgstr "Journal"
 
 #: rhodecode/controllers/login.py:143
 msgid "You have successfully registered into rhodecode"
 msgstr "Vous vous êtes inscrits avec succès à RhodeCode"
 
 #: rhodecode/controllers/login.py:164
 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:184
-msgid "Your password reset was successful, new password has been sent to your email"
-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:75
-#: rhodecode/model/scm.py:549
+msgid ""
+"Your password reset was successful, new password has been sent to your "
+"email"
+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:78 rhodecode/model/scm.py:556
 msgid "Bookmarks"
 msgstr "Signets"
 
-#: rhodecode/controllers/pullrequests.py:182
+#: rhodecode/controllers/pullrequests.py:186
 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:184
+#: rhodecode/controllers/pullrequests.py:188
 msgid "error during creation of pull request"
 msgstr "Une erreur est survenue lors de la création de la requête de pull."
 
-#: rhodecode/controllers/pullrequests.py:205
+#: rhodecode/controllers/pullrequests.py:220
 msgid "Successfully opened new pull request"
 msgstr "La requête de pull a été ouverte avec succès."
 
-#: rhodecode/controllers/pullrequests.py:208
+#: rhodecode/controllers/pullrequests.py:223
 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:241
+#: rhodecode/controllers/pullrequests.py:256
 msgid "Successfully deleted pull request"
 msgstr "La requête de pull a été supprimée avec succès."
 
-#: rhodecode/controllers/search.py:132
+#: rhodecode/controllers/search.py:134
 msgid "Invalid search query. Try quoting it."
 msgstr "Requête invalide. Essayer de la mettre entre guillemets."
 
-#: rhodecode/controllers/search.py:137
+#: rhodecode/controllers/search.py:139
 msgid "There is no index to search in. Please run whoosh indexer"
-msgstr "L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de code Whoosh."
-
-#: rhodecode/controllers/search.py:141
+msgstr ""
+"L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de "
+"code Whoosh."
+
+#: rhodecode/controllers/search.py:143
 msgid "An error occurred during this search operation"
 msgstr "Une erreur est survenue durant l’opération de recherche."
 
 #: rhodecode/controllers/settings.py:108
-#: rhodecode/controllers/admin/repos.py:266
+#: rhodecode/controllers/admin/repos.py:267
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Dépôt %s mis à jour avec succès."
 
 #: rhodecode/controllers/settings.py:126
-#: rhodecode/controllers/admin/repos.py:284
+#: rhodecode/controllers/admin/repos.py:285
 #, 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:144
-#: rhodecode/controllers/admin/repos.py:302
+#: rhodecode/controllers/admin/repos.py:303
 #, python-format
-msgid "%s repository is not mapped to db perhaps it was moved or renamed  from the filesystem please run the application again in order to rescan repositories"
-msgstr "Le dépôt %s n’est pas représenté dans la base de données. Il a probablement été déplacé ou renommé manuellement. Veuillez relancer l’application pour rescanner les dépôts."
+msgid ""
+"%s repository is not mapped to db perhaps it was moved or renamed  from "
+"the filesystem please run the application again in order to rescan "
+"repositories"
+msgstr ""
+"Le dépôt %s n’est pas représenté dans la base de données. Il a "
+"probablement été déplacé ou renommé manuellement. Veuillez relancer "
+"l’application pour rescanner les dépôts."
 
 #: rhodecode/controllers/settings.py:156
-#: rhodecode/controllers/admin/repos.py:314
+#: rhodecode/controllers/admin/repos.py:315
 #, python-format
 msgid "deleted repository %s"
 msgstr "Dépôt %s supprimé"
 
 #: rhodecode/controllers/settings.py:160
-#: rhodecode/controllers/admin/repos.py:324
-#: rhodecode/controllers/admin/repos.py:330
+#: rhodecode/controllers/admin/repos.py:325
+#: rhodecode/controllers/admin/repos.py:331
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Erreur pendant la suppression de %s"
 
 #: rhodecode/controllers/settings.py:179
-#| msgid "unlock"
 msgid "unlocked"
 msgstr "déverrouillé"
 
 #: rhodecode/controllers/settings.py:182
-#| msgid "unlock"
 msgid "locked"
 msgstr "verrouillé"
 
 #: rhodecode/controllers/settings.py:184
 #, python-format
-#| msgid "forked %s repository as %s"
 msgid "Repository has been %s"
 msgstr "Le dépôt a été %s."
 
 #: rhodecode/controllers/settings.py:188
-#: rhodecode/controllers/admin/repos.py:422
+#: rhodecode/controllers/admin/repos.py:423
 msgid "An error occurred during unlocking"
 msgstr "Une erreur est survenue durant le déverrouillage."
 
 #: rhodecode/controllers/summary.py:140
 msgid "No data loaded yet"
 msgstr "Aucune donnée actuellement disponible."
 
 #: rhodecode/controllers/summary.py:144
-#: rhodecode/templates/summary/summary.html:148
+#: rhodecode/templates/summary/summary.html:157
 msgid "Statistics are disabled for this repository"
 msgstr "La mise à jour des statistiques est désactivée pour ce dépôt."
 
 #: rhodecode/controllers/admin/ldap_settings.py:50
 msgid "BASE"
 msgstr "Base"
 
 #: rhodecode/controllers/admin/ldap_settings.py:51
 msgid "ONELEVEL"
 msgstr "Un niveau"
 
 #: rhodecode/controllers/admin/ldap_settings.py:52
 msgid "SUBTREE"
 msgstr "Sous-arbre"
 
 #: rhodecode/controllers/admin/ldap_settings.py:56
 msgid "NEVER"
 msgstr "NEVER"
 
 #: rhodecode/controllers/admin/ldap_settings.py:57
 msgid "ALLOW"
 msgstr "Autoriser"
 
 #: rhodecode/controllers/admin/ldap_settings.py:58
 msgid "TRY"
 msgstr "TRY"
 
 #: rhodecode/controllers/admin/ldap_settings.py:59
 msgid "DEMAND"
 msgstr "DEMAND"
 
 #: rhodecode/controllers/admin/ldap_settings.py:60
 msgid "HARD"
 msgstr "HARD"
 
 #: rhodecode/controllers/admin/ldap_settings.py:64
 msgid "No encryption"
 msgstr "Pas de chiffrement"
 
 #: rhodecode/controllers/admin/ldap_settings.py:65
 msgid "LDAPS connection"
 msgstr "Connection LDAPS"
 
 #: rhodecode/controllers/admin/ldap_settings.py:66
 msgid "START_TLS on LDAP connection"
 msgstr "START_TLS à la connexion"
 
 #: rhodecode/controllers/admin/ldap_settings.py:126
 msgid "Ldap settings updated successfully"
 msgstr "Mise à jour réussie des réglages LDAP"
 
 #: rhodecode/controllers/admin/ldap_settings.py:130
 msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
 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"
 msgstr "Une erreur est survenue durant la mise à jour des réglages du LDAP."
 
 #: rhodecode/controllers/admin/permissions.py:59
 msgid "None"
 msgstr "Aucun"
 
 #: rhodecode/controllers/admin/permissions.py:60
 msgid "Read"
 msgstr "Lire"
 
 #: rhodecode/controllers/admin/permissions.py:61
 msgid "Write"
 msgstr "Écrire"
 
 #: rhodecode/controllers/admin/permissions.py:62
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
 #: rhodecode/templates/admin/repos/repo_add.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:9
 #: rhodecode/templates/admin/repos/repos.html: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/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:122
+#: rhodecode/templates/admin/users/user_edit.html:126
 #: rhodecode/templates/admin/users/users.html:9
 #: 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:197
-#: rhodecode/templates/base/base.html:346
-#: rhodecode/templates/base/base.html:348
-#: rhodecode/templates/base/base.html:350
+#: rhodecode/templates/base/base.html:349
+#: rhodecode/templates/base/base.html:351
+#: rhodecode/templates/base/base.html:353
 msgid "Admin"
 msgstr "Administration"
 
 #: rhodecode/controllers/admin/permissions.py:65
 msgid "disabled"
 msgstr "Désactivé"
 
 #: rhodecode/controllers/admin/permissions.py:67
 msgid "allowed with manual account activation"
 msgstr "Autorisé avec activation manuelle du compte"
 
 #: rhodecode/controllers/admin/permissions.py:69
 msgid "allowed with automatic account activation"
 msgstr "Autorisé avec activation automatique du compte"
 
 #: rhodecode/controllers/admin/permissions.py:71
 #: rhodecode/controllers/admin/permissions.py:74
 msgid "Disabled"
 msgstr "Interdite"
 
 #: rhodecode/controllers/admin/permissions.py:72
 #: rhodecode/controllers/admin/permissions.py:75
 msgid "Enabled"
 msgstr "Autorisée"
 
 #: rhodecode/controllers/admin/permissions.py:116
 msgid "Default permissions updated successfully"
 msgstr "Permissions par défaut mises à jour avec succès"
 
 #: rhodecode/controllers/admin/permissions.py:130
 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:124
 msgid "--REMOVE FORK--"
 msgstr "[Pas un fork]"
 
-#: rhodecode/controllers/admin/repos.py:192
+#: rhodecode/controllers/admin/repos.py:193
 #, python-format
 msgid "created repository %s from %s"
 msgstr "Le dépôt %s a été créé depuis %s."
 
-#: rhodecode/controllers/admin/repos.py:196
+#: rhodecode/controllers/admin/repos.py:197
 #, python-format
 msgid "created repository %s"
 msgstr "Le dépôt %s a été créé."
 
-#: rhodecode/controllers/admin/repos.py:227
+#: rhodecode/controllers/admin/repos.py:228
 #, 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:319
+#: rhodecode/controllers/admin/repos.py:320
 #, 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:348
+#: rhodecode/controllers/admin/repos.py:349
 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:367
+#: rhodecode/controllers/admin/repos.py:368
 msgid "An error occurred during deletion of repository users groups"
-msgstr "Une erreur est survenue durant la suppression du groupe d’utilisateurs de ce dépôt."
-
-#: rhodecode/controllers/admin/repos.py:385
+msgstr ""
+"Une erreur est survenue durant la suppression du groupe d’utilisateurs de"
+" ce dépôt."
+
+#: rhodecode/controllers/admin/repos.py:386
 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:402
+#: rhodecode/controllers/admin/repos.py:403
 msgid "An error occurred during cache invalidation"
 msgstr "Une erreur est survenue durant l’invalidation du cache."
 
-#: rhodecode/controllers/admin/repos.py:442
+#: rhodecode/controllers/admin/repos.py:443
 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:446
+#: rhodecode/controllers/admin/repos.py:447
 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:451
-#: rhodecode/model/validators.py:300
+msgstr ""
+"Une erreur est survenue durant la configuration du journal public pour ce"
+" dépôt."
+
+#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300
 msgid "Token mismatch"
 msgstr "Jeton d’authentification incorrect."
 
-#: rhodecode/controllers/admin/repos.py:464
+#: rhodecode/controllers/admin/repos.py:465
 msgid "Pulled from remote location"
 msgstr "Les changements distants ont été récupérés."
 
-#: rhodecode/controllers/admin/repos.py:466
+#: rhodecode/controllers/admin/repos.py:467
 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:482
+#: rhodecode/controllers/admin/repos.py:483
 msgid "Nothing"
 msgstr "[Aucun dépôt]"
 
-#: rhodecode/controllers/admin/repos.py:484
+#: rhodecode/controllers/admin/repos.py:485
 #, 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:488
+#: rhodecode/controllers/admin/repos.py:489
 msgid "An error occurred during this operation"
 msgstr "Une erreur est survenue durant cette opération."
 
-#: rhodecode/controllers/admin/repos_groups.py:117
+#: rhodecode/controllers/admin/repos_groups.py:120
 #, python-format
 msgid "created repos group %s"
 msgstr "Le groupe de dépôts %s a été créé."
 
-#: rhodecode/controllers/admin/repos_groups.py:130
+#: rhodecode/controllers/admin/repos_groups.py:133
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr "Une erreur est survenue durant la création du groupe de dépôts %s."
 
-#: rhodecode/controllers/admin/repos_groups.py:164
+#: rhodecode/controllers/admin/repos_groups.py:167
 #, 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:177
+#: rhodecode/controllers/admin/repos_groups.py:180
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr "Une erreur est survenue durant la mise à jour du groupe de dépôts %s."
 
-#: rhodecode/controllers/admin/repos_groups.py:195
+#: rhodecode/controllers/admin/repos_groups.py:198
 #, 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:203
+#: rhodecode/controllers/admin/repos_groups.py:206
 #, python-format
 msgid "removed repos group %s"
 msgstr "Le groupe de dépôts %s a été supprimé."
 
-#: rhodecode/controllers/admin/repos_groups.py:209
+#: rhodecode/controllers/admin/repos_groups.py:212
 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:214
-#: rhodecode/controllers/admin/repos_groups.py:219
+#: rhodecode/controllers/admin/repos_groups.py:217
+#: rhodecode/controllers/admin/repos_groups.py:222
 #, 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:240
+#: rhodecode/controllers/admin/repos_groups.py:243
 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:261
+msgstr ""
+"Une erreur est survenue durant la suppression de l’utilisateur du groupe "
+"de dépôts."
+
+#: rhodecode/controllers/admin/repos_groups.py:264
 msgid "An error occurred during deletion of group users groups"
-msgstr "Une erreur est survenue durant la suppression du groupe d’utilisateurs du groupe de dépôts."
-
-#: rhodecode/controllers/admin/settings.py:122
+msgstr ""
+"Une erreur est survenue durant la suppression du groupe d’utilisateurs du"
+" groupe de dépôts."
+
+#: rhodecode/controllers/admin/settings.py:123
 #, 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:130
+#: rhodecode/controllers/admin/settings.py:131
 msgid "Whoosh reindex task scheduled"
 msgstr "La tâche de réindexation Whoosh a été planifiée."
 
-#: rhodecode/controllers/admin/settings.py:161
+#: rhodecode/controllers/admin/settings.py:162
 msgid "Updated application settings"
 msgstr "Réglages mis à jour"
 
-#: rhodecode/controllers/admin/settings.py:165
-#: rhodecode/controllers/admin/settings.py:293
+#: rhodecode/controllers/admin/settings.py:166
+#: rhodecode/controllers/admin/settings.py:299
 msgid "error occurred during updating application settings"
 msgstr "Une erreur est survenue durant la mise à jour des options."
 
-#: rhodecode/controllers/admin/settings.py:201
+#: rhodecode/controllers/admin/settings.py:207
 msgid "Updated visualisation settings"
 msgstr "Réglages d’affichage mis à jour."
 
-#: rhodecode/controllers/admin/settings.py:206
+#: rhodecode/controllers/admin/settings.py:212
 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:289
+#: rhodecode/controllers/admin/settings.py:295
 msgid "Updated VCS settings"
 msgstr "Réglages des gestionnaires de versions mis à jour."
 
-#: rhodecode/controllers/admin/settings.py:303
+#: rhodecode/controllers/admin/settings.py:309
 msgid "Added new hook"
 msgstr "Le nouveau hook a été ajouté."
 
-#: rhodecode/controllers/admin/settings.py:315
+#: rhodecode/controllers/admin/settings.py:321
 msgid "Updated hooks"
 msgstr "Hooks mis à jour"
 
-#: rhodecode/controllers/admin/settings.py:319
+#: rhodecode/controllers/admin/settings.py:325
 msgid "error occurred during hook creation"
 msgstr "Une erreur est survenue durant la création du hook."
 
-#: rhodecode/controllers/admin/settings.py:338
+#: rhodecode/controllers/admin/settings.py:344
 msgid "Email task created"
 msgstr "La tâche d’e-mail a été créée."
 
-#: rhodecode/controllers/admin/settings.py:393
+#: rhodecode/controllers/admin/settings.py:399
 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:424
+msgstr ""
+"Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon"
+" fonctionnement de l’application."
+
+#: rhodecode/controllers/admin/settings.py:430
 msgid "Your account was updated successfully"
 msgstr "Votre compte a été mis à jour avec succès"
 
-#: rhodecode/controllers/admin/settings.py:439
-#: rhodecode/controllers/admin/users.py:191
+#: rhodecode/controllers/admin/settings.py:445
+#: rhodecode/controllers/admin/users.py:196
 #, 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"
 msgstr "utilisateur %s créé"
 
 #: rhodecode/controllers/admin/users.py:142
 #, 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:171
+#: rhodecode/controllers/admin/users.py:176
 msgid "User updated successfully"
 msgstr "L’utilisateur a été mis à jour avec succès."
 
-#: rhodecode/controllers/admin/users.py:207
-msgid "successfully deleted user"
-msgstr "L’utilisateur a été supprimé avec succès."
-
 #: rhodecode/controllers/admin/users.py:212
+msgid "successfully deleted user"
+msgstr "L’utilisateur a été supprimé avec succès."
+
+#: rhodecode/controllers/admin/users.py:217
 msgid "An error occurred during deletion of user"
 msgstr "Une erreur est survenue durant la suppression de l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:226
+#: rhodecode/controllers/admin/users.py:231
 msgid "You can't edit this user"
 msgstr "Vous ne pouvez pas éditer cet utilisateur"
 
-#: rhodecode/controllers/admin/users.py:266
+#: rhodecode/controllers/admin/users.py:272
 msgid "Granted 'repository create' permission to user"
 msgstr "La permission de création de dépôts a été accordée à l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:271
+#: rhodecode/controllers/admin/users.py:277
 msgid "Revoked 'repository create' permission to user"
 msgstr "La permission de création de dépôts a été révoquée à l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:277
+#: rhodecode/controllers/admin/users.py:283
 msgid "Granted 'repository fork' permission to user"
 msgstr "La permission de fork de dépôts a été accordée à l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:282
+#: rhodecode/controllers/admin/users.py:288
 msgid "Revoked 'repository fork' permission to user"
 msgstr "La permission de fork de dépôts a été révoquée à l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:288
-#: rhodecode/controllers/admin/users_groups.py:255
+#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users_groups.py:279
 msgid "An error occurred during permissions saving"
 msgstr "Une erreur est survenue durant l’enregistrement des permissions."
 
-#: rhodecode/controllers/admin/users.py:303
+#: rhodecode/controllers/admin/users.py:309
 #, python-format
 msgid "Added email %s to user"
 msgstr "L’e-mail « %s » a été ajouté à l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:309
+#: rhodecode/controllers/admin/users.py:315
 msgid "An error occurred during email saving"
 msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail."
 
-#: rhodecode/controllers/admin/users.py:319
+#: rhodecode/controllers/admin/users.py:325
 msgid "Removed email from user"
 msgstr "L’e-mail a été enlevé de l’utilisateur."
 
-#: rhodecode/controllers/admin/users_groups.py:84
+#: rhodecode/controllers/admin/users_groups.py:86
 #, python-format
 msgid "created users group %s"
 msgstr "Le groupe d’utilisateurs %s a été créé."
 
-#: rhodecode/controllers/admin/users_groups.py:95
+#: rhodecode/controllers/admin/users_groups.py:97
 #, python-format
 msgid "error occurred during creation of users group %s"
 msgstr "Une erreur est survenue durant la création du groupe d’utilisateurs %s."
 
-#: rhodecode/controllers/admin/users_groups.py:135
+#: rhodecode/controllers/admin/users_groups.py:164
 #, python-format
 msgid "updated users group %s"
 msgstr "Le groupe d’utilisateurs %s a été mis à jour."
 
-#: rhodecode/controllers/admin/users_groups.py:157
+#: rhodecode/controllers/admin/users_groups.py:186
 #, python-format
 msgid "error occurred during update of users group %s"
 msgstr "Une erreur est survenue durant la mise à jour du groupe d’utilisateurs %s."
 
-#: rhodecode/controllers/admin/users_groups.py:174
+#: rhodecode/controllers/admin/users_groups.py:203
 msgid "successfully deleted users group"
 msgstr "Le groupe d’utilisateurs a été supprimé avec succès."
 
-#: rhodecode/controllers/admin/users_groups.py:179
+#: rhodecode/controllers/admin/users_groups.py:208
 msgid "An error occurred during deletion of users group"
 msgstr "Une erreur est survenue lors de la suppression du groupe d’utilisateurs."
 
-#: rhodecode/controllers/admin/users_groups.py:233
+#: rhodecode/controllers/admin/users_groups.py:257
 msgid "Granted 'repository create' permission to users 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:238
+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"
-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:244
+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"
 msgstr "La permission de fork de dépôts a été accordée au groupe d’utilisateur."
 
-#: rhodecode/controllers/admin/users_groups.py:249
+#: rhodecode/controllers/admin/users_groups.py:273
 msgid "Revoked 'repository fork' permission to users group"
 msgstr "La permission de fork de dépôts a été révoquée au groupe d’utilisateurs."
 
 #: rhodecode/lib/auth.py:499
 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:540
 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:87
+#: rhodecode/lib/diffs.py:74
+msgid "binary file"
+msgstr "Fichier binaire"
+
+#: rhodecode/lib/diffs.py:90
 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:97
+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
 msgid "No changes detected"
 msgstr "Aucun changement détecté."
 
 #: rhodecode/lib/helpers.py:373
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr "%d/%m/%Y à %H:%M:%S"
 
 #: rhodecode/lib/helpers.py:485
 msgid "True"
 msgstr "Vrai"
 
 #: rhodecode/lib/helpers.py:489
 msgid "False"
 msgstr "Faux"
 
-#: rhodecode/lib/helpers.py:533
+#: rhodecode/lib/helpers.py:529
+#, fuzzy, python-format
+msgid "Deleted branch: %s"
+msgstr "Dépôt %s supprimé"
+
+#: rhodecode/lib/helpers.py:532
+#, fuzzy, python-format
+msgid "Created tag: %s"
+msgstr "utilisateur %s créé"
+
+#: rhodecode/lib/helpers.py:545
 msgid "Changeset not found"
 msgstr "Ensemble de changements non trouvé"
 
-#: rhodecode/lib/helpers.py:556
+#: rhodecode/lib/helpers.py:588
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "Afficher les changements combinés %s->%s"
 
-#: rhodecode/lib/helpers.py:562
+#: rhodecode/lib/helpers.py:594
 msgid "compare view"
 msgstr "vue de comparaison"
 
-#: rhodecode/lib/helpers.py:582
+#: rhodecode/lib/helpers.py:614
 msgid "and"
 msgstr "et"
 
-#: rhodecode/lib/helpers.py:583
+#: rhodecode/lib/helpers.py:615
 #, python-format
 msgid "%s more"
 msgstr "%s de plus"
 
-#: rhodecode/lib/helpers.py:584
-#: rhodecode/templates/changelog/changelog.html:49
+#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51
 msgid "revisions"
 msgstr "révisions"
 
-#: rhodecode/lib/helpers.py:607
-msgid "fork name "
+#: rhodecode/lib/helpers.py:640
+#, fuzzy, python-format
+msgid "fork name %s"
 msgstr "Nom du fork"
 
-#: rhodecode/lib/helpers.py:621
+#: rhodecode/lib/helpers.py:653
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #: rhodecode/templates/pullrequests/pullrequest_show.html:12
 #, python-format
 msgid "Pull request #%s"
 msgstr "Requête de pull nº%s"
 
-#: rhodecode/lib/helpers.py:627
+#: rhodecode/lib/helpers.py:659
 msgid "[deleted] repository"
 msgstr "[a supprimé] le dépôt"
 
-#: rhodecode/lib/helpers.py:629
-#: rhodecode/lib/helpers.py:639
+#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671
 msgid "[created] repository"
 msgstr "[a créé] le dépôt"
 
-#: rhodecode/lib/helpers.py:631
+#: rhodecode/lib/helpers.py:663
 msgid "[created] repository as fork"
 msgstr "[a créé] le dépôt en tant que fork"
 
-#: rhodecode/lib/helpers.py:633
-#: rhodecode/lib/helpers.py:641
+#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673
 msgid "[forked] repository"
 msgstr "[a forké] le dépôt"
 
-#: rhodecode/lib/helpers.py:635
-#: rhodecode/lib/helpers.py:643
+#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675
 msgid "[updated] repository"
 msgstr "[a mis à jour] le dépôt"
 
-#: rhodecode/lib/helpers.py:637
+#: rhodecode/lib/helpers.py:669
 msgid "[delete] repository"
 msgstr "[a supprimé] le dépôt"
 
-#: rhodecode/lib/helpers.py:645
+#: rhodecode/lib/helpers.py:677
 msgid "[created] user"
 msgstr "[a créé] l’utilisateur"
 
-#: rhodecode/lib/helpers.py:647
+#: rhodecode/lib/helpers.py:679
 msgid "[updated] user"
 msgstr "[a mis à jour] l’utilisateur"
 
-#: rhodecode/lib/helpers.py:649
+#: rhodecode/lib/helpers.py:681
 msgid "[created] users group"
 msgstr "[a créé] le groupe d’utilisateurs"
 
-#: rhodecode/lib/helpers.py:651
+#: rhodecode/lib/helpers.py:683
 msgid "[updated] users group"
 msgstr "[a mis à jour] le groupe d’utilisateurs"
 
-#: rhodecode/lib/helpers.py:653
+#: rhodecode/lib/helpers.py:685
 msgid "[commented] on revision in repository"
 msgstr "[a commenté] une révision du dépôt"
 
-#: rhodecode/lib/helpers.py:655
+#: rhodecode/lib/helpers.py:687
 msgid "[commented] on pull request for"
 msgstr "[a commenté] la requête de pull pour"
 
-#: rhodecode/lib/helpers.py:657
+#: rhodecode/lib/helpers.py:689
 msgid "[closed] pull request for"
 msgstr "[a fermé] la requête de pull de"
 
-#: rhodecode/lib/helpers.py:659
+#: rhodecode/lib/helpers.py:691
 msgid "[pushed] into"
 msgstr "[a pushé] dans"
 
-#: rhodecode/lib/helpers.py:661
+#: rhodecode/lib/helpers.py:693
 msgid "[committed via RhodeCode] into repository"
 msgstr "[a commité via RhodeCode] dans le dépôt"
 
-#: rhodecode/lib/helpers.py:663
+#: rhodecode/lib/helpers.py:695
 msgid "[pulled from remote] into repository"
 msgstr "[a pullé depuis un site distant] dans le dépôt"
 
-#: rhodecode/lib/helpers.py:665
+#: rhodecode/lib/helpers.py:697
 msgid "[pulled] from"
 msgstr "[a pullé] depuis"
 
-#: rhodecode/lib/helpers.py:667
+#: rhodecode/lib/helpers.py:699
 msgid "[started following] repository"
 msgstr "[suit maintenant] le dépôt"
 
-#: rhodecode/lib/helpers.py:669
+#: rhodecode/lib/helpers.py:701
 msgid "[stopped following] repository"
 msgstr "[ne suit plus] le dépôt"
 
-#: rhodecode/lib/helpers.py:845
+#: rhodecode/lib/helpers.py:877
 #, python-format
 msgid " and %s more"
 msgstr "et %s de plus"
 
-#: rhodecode/lib/helpers.py:849
+#: rhodecode/lib/helpers.py:881
 msgid "No Files"
 msgstr "Aucun fichier"
 
-#: rhodecode/lib/utils2.py:352
+#: rhodecode/lib/utils2.py:403
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d an"
 msgstr[1] "%d ans"
 
-#: rhodecode/lib/utils2.py:353
+#: rhodecode/lib/utils2.py:404
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mois"
 msgstr[1] "%d mois"
 
-#: rhodecode/lib/utils2.py:354
+#: rhodecode/lib/utils2.py:405
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: rhodecode/lib/utils2.py:355
+#: rhodecode/lib/utils2.py:406
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: rhodecode/lib/utils2.py:356
+#: rhodecode/lib/utils2.py:407
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: rhodecode/lib/utils2.py:357
+#: rhodecode/lib/utils2.py:408
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 
-#: rhodecode/lib/utils2.py:372
+#: rhodecode/lib/utils2.py:424
+#, fuzzy, python-format
+msgid "in %s"
+msgstr "à la ligne %s"
+
+#: rhodecode/lib/utils2.py:426
 #, python-format
 msgid "%s ago"
 msgstr "Il y a %s"
 
-#: rhodecode/lib/utils2.py:374
+#: rhodecode/lib/utils2.py:428
+#, fuzzy, python-format
+msgid "in %s and %s"
+msgstr "Il y a %s et %s"
+
+#: rhodecode/lib/utils2.py:431
 #, python-format
 msgid "%s and %s ago"
 msgstr "Il y a %s et %s"
 
-#: rhodecode/lib/utils2.py:377
+#: rhodecode/lib/utils2.py:434
 msgid "just now"
 msgstr "à l’instant"
 
-#: rhodecode/lib/celerylib/tasks.py:269
+#: rhodecode/lib/celerylib/tasks.py:270
 msgid "password reset link"
 msgstr "Réinitialisation du mot de passe"
 
 #: rhodecode/model/comment.py:110
 #, python-format
 msgid "on line %s"
 msgstr "à la ligne %s"
 
 #: rhodecode/model/comment.py:173
 msgid "[Mention]"
 msgstr "[Mention]"
 
-#: rhodecode/model/db.py:1164
+#: rhodecode/model/db.py:1163
 msgid "Repository no access"
 msgstr "Aucun accès au dépôt"
 
-#: rhodecode/model/db.py:1165
+#: rhodecode/model/db.py:1164
 msgid "Repository read access"
 msgstr "Accès en lecture au dépôt"
 
+#: rhodecode/model/db.py:1165
+msgid "Repository write access"
+msgstr "Accès en écriture au dépôt"
+
 #: rhodecode/model/db.py:1166
-msgid "Repository write access"
-msgstr "Accès en écriture au dépôt"
-
-#: rhodecode/model/db.py:1167
 msgid "Repository admin access"
 msgstr "Accès administrateur au dépôt"
 
-#: rhodecode/model/db.py:1169
+#: rhodecode/model/db.py:1168
 msgid "Repositories Group no access"
 msgstr "Aucun accès au groupe de dépôts"
 
-#: rhodecode/model/db.py:1170
+#: rhodecode/model/db.py:1169
 msgid "Repositories Group read access"
 msgstr "Accès en lecture au groupe de dépôts"
 
-#: rhodecode/model/db.py:1171
+#: rhodecode/model/db.py:1170
 msgid "Repositories Group write access"
 msgstr "Accès en écriture au groupe de dépôts"
 
-#: rhodecode/model/db.py:1172
+#: rhodecode/model/db.py:1171
 msgid "Repositories Group admin access"
 msgstr "Accès administrateur au groupe de dépôts"
 
+#: rhodecode/model/db.py:1173
+msgid "RhodeCode Administrator"
+msgstr "Administrateur RhodeCode"
+
 #: rhodecode/model/db.py:1174
-msgid "RhodeCode Administrator"
-msgstr "Administrateur RhodeCode"
-
-#: rhodecode/model/db.py:1175
 msgid "Repository creation disabled"
 msgstr "Création de dépôt désactivée"
 
-#: rhodecode/model/db.py:1176
+#: rhodecode/model/db.py:1175
 msgid "Repository creation enabled"
 msgstr "Création de dépôt activée"
 
-#: rhodecode/model/db.py:1177
+#: rhodecode/model/db.py:1176
 msgid "Repository forking disabled"
 msgstr "Fork de dépôt désactivé"
 
+#: rhodecode/model/db.py:1177
+msgid "Repository forking enabled"
+msgstr "Fork de dépôt activé"
+
 #: rhodecode/model/db.py:1178
-msgid "Repository forking enabled"
-msgstr "Fork de dépôt activé"
+msgid "Register disabled"
+msgstr "Enregistrement désactivé"
 
 #: rhodecode/model/db.py:1179
-msgid "Register disabled"
-msgstr "Enregistrement désactivé"
-
-#: rhodecode/model/db.py:1180
 msgid "Register new user with RhodeCode with manual activation"
 msgstr "Enregistrer un nouvel utilisateur Rhodecode manuellement activé"
 
-#: rhodecode/model/db.py:1183
+#: rhodecode/model/db.py:1182
 msgid "Register new user with RhodeCode with auto activation"
 msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé"
 
-#: rhodecode/model/db.py:1611
+#: rhodecode/model/db.py:1623
 msgid "Not Reviewed"
 msgstr "Pas encore relue"
 
-#: rhodecode/model/db.py:1612
+#: rhodecode/model/db.py:1624
 msgid "Approved"
 msgstr "Approuvée "
 
-#: rhodecode/model/db.py:1613
+#: rhodecode/model/db.py:1625
 msgid "Rejected"
 msgstr "Rejetée"
 
-#: rhodecode/model/db.py:1614
+#: rhodecode/model/db.py:1626
 msgid "Under Review"
 msgstr "En cours de relecture"
 
 #: rhodecode/model/forms.py:43
 msgid "Please enter a login"
 msgstr "Veuillez entrer un identifiant"
 
 #: rhodecode/model/forms.py:44
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr "Entrez une valeur d’au moins %(min)i caractères de long."
 
 #: rhodecode/model/forms.py:52
 msgid "Please enter a password"
 msgstr "Veuillez entrer un mot de passe"
 
 #: rhodecode/model/forms.py:53
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr "Entrez au moins %(min)i caractères"
 
 #: rhodecode/model/notification.py:220
-msgid "commented on commit"
+#, fuzzy, python-format
+msgid "commented on commit at %(when)s"
 msgstr "a posté un commentaire sur le commit"
 
 #: rhodecode/model/notification.py:221
-msgid "sent message"
+#, fuzzy, python-format
+msgid "sent message at %(when)s"
 msgstr "a envoyé un message"
 
 #: rhodecode/model/notification.py:222
-msgid "mentioned you"
+#, fuzzy, python-format
+msgid "mentioned you at %(when)s"
 msgstr "vous a mentioné"
 
 #: rhodecode/model/notification.py:223
-msgid "registered in RhodeCode"
+#, fuzzy, python-format
+msgid "registered in RhodeCode at %(when)s"
 msgstr "s’est enregistré sur RhodeCode"
 
 #: rhodecode/model/notification.py:224
-msgid "opened new pull request"
+#, fuzzy, python-format
+msgid "opened new pull request at %(when)s"
 msgstr "a ouvert une nouvelle requête de pull"
 
 #: rhodecode/model/notification.py:225
-msgid "commented on pull request"
+#, fuzzy, python-format
+msgid "commented on pull request at %(when)s"
 msgstr "a commenté sur la requête de pull"
 
-#: rhodecode/model/pull_request.py:89
+#: rhodecode/model/pull_request.py:90
 #, 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:535
+#: rhodecode/model/scm.py:542
 msgid "latest tip"
 msgstr "Dernier sommet"
 
 #: rhodecode/model/user.py:230
 msgid "new user registration"
 msgstr "Nouveau compte utilisateur enregistré"
 
-#: rhodecode/model/user.py:255
-#: rhodecode/model/user.py:277
-#: rhodecode/model/user.py:299
+#: rhodecode/model/user.py:255 rhodecode/model/user.py:279
+#: rhodecode/model/user.py:301
 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:323
+msgstr ""
+"Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon"
+" fonctionnement de l’application."
+
+#: rhodecode/model/user.py:325
 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:329
+msgstr ""
+"Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le "
+"bon fonctionnement de l’application."
+
+#: rhodecode/model/user.py:331
 #, python-format
-msgid "user \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories. %s"
-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:36
-#: rhodecode/model/validators.py:37
+msgid ""
+"user \"%s\" still owns %s repositories and cannot be removed. Switch "
+"owners or remove those repositories. %s"
+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:36 rhodecode/model/validators.py:37
 msgid "Value cannot be an empty list"
 msgstr "Cette valeur ne peut être une liste vide."
 
 #: rhodecode/model/validators.py:83
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "Le nom d’utilisateur « %(username)s » existe déjà."
 
 #: rhodecode/model/validators.py:85
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr "Le nom d’utilisateur « %(username)s » n’est pas autorisé"
 
 #: rhodecode/model/validators.py:87
-msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character"
-msgstr "Le nom d’utilisateur 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."
+msgid ""
+"Username may only contain alphanumeric characters underscores, periods or"
+" dashes and must begin with alphanumeric character"
+msgstr ""
+"Le nom d’utilisateur 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:115
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide."
 
 #: rhodecode/model/validators.py:134
 msgid "Invalid users group name"
 msgstr "Nom de groupe d’utilisateurs invalide."
 
 #: rhodecode/model/validators.py:135
 #, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr "Le groupe d’utilisateurs « %(usersgroup)s » existe déjà."
 
 #: rhodecode/model/validators.py:137
-msgid "users 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."
+msgid ""
+"users 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:175
 msgid "Cannot assign this group as parent"
 msgstr "Impossible d’assigner ce groupe en tant que parent."
 
 #: rhodecode/model/validators.py:176
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "Le groupe « %(group_name)s » existe déjà."
 
 #: rhodecode/model/validators.py:178
 #, 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:236
 msgid "Invalid characters (non-ascii) in password"
 msgstr "Caractères incorrects (non-ASCII) dans le mot de passe."
 
 #: rhodecode/model/validators.py:251
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas."
 
 #: rhodecode/model/validators.py:268
 msgid "invalid password"
 msgstr "mot de passe invalide"
 
 #: rhodecode/model/validators.py:269
 msgid "invalid user name"
 msgstr "nom d’utilisateur invalide"
 
 #: rhodecode/model/validators.py:270
 msgid "Your account is disabled"
 msgstr "Votre compte est désactivé"
 
 #: rhodecode/model/validators.py:314
 #, 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:316
 #, 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:317
 #, 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:319
 #, python-format
 msgid "Repositories 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:432
 msgid "invalid clone url"
 msgstr "URL de clonage invalide."
 
 #: rhodecode/model/validators.py:433
 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)."
+msgstr ""
+"URL à cloner invalide. Veuillez fournir une URL valide en http(s) ou "
+"svn+http(s)."
 
 #: rhodecode/model/validators.py:458
 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:473
-#| msgid "You don't have permission to view this page"
 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:498
 msgid "This username or users group name is not valid"
 msgstr "Ce nom d’utilisateur ou de groupe n’est pas valide."
 
 #: rhodecode/model/validators.py:582
 msgid "This is not a valid path"
 msgstr "Ceci n’est pas un chemin valide"
 
 #: rhodecode/model/validators.py:597
 msgid "This e-mail address is already taken"
 msgstr "Cette adresse e-mail est déjà enregistrée"
 
 #: rhodecode/model/validators.py:617
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "L’adresse e-mail « %(email)s » n’existe pas"
 
 #: rhodecode/model/validators.py:654
-msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to \"username\""
-msgstr "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom d’utilisateur."
+msgid ""
+"The LDAP Login attribute of the CN must be specified - this is the name "
+"of the attribute that is equivalent to \"username\""
+msgstr ""
+"L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom"
+" d’utilisateur."
 
 #: rhodecode/model/validators.py:673
 #, 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."
+msgstr ""
+"Les révisions %(revs)s font déjà partie de la requête de pull ou on des "
+"statuts définis."
 
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/repo_switcher_list.html:4
 #: 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/branches/branches.html:9
 #: rhodecode/templates/journal/journal.html:40
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
 msgstr "Filtre rapide…"
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:230
+#: rhodecode/templates/base/base.html:233
 msgid "repositories"
 msgstr "Dépôts"
 
 #: rhodecode/templates/index_base.html:13
 #: rhodecode/templates/index_base.html:15
 #: rhodecode/templates/admin/repos/repos.html:21
 msgid "ADD REPOSITORY"
 msgstr "AJOUTER UN DÉPÔT"
 
 #: rhodecode/templates/index_base.html:29
+#: rhodecode/templates/index_base.html:136
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
 #: rhodecode/templates/admin/users_groups/users_group_add.html:32
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33
 msgid "Group name"
 msgstr "Nom de groupe"
 
 #: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/index_base.html:142
-#: rhodecode/templates/index_base.html:168
+#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/index_base.html:138
+#: rhodecode/templates/index_base.html:176
+#: rhodecode/templates/index_base.html:266
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:72
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
 #: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:66
-#: rhodecode/templates/summary/summary.html:105
+#: rhodecode/templates/summary/summary.html:114
 msgid "Description"
 msgstr "Description"
 
 #: rhodecode/templates/index_base.html:40
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47
 msgid "Repositories group"
 msgstr "Groupe de dépôts"
 
-#: rhodecode/templates/index_base.html:70
-#: rhodecode/templates/index_base.html:166
+#: rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:174
+#: rhodecode/templates/index_base.html:264
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
 #: rhodecode/templates/admin/repos/repos.html:70
-#: rhodecode/templates/admin/users/user_edit.html:192
+#: rhodecode/templates/admin/users/user_edit.html:196
 #: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:181
-#: rhodecode/templates/admin/users/user_edit_my_account.html:217
+#: rhodecode/templates/admin/users/user_edit_my_account.html:180
+#: rhodecode/templates/admin/users/user_edit_my_account.html:216
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:184
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:51
+#: rhodecode/templates/branches/branches.html:50
+#: rhodecode/templates/branches/branches_data.html:6
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:59
-#: rhodecode/templates/journal/journal.html:107
-#: rhodecode/templates/journal/journal.html:186
+#: rhodecode/templates/journal/journal.html:62
+#: rhodecode/templates/journal/journal.html:168
+#: rhodecode/templates/journal/journal_page_repos.html:7
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:123
-#: rhodecode/templates/tags/tags.html:36
+#: rhodecode/templates/summary/summary.html:132
+#: rhodecode/templates/tags/tags.html:51
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr "Nom"
 
-#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/index_base.html:73
 msgid "Last change"
 msgstr "Dernière modification"
 
-#: rhodecode/templates/index_base.html:73
-#: rhodecode/templates/index_base.html:171
-#: rhodecode/templates/admin/users/user_edit_my_account.html:183
-#: rhodecode/templates/journal/journal.html:188
+#: rhodecode/templates/index_base.html:74
+#: rhodecode/templates/index_base.html:179
+#: rhodecode/templates/admin/users/user_edit_my_account.html:182
+#: rhodecode/templates/journal/journal.html:170
 msgid "Tip"
 msgstr "Sommet"
 
-#: rhodecode/templates/index_base.html:74
-#: rhodecode/templates/index_base.html:173
+#: rhodecode/templates/index_base.html:75
+#: rhodecode/templates/index_base.html:181
+#: rhodecode/templates/index_base.html:269
 #: rhodecode/templates/admin/repos/repo_edit.html:121
 #: rhodecode/templates/admin/repos/repos.html:73
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: rhodecode/templates/index_base.html:75
+#: rhodecode/templates/index_base.html:76
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr "RSS"
 
-#: rhodecode/templates/index_base.html:76
+#: rhodecode/templates/index_base.html:77
 msgid "Atom"
 msgstr "Atom"
 
-#: rhodecode/templates/index_base.html:110
-#: rhodecode/templates/index_base.html:112
-#, python-format
-msgid "Subscribe to %s rss feed"
-msgstr "S’abonner au flux RSS de %s"
-
-#: rhodecode/templates/index_base.html:117
-#: rhodecode/templates/index_base.html:119
-#, python-format
-msgid "Subscribe to %s atom feed"
-msgstr "S’abonner au flux ATOM de %s"
-
-#: rhodecode/templates/index_base.html:140
-msgid "Group Name"
-msgstr "Nom du groupe"
-
-#: rhodecode/templates/index_base.html:158
-#: rhodecode/templates/index_base.html:198
+#: rhodecode/templates/index_base.html:167
+#: rhodecode/templates/index_base.html:207
+#: rhodecode/templates/index_base.html:291
 #: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:203
+#: rhodecode/templates/admin/users/user_edit_my_account.html:202
 #: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:211
-#: rhodecode/templates/tags/tags.html:60
+#: rhodecode/templates/branches/branches.html:76
+#: rhodecode/templates/journal/journal.html:193
+#: rhodecode/templates/tags/tags.html:77
 msgid "Click to sort ascending"
 msgstr "Tri ascendant"
 
-#: rhodecode/templates/index_base.html:159
-#: rhodecode/templates/index_base.html:199
+#: rhodecode/templates/index_base.html:168
+#: rhodecode/templates/index_base.html:208
+#: rhodecode/templates/index_base.html:292
 #: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:204
+#: rhodecode/templates/admin/users/user_edit_my_account.html:203
 #: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
-#: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:212
-#: rhodecode/templates/tags/tags.html:61
+#: rhodecode/templates/branches/branches.html:77
+#: rhodecode/templates/journal/journal.html:194
+#: rhodecode/templates/tags/tags.html:78
 msgid "Click to sort descending"
 msgstr "Tri descendant"
 
-#: rhodecode/templates/index_base.html:169
+#: rhodecode/templates/index_base.html:177
+#: rhodecode/templates/index_base.html:267
 msgid "Last Change"
 msgstr "Dernière modification"
 
-#: rhodecode/templates/index_base.html:200
+#: rhodecode/templates/index_base.html:209
+#: rhodecode/templates/index_base.html:293
 #: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:205
+#: rhodecode/templates/admin/users/user_edit_my_account.html:204
 #: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
-#: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:213
-#: rhodecode/templates/tags/tags.html:62
+#: rhodecode/templates/branches/branches.html:78
+#: rhodecode/templates/journal/journal.html:195
+#: rhodecode/templates/tags/tags.html:79
 msgid "No records found."
 msgstr "Aucun élément n’a été trouvé."
 
-#: rhodecode/templates/index_base.html:201
+#: rhodecode/templates/index_base.html:210
+#: rhodecode/templates/index_base.html:294
 #: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:206
+#: rhodecode/templates/admin/users/user_edit_my_account.html:205
 #: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
-#: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:214
-#: rhodecode/templates/tags/tags.html:63
+#: rhodecode/templates/branches/branches.html:79
+#: rhodecode/templates/journal/journal.html:196
+#: rhodecode/templates/tags/tags.html:80
 msgid "Data error."
 msgstr "Erreur d’intégrité des données."
 
-#: rhodecode/templates/index_base.html:202
+#: rhodecode/templates/index_base.html:211
+#: rhodecode/templates/index_base.html:295
 #: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:207
+#: rhodecode/templates/admin/users/user_edit_my_account.html:206
 #: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
-#: rhodecode/templates/branches/branches.html:81
-#: rhodecode/templates/journal/journal.html:215
-#: rhodecode/templates/tags/tags.html:64
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:54
+#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/tags/tags.html:81
 msgid "Loading..."
 msgstr "Chargement…"
 
-#: rhodecode/templates/login.html:5
-#: rhodecode/templates/login.html:54
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
 msgid "Sign In"
 msgstr "Connexion"
 
 #: rhodecode/templates/login.html:21
 msgid "Sign In to"
 msgstr "Connexion à"
 
-#: rhodecode/templates/login.html:31
-#: rhodecode/templates/register.html:20
+#: 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:50
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
 #: rhodecode/templates/base/base.html:83
-#: rhodecode/templates/summary/summary.html:122
+#: rhodecode/templates/summary/summary.html:131
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
-#: rhodecode/templates/login.html:40
-#: rhodecode/templates/register.html:29
+#: 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:92
 msgid "Password"
 msgstr "Mot de passe"
 
 #: rhodecode/templates/login.html:50
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
 #: rhodecode/templates/login.html:60
 msgid "Forgot your password ?"
 msgstr "Mot de passe oublié ?"
 
-#: rhodecode/templates/login.html:63
-#: rhodecode/templates/base/base.html:103
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103
 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é ?"
 
 #: rhodecode/templates/password_reset.html:11
 msgid "Reset your password to"
 msgstr "Réinitialiser votre mot de passe"
 
 #: rhodecode/templates/password_reset.html:21
 msgid "Email address"
 msgstr "Adresse e-mail"
 
 #: rhodecode/templates/password_reset.html:30
 msgid "Reset my password"
 msgstr "Réinitialiser mon mot de passe"
 
 #: rhodecode/templates/password_reset.html:31
 msgid "Password reset link will be send to matching email address"
 msgstr "Votre nouveau mot de passe sera envoyé à l’adresse correspondante."
 
-#: rhodecode/templates/register.html:5
-#: rhodecode/templates/register.html:74
+#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74
 msgid "Sign Up"
 msgstr "Inscription"
 
 #: rhodecode/templates/register.html:11
 msgid "Sign Up to"
 msgstr "Inscription à"
 
 #: rhodecode/templates/register.html:38
 msgid "Re-enter password"
 msgstr "Confirmation"
 
 #: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:86
+#: rhodecode/templates/admin/users/user_edit.html:90
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
 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:95
+#: rhodecode/templates/admin/users/user_edit.html:99
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
 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:104
+#: rhodecode/templates/admin/users/user_edit.html:108
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:124
+#: rhodecode/templates/summary/summary.html:133
 msgid "Email"
 msgstr "E-mail"
 
 #: rhodecode/templates/register.html:76
 msgid "Your account will be activated right after registration"
 msgstr "Votre compte utilisateur sera actif dès la fin de l’enregistrement."
 
 #: rhodecode/templates/register.html:78
 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/admin/repos/repo_add_base.html:65
 #: rhodecode/templates/admin/repos/repo_edit.html:85
 #: rhodecode/templates/settings/repo_settings.html:76
 msgid "Private repository"
 msgstr "Dépôt privé"
 
 #: rhodecode/templates/repo_switcher_list.html:16
 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:33
+#: 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"
 msgstr "Aucun signet n’a été créé."
 
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:9
 msgid "Admin journal"
 msgstr "Historique d’administration"
 
 #: rhodecode/templates/admin/admin_log.html:6
 #: rhodecode/templates/admin/repos/repos.html:74
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9
-#: rhodecode/templates/journal/journal.html:61
-#: rhodecode/templates/journal/journal.html:62
+#: rhodecode/templates/journal/journal_page_repos.html:9
+#: rhodecode/templates/journal/journal_page_repos.html:10
 msgid "Action"
 msgstr "Action"
 
 #: rhodecode/templates/admin/admin_log.html:7
 msgid "Repository"
 msgstr "Dépôt"
 
 #: rhodecode/templates/admin/admin_log.html:8
 #: rhodecode/templates/bookmarks/bookmarks.html:37
 #: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:52
-#: rhodecode/templates/tags/tags.html:37
+#: rhodecode/templates/branches/branches.html:51
+#: rhodecode/templates/branches/branches_data.html:7
+#: rhodecode/templates/tags/tags.html:52
 #: rhodecode/templates/tags/tags_data.html:7
 msgid "Date"
 msgstr "Date"
 
 #: rhodecode/templates/admin/admin_log.html:9
 msgid "From IP"
 msgstr "Depuis l’adresse IP"
 
-#: rhodecode/templates/admin/admin_log.html:53
+#: rhodecode/templates/admin/admin_log.html:57
 msgid "No actions yet"
 msgstr "Aucune action n’a été enregistrée pour le moment."
 
 #: rhodecode/templates/admin/ldap/ldap.html:5
 msgid "LDAP administration"
 msgstr "Administration LDAP"
 
 #: rhodecode/templates/admin/ldap/ldap.html:11
 msgid "Ldap"
 msgstr "LDAP"
 
 #: rhodecode/templates/admin/ldap/ldap.html:28
 msgid "Connection settings"
 msgstr "Options de connexion"
 
 #: rhodecode/templates/admin/ldap/ldap.html:30
 msgid "Enable LDAP"
 msgstr "Activer le LDAP"
 
 #: rhodecode/templates/admin/ldap/ldap.html:34
 msgid "Host"
 msgstr "Serveur"
 
 #: rhodecode/templates/admin/ldap/ldap.html:38
 msgid "Port"
 msgstr "Port"
 
 #: rhodecode/templates/admin/ldap/ldap.html:42
 msgid "Account"
 msgstr "Compte"
 
 #: rhodecode/templates/admin/ldap/ldap.html:50
 msgid "Connection security"
 msgstr "Connexion sécurisée"
 
 #: rhodecode/templates/admin/ldap/ldap.html:54
 msgid "Certificate Checks"
 msgstr "Vérif. des certificats"
 
 #: rhodecode/templates/admin/ldap/ldap.html:57
 msgid "Search settings"
 msgstr "Réglages de recherche"
 
 #: rhodecode/templates/admin/ldap/ldap.html:59
 msgid "Base DN"
 msgstr "Base de recherche"
 
 #: rhodecode/templates/admin/ldap/ldap.html:63
 msgid "LDAP Filter"
 msgstr "Filtre de recherche"
 
 #: rhodecode/templates/admin/ldap/ldap.html:67
 msgid "LDAP Search Scope"
 msgstr "Portée de recherche"
 
 #: rhodecode/templates/admin/ldap/ldap.html:70
 msgid "Attribute mappings"
 msgstr "Correspondance des attributs"
 
 #: rhodecode/templates/admin/ldap/ldap.html:72
 msgid "Login Attribute"
 msgstr "Attribut pour le nom d’utilisateur"
 
 #: rhodecode/templates/admin/ldap/ldap.html:76
 msgid "First Name Attribute"
 msgstr "Attribut pour le prénom"
 
 #: rhodecode/templates/admin/ldap/ldap.html:80
 msgid "Last Name Attribute"
 msgstr "Attribut pour le nom de famille"
 
 #: rhodecode/templates/admin/ldap/ldap.html:84
 msgid "E-mail Attribute"
 msgstr "Attribut pour l’e-mail"
 
 #: rhodecode/templates/admin/ldap/ldap.html:89
 #: rhodecode/templates/admin/repos/repo_edit.html:141
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
 #: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_edit.html:129
-#: rhodecode/templates/admin/users/user_edit.html:174
+#: rhodecode/templates/admin/users/user_edit.html:133
+#: rhodecode/templates/admin/users/user_edit.html:178
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:93
 msgid "Save"
 msgstr "Enregistrer"
 
 #: rhodecode/templates/admin/notifications/notifications.html:5
 #: rhodecode/templates/admin/notifications/notifications.html:9
 msgid "My Notifications"
 msgstr "Mes notifications"
 
 #: rhodecode/templates/admin/notifications/notifications.html:29
 msgid "All"
 msgstr "Tous"
 
 #: rhodecode/templates/admin/notifications/notifications.html:30
 msgid "Comments"
 msgstr "Commentaires"
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:263
-#: rhodecode/templates/base/base.html:265
+#: rhodecode/templates/base/base.html:266
+#: rhodecode/templates/base/base.html:268
 msgid "Pull requests"
 msgstr "Requêtes de pull"
 
 #: rhodecode/templates/admin/notifications/notifications.html:35
 msgid "Mark all read"
 msgstr "Tout marquer comme lu"
 
 #: rhodecode/templates/admin/notifications/notifications_data.html:39
 msgid "No notifications here yet"
 msgstr "Aucune notification pour le moment."
 
 #: rhodecode/templates/admin/notifications/show_notification.html:5
 #: rhodecode/templates/admin/notifications/show_notification.html:11
 msgid "Show notification"
 msgstr "Notification"
 
 #: rhodecode/templates/admin/notifications/show_notification.html:9
 msgid "Notifications"
 msgstr "Notifications"
 
 #: rhodecode/templates/admin/permissions/permissions.html:5
 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:58
-#: rhodecode/templates/admin/users/user_edit.html:139
+#: rhodecode/templates/admin/users/user_edit.html:143
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
 #: rhodecode/templates/settings/repo_settings.html:86
 msgid "Permissions"
 msgstr "Permissions"
 
 #: rhodecode/templates/admin/permissions/permissions.html:24
 msgid "Default permissions"
 msgstr "Permissions par défaut"
 
 #: rhodecode/templates/admin/permissions/permissions.html:31
 msgid "Anonymous access"
 msgstr "Accès anonyme"
 
 #: rhodecode/templates/admin/permissions/permissions.html:41
 msgid "Repository permission"
 msgstr "Permissions du dépôt"
 
 #: rhodecode/templates/admin/permissions/permissions.html:49
-msgid "All default permissions on each repository will be reset to choosen permission, note that all custom default permission on repositories 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 perdues."
+msgid ""
+"All default permissions on each repository will be reset to choosen "
+"permission, note that all custom default permission on repositories 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 "
+"perdues."
 
 #: rhodecode/templates/admin/permissions/permissions.html:50
 msgid "overwrite existing settings"
 msgstr "Écraser les permissions existantes"
 
 #: rhodecode/templates/admin/permissions/permissions.html:55
 msgid "Registration"
 msgstr "Enregistrement"
 
 #: rhodecode/templates/admin/permissions/permissions.html:63
 msgid "Repository creation"
 msgstr "Création de dépôt"
 
 #: rhodecode/templates/admin/permissions/permissions.html:71
 msgid "Repository forking"
 msgstr "Fork de dépôt"
 
 #: rhodecode/templates/admin/permissions/permissions.html:78
-#: rhodecode/templates/admin/repos/repo_edit.html:255
+#: rhodecode/templates/admin/repos/repo_edit.html:264
 msgid "set"
 msgstr "Définir"
 
 #: rhodecode/templates/admin/repos/repo_add.html:5
 #: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
 msgid "Add repository"
 msgstr "Ajouter un dépôt"
 
 #: 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
 msgid "Repositories"
 msgstr "Dépôts"
 
 #: rhodecode/templates/admin/repos/repo_add.html:13
 msgid "add new"
 msgstr "ajouter un nouveau"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:95
-#: rhodecode/templates/summary/summary.html:96
+#: rhodecode/templates/summary/summary.html:104
+#: rhodecode/templates/summary/summary.html:105
 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: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/repos/repo_add_base.html:33
 #: rhodecode/templates/forks/fork.html:54
 msgid "Optionaly select a group to put this repository into."
 msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt."
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:38
 #: rhodecode/templates/admin/repos/repo_edit.html:58
 msgid "Type"
 msgstr "Type"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:42
 msgid "Type of repository to create."
 msgstr "Type de dépôt à créer."
 
 #: 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
 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
 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 recherche et de documentation."
+msgstr ""
+"Révision par défaut pour les pages de fichiers, de téléchargements, de "
+"recherche et de documentation."
 
 #: 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
 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."
+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:69
 #: rhodecode/templates/admin/repos/repo_edit.html:89
 #: rhodecode/templates/forks/fork.html:72
 #: rhodecode/templates/settings/repo_settings.html:80
-msgid "Private repositories are only visible to people explicitly added as collaborators."
-msgstr "Les dépôts privés sont visibles seulement par les utilisateurs ajoutés comme collaborateurs."
+msgid ""
+"Private repositories are only visible to people explicitly added as "
+"collaborators."
+msgstr ""
+"Les dépôts privés sont visibles seulement par les utilisateurs ajoutés "
+"comme collaborateurs."
 
 #: 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
 msgid "Edit repository"
 msgstr "Éditer le dépôt"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:13
 #: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:224
-#: rhodecode/templates/admin/users/user_edit.html:226
+#: rhodecode/templates/admin/users/user_edit.html:228
+#: rhodecode/templates/admin/users/user_edit.html:230
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/files/files_source.html:44
-#: rhodecode/templates/journal/journal.html:81
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
+#: rhodecode/templates/files/files_source.html:29
+#: rhodecode/templates/journal/journal_page_repos.html:29
 msgid "edit"
 msgstr "éditer"
 
 #: 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."
 
 #: rhodecode/templates/admin/repos/repo_edit.html:94
 msgid "Enable statistics"
 msgstr "Activer les statistiques"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:98
 msgid "Enable statistics window on summary page."
 msgstr "Afficher les statistiques sur la page du dépôt."
 
 #: rhodecode/templates/admin/repos/repo_edit.html:103
 msgid "Enable downloads"
 msgstr "Activer les téléchargements"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:107
 msgid "Enable download menu on summary page."
 msgstr "Afficher le menu de téléchargements sur la page du dépôt."
 
 #: rhodecode/templates/admin/repos/repo_edit.html:112
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
 msgid "Enable locking"
 msgstr "Activer le verrouillage"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:116
 msgid "Enable lock-by-pulling on repository."
 msgstr "Activer le verrouillage lors d’un pull sur le dépôt."
 
 #: rhodecode/templates/admin/repos/repo_edit.html:126
 msgid "Change owner of this repository."
 msgstr "Changer le propriétaire de ce dépôt."
 
 #: rhodecode/templates/admin/repos/repo_edit.html:142
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
 #: rhodecode/templates/admin/settings/settings.html:113
-#: rhodecode/templates/admin/settings/settings.html:168
-#: rhodecode/templates/admin/settings/settings.html:258
-#: rhodecode/templates/admin/users/user_edit.html:130
-#: rhodecode/templates/admin/users/user_edit.html:175
-#: rhodecode/templates/admin/users/user_edit.html:278
+#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:269
+#: rhodecode/templates/admin/users/user_edit.html:134
+#: rhodecode/templates/admin/users/user_edit.html:179
+#: rhodecode/templates/admin/users/user_edit.html:282
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
 #: 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:122
+#: rhodecode/templates/pullrequests/pullrequest.html:124
 #: rhodecode/templates/settings/repo_settings.html:94
 msgid "Reset"
 msgstr "Réinitialiser"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr "Administration"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:155
 msgid "Statistics"
 msgstr "Statistiques"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Reset current statistics"
 msgstr "Réinitialiser les statistiques"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:159
 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
 msgid "Fetched to rev"
 msgstr "Parcouru jusqu’à la révision"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:163
 msgid "Stats gathered"
 msgstr "Statistiques obtenues"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:171
 msgid "Remote"
 msgstr "Dépôt distant"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Pull changes from remote location"
 msgstr "Récupérer les changements depuis le site distant"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:175
 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
 msgid "Cache"
 msgstr "Cache"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:190
 msgid "Invalidate repository cache"
 msgstr "Invalider le cache du dépôt"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:190
 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
-msgid "Manually invalidate cache for this repository. On first access repository will be cached again"
-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."
+msgid ""
+"Manually invalidate cache for this repository. On first access repository"
+" will be cached again"
+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
 msgid "List of cached values"
 msgstr "Liste des valeurs en cache"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:209
-#: rhodecode/templates/base/base.html:327
-#: rhodecode/templates/base/base.html:329
-#: rhodecode/templates/base/base.html:331
+#: rhodecode/templates/admin/repos/repo_edit.html:201
+msgid "Prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:202
+#, fuzzy
+msgid "Key"
+msgstr "Clé d’API"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:203
+#: rhodecode/templates/admin/users/user_add.html:86
+#: rhodecode/templates/admin/users/user_edit.html:117
+#: rhodecode/templates/admin/users_groups/users_group_add.html:41
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
+msgid "Active"
+msgstr "Actif"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:218
+#: rhodecode/templates/base/base.html:330
+#: rhodecode/templates/base/base.html:332
+#: rhodecode/templates/base/base.html:334
 msgid "Public journal"
 msgstr "Journal public"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:215
+#: rhodecode/templates/admin/repos/repo_edit.html:224
 msgid "Remove from public journal"
 msgstr "Supprimer du journal public"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:217
+#: rhodecode/templates/admin/repos/repo_edit.html:226
 msgid "Add to public journal"
 msgstr "Ajouter le dépôt au journal public"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:222
-msgid "All actions made on this repository will be accessible to everyone in public journal"
-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:229
+#: rhodecode/templates/admin/repos/repo_edit.html:231
+msgid ""
+"All actions made on this repository will be accessible to everyone in "
+"public journal"
+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
 msgid "Locking"
 msgstr "Verrouillage"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:234
+#: rhodecode/templates/admin/repos/repo_edit.html:243
 msgid "Unlock locked repo"
 msgstr "Déverrouiller le dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:234
+#: rhodecode/templates/admin/repos/repo_edit.html:243
 msgid "Confirm to unlock repository"
 msgstr "Veuillez confirmer le déverrouillage de ce dépôt."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:237
+#: rhodecode/templates/admin/repos/repo_edit.html:246
 msgid "lock repo"
 msgstr "Verrouiller le dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:237
+#: rhodecode/templates/admin/repos/repo_edit.html:246
 msgid "Confirm to lock repository"
 msgstr "Veuillez confirmer le verrouillage de ce dépôt."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:238
+#: rhodecode/templates/admin/repos/repo_edit.html:247
 msgid "Repository is not locked"
 msgstr "Ce dépôt n’est pas verrouillé."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:243
+#: rhodecode/templates/admin/repos/repo_edit.html:252
 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:250
+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
 msgid "Set as fork of"
 msgstr "Indiquer comme fork"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:259
+#: rhodecode/templates/admin/repos/repo_edit.html:268
 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:265
+#: rhodecode/templates/admin/repos/repo_edit.html:274
 #: rhodecode/templates/changeset/changeset_file_comment.html:26
 msgid "Delete"
 msgstr "Supprimer"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:269
+#: rhodecode/templates/admin/repos/repo_edit.html:278
 msgid "Remove this repository"
 msgstr "Supprimer ce dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:269
-#: rhodecode/templates/journal/journal.html:84
+#: rhodecode/templates/admin/repos/repo_edit.html:278
 msgid "Confirm to delete this repository"
 msgstr "Voulez-vous vraiment supprimer ce dépôt ?"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:273
+#: rhodecode/templates/admin/repos/repo_edit.html:282
 msgid ""
-"This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems.\n"
-"                         If you need fully delete it from filesystem please do it manually"
+"This repository will be renamed in a special way in order to be "
+"unaccesible for RhodeCode and VCS systems.\n"
+"                         If you need fully delete it from filesystem "
+"please do it manually"
 msgstr ""
-"Ce dépôt sera renommé de manière à le rendre inaccessible à RhodeCode et au système de gestion de versions.\n"
-"Si vous voulez le supprimer complètement, effectuez la suppression manuellement. Ce dépôt sera renommé de manière à le rendre inaccessible à RhodeCode et au système de gestion de versions.\n"
-"Si vous voulez le supprimer complètement, effectuez la suppression manuellement."
+"Ce dépôt sera renommé de manière à le rendre inaccessible à RhodeCode et "
+"au système de gestion de versions.\n"
+"Si vous voulez le supprimer complètement, effectuez la suppression "
+"manuellement. Ce dépôt sera renommé de manière à le rendre inaccessible à"
+" RhodeCode et au système de gestion de versions.\n"
+"Si vous voulez le supprimer complètement, effectuez la suppression "
+"manuellement."
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
 msgid "none"
 msgstr "Aucune"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:4
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
 msgid "read"
 msgstr "Lecture"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:5
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
 msgid "write"
 msgstr "Écriture"
 
 #: 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:226
+#: rhodecode/templates/base/base.html:229
 msgid "admin"
 msgstr "Administration"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:7
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7
 msgid "member"
 msgstr "Membre"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
 #: rhodecode/templates/data_table/_dt_elements.html:67
-#: rhodecode/templates/journal/journal.html:132
-#: rhodecode/templates/summary/summary.html:76
+#: rhodecode/templates/journal/journal.html:87
+#: 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
 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
 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
 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
 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"
 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
 msgid "apply to children"
 msgstr "Appliquer aux enfants"
 
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74
-msgid "Set or revoke permission to all children of that group, including repositories and other groups"
-msgstr "Applique ou révoque les permissions sur tous les éléments de ce groupe, notamment les dépôts et sous-groupes."
+msgid ""
+"Set or revoke permission to all children of that group, including "
+"repositories and other groups"
+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:9
 #: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:309
-#: rhodecode/templates/base/base.html:311
-#: rhodecode/templates/base/base.html:313
+#: rhodecode/templates/base/base.html:312
+#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:316
 #: 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/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"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:13
 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"
 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:50
 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:117
+#: rhodecode/templates/pullrequests/pullrequest_show.html:131
 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"
 msgstr "Édition du groupe de dépôt"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
-msgid "Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside"
-msgstr "Activer le verrou lors d’un pull sur le groupe. Cette option sera appliquée à tous les sous-groupes et dépôts de ce groupe."
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other"
+" groups and repositories inside"
+msgstr ""
+"Activer le verrou lors d’un pull sur le groupe. Cette option sera "
+"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"
 msgstr "Administration des groupes de dépôts"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
 msgid "ADD NEW GROUP"
 msgstr "AJOUTER UN NOUVEAU GROUPE"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
 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:54
-#: rhodecode/templates/admin/users/user_edit.html:255
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/users/user_edit.html:259
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 #: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:121
 msgid "delete"
 msgstr "Supprimer"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
-#, python-format
-msgid "Confirm to delete this group: %s"
-msgstr "Voulez-vous vraiment supprimer le groupe « %s » ?"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#, 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] "Voulez-vous vraiment supprimer ce dépôt ?"
+msgstr[1] ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63
 msgid "There are no repositories groups yet"
 msgstr "Aucun groupe de dépôts n’a été créé pour le moment."
 
 #: rhodecode/templates/admin/settings/hooks.html:5
 #: rhodecode/templates/admin/settings/settings.html:5
 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)"
 
 #: rhodecode/templates/admin/settings/hooks.html:40
 msgid "Custom hooks"
 msgstr "Hooks personnalisés"
 
 #: rhodecode/templates/admin/settings/hooks.html:56
 msgid "remove"
 msgstr "Enlever"
 
 #: rhodecode/templates/admin/settings/hooks.html:88
 msgid "Failed to remove hook"
 msgstr "Erreur lors de la suppression du hook."
 
 #: rhodecode/templates/admin/settings/settings.html:24
 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"
 msgstr "Option de re-scan"
 
 #: rhodecode/templates/admin/settings/settings.html:38
-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 "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."
+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 ""
+"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"
 msgstr "Supprimer les données obsolètes"
 
 #: rhodecode/templates/admin/settings/settings.html:41
-msgid "Rescan repositories location for new repositories. Also deletes obsolete if `destroy` flag is checked "
-msgstr "Rescanner le dossier contenant les dépôts pour en trouver de nouveaux. Supprime égalements les entrées de dépôts obsolètes si « Supprimer les données obsolètes » est coché."
+msgid ""
+"Rescan repositories location for new repositories. Also deletes obsolete "
+"if `destroy` flag is checked "
+msgstr ""
+"Rescanner le dossier contenant les dépôts pour en trouver de nouveaux. "
+"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
 msgid "Rescan repositories"
 msgstr "Re-scanner les dépôts"
 
 #: rhodecode/templates/admin/settings/settings.html:52
 msgid "Whoosh indexing"
 msgstr "Indexation Whoosh"
 
 #: rhodecode/templates/admin/settings/settings.html:60
 msgid "index build option"
 msgstr "Option d’indexation"
 
 #: rhodecode/templates/admin/settings/settings.html:65
 msgid "build from scratch"
 msgstr "Purger et reconstruire l’index"
 
 #: rhodecode/templates/admin/settings/settings.html:71
 msgid "Reindex"
 msgstr "Mettre à jour l’index"
 
 #: rhodecode/templates/admin/settings/settings.html:77
 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:167
-#: rhodecode/templates/admin/settings/settings.html:257
+#: rhodecode/templates/admin/settings/settings.html:178
+#: rhodecode/templates/admin/settings/settings.html:268
 msgid "Save settings"
 msgstr "Enregister les options"
 
 #: rhodecode/templates/admin/settings/settings.html:119
 msgid "Visualisation settings"
 msgstr "Réglages d’affichage"
 
-#: rhodecode/templates/admin/settings/settings.html:128
+#: rhodecode/templates/admin/settings/settings.html:127
+#, fuzzy
+msgid "General"
+msgstr "Activer"
+
+#: rhodecode/templates/admin/settings/settings.html:132
+msgid "Use lightweight dashboard"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:139
 msgid "Icons"
 msgstr "Icônes"
 
-#: rhodecode/templates/admin/settings/settings.html:133
-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:137
-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:144
+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
+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
 msgid "Meta-Tagging"
 msgstr "Meta-Tagging"
 
-#: rhodecode/templates/admin/settings/settings.html:149
+#: rhodecode/templates/admin/settings/settings.html:160
 msgid "Stylify recognised metatags:"
 msgstr "Styliser les méta-tags reconnus :"
 
-#: rhodecode/templates/admin/settings/settings.html:176
+#: rhodecode/templates/admin/settings/settings.html:187
 msgid "VCS settings"
 msgstr "Réglages de gestionnaire de version"
 
-#: rhodecode/templates/admin/settings/settings.html:185
+#: rhodecode/templates/admin/settings/settings.html:196
 msgid "Web"
 msgstr "Web"
 
-#: rhodecode/templates/admin/settings/settings.html:190
+#: rhodecode/templates/admin/settings/settings.html:201
 msgid "require ssl for vcs operations"
 msgstr "SSL requis pour les opérations de push/pull"
 
-#: rhodecode/templates/admin/settings/settings.html:192
-msgid "RhodeCode will require SSL for pushing or pulling. If SSL is missing it will return HTTP Error 406: Not Acceptable"
-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:198
-msgid "Hooks"
-msgstr "Hooks"
-
 #: rhodecode/templates/admin/settings/settings.html:203
+msgid ""
+"RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
+"will return HTTP Error 406: Not Acceptable"
+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
+msgid "Hooks"
+msgstr "Hooks"
+
+#: rhodecode/templates/admin/settings/settings.html:214
 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:207
+#: rhodecode/templates/admin/settings/settings.html:218
 msgid "Show repository size after push"
 msgstr "Afficher la taille du dépôt après un push"
 
-#: rhodecode/templates/admin/settings/settings.html:211
+#: rhodecode/templates/admin/settings/settings.html:222
 msgid "Log user push commands"
 msgstr "Journaliser les commandes de push"
 
-#: rhodecode/templates/admin/settings/settings.html:215
+#: rhodecode/templates/admin/settings/settings.html:226
 msgid "Log user pull commands"
 msgstr "Journaliser les commandes de pull"
 
-#: rhodecode/templates/admin/settings/settings.html:219
+#: rhodecode/templates/admin/settings/settings.html:230
 msgid "advanced setup"
 msgstr "Avancé"
 
-#: rhodecode/templates/admin/settings/settings.html:224
+#: rhodecode/templates/admin/settings/settings.html:235
 msgid "Mercurial Extensions"
 msgstr "Extensions Mercurial"
 
-#: rhodecode/templates/admin/settings/settings.html:229
+#: rhodecode/templates/admin/settings/settings.html:240
 msgid "largefiles extensions"
 msgstr "Extensions largefiles"
 
-#: rhodecode/templates/admin/settings/settings.html:233
+#: rhodecode/templates/admin/settings/settings.html:244
 msgid "hgsubversion extensions"
 msgstr "Extensions hgsubversion"
 
-#: rhodecode/templates/admin/settings/settings.html:235
-msgid "Requires hgsubversion library installed. Allows clonning 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:245
+#: rhodecode/templates/admin/settings/settings.html:246
+msgid ""
+"Requires hgsubversion library installed. Allows clonning 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
 msgid "Repositories location"
 msgstr "Emplacement des dépôts"
 
-#: rhodecode/templates/admin/settings/settings.html:250
-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 "Ce réglage ne devrait pas être modifié en temps normal. Si vous devez 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:251
-#: rhodecode/templates/base/base.html:218
+#: rhodecode/templates/admin/settings/settings.html:261
+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 ""
+"Ce réglage ne devrait pas être modifié en temps normal. Si vous devez "
+"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:221
 msgid "unlock"
 msgstr "Déverrouiller"
 
-#: rhodecode/templates/admin/settings/settings.html:252
-msgid "Location where repositories are stored. After changing this value a restart, and rescan is required"
-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:272
+#: rhodecode/templates/admin/settings/settings.html:263
+msgid ""
+"Location where repositories are stored. After changing this value a "
+"restart, and rescan is required"
+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
 msgid "Test Email"
 msgstr "E-mail de test"
 
-#: rhodecode/templates/admin/settings/settings.html:280
+#: rhodecode/templates/admin/settings/settings.html:291
 msgid "Email to"
 msgstr "Envoyer l’e-mail à"
 
-#: rhodecode/templates/admin/settings/settings.html:288
+#: rhodecode/templates/admin/settings/settings.html:299
 msgid "Send"
 msgstr "Envoyer"
 
-#: rhodecode/templates/admin/settings/settings.html:294
+#: rhodecode/templates/admin/settings/settings.html:305
 msgid "System Info and Packages"
 msgstr "Information système et paquets"
 
-#: rhodecode/templates/admin/settings/settings.html:297
+#: rhodecode/templates/admin/settings/settings.html:308
 msgid "show"
 msgstr "Montrer"
 
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr "Ajouter un utilisateur"
 
 #: rhodecode/templates/admin/users/user_add.html:10
 #: rhodecode/templates/admin/users/user_edit.html:11
 msgid "Users"
 msgstr "Utilisateurs"
 
 #: rhodecode/templates/admin/users/user_add.html:12
 msgid "add new user"
 msgstr "nouvel utilisateur"
 
 #: rhodecode/templates/admin/users/user_add.html:50
 msgid "Password confirmation"
 msgstr "Confirmation"
 
-#: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:113
-#: rhodecode/templates/admin/users_groups/users_group_add.html:41
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-msgid "Active"
-msgstr "Actif"
-
 #: rhodecode/templates/admin/users/user_edit.html:5
 msgid "Edit user"
 msgstr "Éditer l'utilisateur"
 
 #: rhodecode/templates/admin/users/user_edit.html:34
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10
 msgid "Change your avatar at"
 msgstr "Vous pouvez changer votre avatar sur"
 
 #: rhodecode/templates/admin/users/user_edit.html:35
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:11
 msgid "Using"
 msgstr "en utilisant l’adresse"
 
 #: rhodecode/templates/admin/users/user_edit.html:43
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:20
 msgid "API key"
 msgstr "Clé d’API"
 
-#: rhodecode/templates/admin/users/user_edit.html:59
+#: rhodecode/templates/admin/users/user_edit.html:63
 msgid "LDAP DN"
 msgstr "DN LDAP"
 
-#: rhodecode/templates/admin/users/user_edit.html:68
+#: rhodecode/templates/admin/users/user_edit.html:72
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:35
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: rhodecode/templates/admin/users/user_edit.html:77
+#: rhodecode/templates/admin/users/user_edit.html:81
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
 msgid "New password confirmation"
 msgstr "Confirmation du nouveau mot de passe"
 
-#: rhodecode/templates/admin/users/user_edit.html:147
+#: rhodecode/templates/admin/users/user_edit.html:151
 #: 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:152
+#: rhodecode/templates/admin/users/user_edit.html:156
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113
 #, python-format
-msgid "Select to inherit permissions from %s settings. With this selected below options does not have any action"
-msgstr "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:158
+msgid ""
+"Select to inherit permissions from %s settings. With this selected below "
+"options does not have any action"
+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:162
 #: 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:166
+#: rhodecode/templates/admin/users/user_edit.html:170
 #: 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:186
+#: rhodecode/templates/admin/users/user_edit.html:190
 #: 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/users/user_edit.html:193
+#: rhodecode/templates/admin/users/user_edit.html:197
 #: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:218
+#: rhodecode/templates/admin/users/user_edit_my_account.html:217
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
 msgid "Permission"
 msgstr "Permission"
 
-#: rhodecode/templates/admin/users/user_edit.html:194
+#: rhodecode/templates/admin/users/user_edit.html:198
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
 msgid "Edit Permission"
 msgstr "Éditer"
 
-#: rhodecode/templates/admin/users/user_edit.html:243
+#: rhodecode/templates/admin/users/user_edit.html:247
 msgid "Email addresses"
 msgstr "Adresses e-mail"
 
-#: rhodecode/templates/admin/users/user_edit.html:256
+#: rhodecode/templates/admin/users/user_edit.html:260
 #, 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:270
+#: rhodecode/templates/admin/users/user_edit.html:274
 msgid "New email address"
 msgstr "Nouvelle adrese"
 
-#: rhodecode/templates/admin/users/user_edit.html:277
+#: rhodecode/templates/admin/users/user_edit.html:281
 msgid "Add"
 msgstr "Ajouter"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
 #: rhodecode/templates/base/base.html:124
 msgid "My account"
 msgstr "Mon compte"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:9
 msgid "My Account"
 msgstr "Mon compte"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:35
 msgid "My permissions"
 msgstr "Mes permissions"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:38
 #: rhodecode/templates/journal/journal.html:41
 msgid "My repos"
 msgstr "Mes dépôts"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:41
 msgid "My pull requests"
 msgstr "Mes requêtes de pull"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:45
 msgid "Add repo"
 msgstr "Ajouter un dépôt"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
 msgid "Opened by me"
 msgstr "Ouvertes par moi"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10
 #, 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
 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
 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
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
 msgstr "Requête de pull nº%s ouverte par %s le %s"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7
 #: rhodecode/templates/bookmarks/bookmarks.html:40
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:55
-#: rhodecode/templates/journal/journal.html:60
-#: rhodecode/templates/tags/tags.html:40
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/journal/journal_page_repos.html:8
+#: rhodecode/templates/tags/tags.html:55
 #: rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr "Révision"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/journal/journal.html:81
+#: rhodecode/templates/journal/journal_page_repos.html:29
 msgid "private"
 msgstr "privé"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31
 #: rhodecode/templates/data_table/_dt_elements.html:7
+#: rhodecode/templates/journal/journal_page_repos.html:32
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr "Voulez-vous vraiment supprimer le dépôt %s ?"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38
-#: rhodecode/templates/journal/journal.html:94
+#: rhodecode/templates/journal/journal_page_repos.html:42
 msgid "No repositories yet"
 msgstr "Aucun dépôt pour le moment"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40
-#: rhodecode/templates/journal/journal.html:96
+#: rhodecode/templates/journal/journal_page_repos.html:44
 msgid "create one now"
 msgstr "En créer un maintenant"
 
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "Administration des utilisateurs"
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/templates/base/base.html:235
 msgid "users"
 msgstr "Utilisateurs"
 
 #: rhodecode/templates/admin/users/users.html:23
 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"
 msgstr "Prénom"
 
 #: rhodecode/templates/admin/users/users.html:81
 msgid "lastname"
 msgstr "Nom de famille"
 
 #: rhodecode/templates/admin/users/users.html:82
 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:235
+#: rhodecode/templates/base/base.html:238
 msgid "ldap"
 msgstr "LDAP"
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:5
 msgid "Add users 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"
 msgstr "Groupes d’utilisateurs"
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:12
 msgid "add new users group"
 msgstr "Ajouter un nouveau groupe"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:5
 msgid "Edit users group"
 msgstr "Éditer le groupe d’utilisateurs"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:11
 msgid "UsersGroups"
 msgstr "UsersGroups"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:50
 msgid "Members"
 msgstr "Membres"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:58
 msgid "Choosen group members"
 msgstr "Membres du groupe"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:61
 msgid "Remove all elements"
 msgstr "Tout enlever"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:75
 msgid "Available members"
 msgstr "Membres disponibles"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:79
 msgid "Add all elements"
 msgstr "Tout ajouter"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:146
 msgid "Group members"
 msgstr "Membres du groupe"
 
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:163
+#, 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
 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"
 msgstr "Voulez-vous vraiment supprimer le groupe d‘utilisateurs « %s » ?"
 
 #: rhodecode/templates/base/base.html:41
 msgid "Submit a bug"
 msgstr "Signaler un bogue"
 
 #: rhodecode/templates/base/base.html:77
 msgid "Login to your account"
 msgstr "Connexion à votre compte"
 
 #: rhodecode/templates/base/base.html:100
 msgid "Forgot password ?"
 msgstr "Mot de passe oublié ?"
 
 #: rhodecode/templates/base/base.html:107
 msgid "Log In"
 msgstr "Connexion"
 
 #: rhodecode/templates/base/base.html:118
 msgid "Inbox"
 msgstr "Boîte de réception"
 
 #: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:320
-#: rhodecode/templates/base/base.html:322
+#: rhodecode/templates/base/base.html:321
+#: rhodecode/templates/base/base.html:323
+#: rhodecode/templates/base/base.html:325
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr "Historique"
 
 #: rhodecode/templates/base/base.html:125
 msgid "Log Out"
 msgstr "Se déconnecter"
 
 #: rhodecode/templates/base/base.html:144
 msgid "Switch repository"
 msgstr "Aller au dépôt"
 
 #: rhodecode/templates/base/base.html:146
 msgid "Products"
 msgstr "Produits"
 
 #: rhodecode/templates/base/base.html:152
-#: rhodecode/templates/base/base.html:182
+#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47
 msgid "loading..."
 msgstr "Chargement…"
 
 #: rhodecode/templates/base/base.html:158
 #: rhodecode/templates/base/base.html:160
 #: rhodecode/templates/base/base.html:162
 #: rhodecode/templates/data_table/_dt_elements.html:15
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
 msgid "Summary"
 msgstr "Résumé"
 
 #: rhodecode/templates/base/base.html:166
 #: rhodecode/templates/base/base.html:168
 #: rhodecode/templates/base/base.html:170
 #: rhodecode/templates/changelog/changelog.html:15
 #: rhodecode/templates/data_table/_dt_elements.html:23
 #: rhodecode/templates/data_table/_dt_elements.html:25
 #: rhodecode/templates/data_table/_dt_elements.html:27
 msgid "Changelog"
 msgstr "Historique"
 
 #: rhodecode/templates/base/base.html:175
 #: rhodecode/templates/base/base.html:177
 #: rhodecode/templates/base/base.html:179
 msgid "Switch to"
 msgstr "Aller"
 
 #: rhodecode/templates/base/base.html:186
 #: rhodecode/templates/base/base.html:188
 #: rhodecode/templates/base/base.html:190
 #: rhodecode/templates/data_table/_dt_elements.html:31
 #: rhodecode/templates/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 msgid "Files"
 msgstr "Fichiers"
 
 #: rhodecode/templates/base/base.html:195
 #: rhodecode/templates/base/base.html:199
 msgid "Options"
 msgstr "Options"
 
 #: rhodecode/templates/base/base.html:204
 #: rhodecode/templates/base/base.html:206
-#| msgid "Repository creation"
 msgid "repository settings"
 msgstr "Réglages de dépôt"
 
 #: rhodecode/templates/base/base.html:210
 #: rhodecode/templates/data_table/_dt_elements.html:80
 #: rhodecode/templates/forks/fork.html:13
 msgid "fork"
 msgstr "Fork"
 
-#: rhodecode/templates/base/base.html:212
-#: rhodecode/templates/changelog/changelog.html:41
+#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50
+#: rhodecode/templates/changelog/changelog.html:43
 msgid "Open new pull request"
 msgstr "Nouvelle requête de pull"
 
-#: rhodecode/templates/base/base.html:214
+#: rhodecode/templates/base/base.html:215
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr "Comparer le fork"
+
+#: rhodecode/templates/base/base.html:217
 msgid "search"
 msgstr "Rechercher"
 
-#: rhodecode/templates/base/base.html:220
-#| msgid "unlock"
+#: rhodecode/templates/base/base.html:223
 msgid "lock"
 msgstr "Verrouiller"
 
-#: rhodecode/templates/base/base.html:231
+#: rhodecode/templates/base/base.html:234
 msgid "repositories groups"
 msgstr "Groupes de dépôts"
 
-#: rhodecode/templates/base/base.html:233
+#: rhodecode/templates/base/base.html:236
 msgid "users groups"
 msgstr "Groupes d’utilisateurs"
 
-#: rhodecode/templates/base/base.html:234
+#: rhodecode/templates/base/base.html:237
 msgid "permissions"
 msgstr "Permissions"
 
-#: rhodecode/templates/base/base.html:236
+#: rhodecode/templates/base/base.html:239
 msgid "settings"
 msgstr "Réglages"
 
-#: rhodecode/templates/base/base.html:247
-#: rhodecode/templates/base/base.html:249
+#: rhodecode/templates/base/base.html:250
+#: rhodecode/templates/base/base.html:252
 msgid "Followers"
 msgstr "Followers"
 
-#: rhodecode/templates/base/base.html:255
-#: rhodecode/templates/base/base.html:257
+#: rhodecode/templates/base/base.html:258
+#: rhodecode/templates/base/base.html:260
 msgid "Forks"
 msgstr "Forks"
 
-#: rhodecode/templates/base/base.html:336
-#: rhodecode/templates/base/base.html:338
-#: rhodecode/templates/base/base.html:340
+#: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:341
+#: rhodecode/templates/base/base.html:343
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "Rechercher"
 
 #: rhodecode/templates/base/root.html:42
 msgid "add another comment"
 msgstr "Nouveau commentaire"
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:120
+#: rhodecode/templates/journal/journal.html:75
 #: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr "Arrêter de suivre ce dépôt"
 
 #: rhodecode/templates/base/root.html:44
 #: rhodecode/templates/summary/summary.html:61
 msgid "Start following this repository"
 msgstr "Suivre ce dépôt"
 
 #: rhodecode/templates/base/root.html:45
 msgid "Group"
 msgstr "Groupe"
 
-#: rhodecode/templates/base/root.html:47
+#: rhodecode/templates/base/root.html:48
 msgid "search truncated"
 msgstr "Résultats tronqués"
 
-#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/base/root.html:49
 msgid "no matching files"
 msgstr "Aucun fichier ne correspond"
 
+#: rhodecode/templates/base/root.html:51
+#, 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"
+msgstr "Afficher les changements sélections de __S à __E"
+
+#: rhodecode/templates/base/root.html:53
+msgid "Selection link"
+msgstr "Lien vers la sélection"
+
 #: 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_data.html:8
-#: rhodecode/templates/branches/branches.html:54
-#: rhodecode/templates/tags/tags.html:39
+#: rhodecode/templates/branches/branches.html:53
+#: rhodecode/templates/branches/branches_data.html:8
+#: rhodecode/templates/tags/tags.html:54
 #: rhodecode/templates/tags/tags_data.html:8
 msgid "Author"
 msgstr "Auteur"
 
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr "Branches de %s"
 
 #: rhodecode/templates/branches/branches.html:29
 msgid "Compare branches"
 msgstr "Comparer les branches"
 
-#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/branches/branches.html:56
+#: 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_data.html:10
 msgid "Compare"
 msgstr "Comparer"
 
-#: rhodecode/templates/branches/branches_data.html:6
-msgid "name"
-msgstr "Prénom"
-
-#: rhodecode/templates/branches/branches_data.html:7
-msgid "date"
-msgstr "Date"
-
-#: rhodecode/templates/branches/branches_data.html:8
-#: rhodecode/templates/shortlog/shortlog_data.html:8
-msgid "author"
-msgstr "Auteur"
-
-#: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/shortlog/shortlog_data.html:5
-msgid "revision"
-msgstr "Révision"
-
-#: rhodecode/templates/branches/branches_data.html:10
-msgid "compare"
-msgstr "Comparer"
-
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr "Historique de %s"
 
 #: rhodecode/templates/changelog/changelog.html:15
 #, 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:38
+#: rhodecode/templates/changelog/changelog.html:37
+#, fuzzy
+msgid "Clear selection"
+msgstr "Réglages de recherche"
+
+#: rhodecode/templates/changelog/changelog.html:40
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "compare fork with %s"
 msgstr "Comparer le fork avec %s"
 
-#: rhodecode/templates/changelog/changelog.html:38
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
-msgstr "Comparer le fork"
-
-#: rhodecode/templates/changelog/changelog.html:47
+#: rhodecode/templates/changelog/changelog.html:40
+#, 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:72
-#: rhodecode/templates/summary/summary.html:364
+#: rhodecode/templates/changelog/changelog.html:74
+#: rhodecode/templates/summary/summary.html:375
 msgid "show more"
 msgstr "montrer plus"
 
-#: rhodecode/templates/changelog/changelog.html:76
+#: 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:89
-#: rhodecode/templates/changeset/changeset.html:38
+#: rhodecode/templates/changelog/changelog.html:91
+#: rhodecode/templates/changeset/changeset.html:44
 #: 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:92
+#: rhodecode/templates/changelog/changelog.html:94
 #: rhodecode/templates/shortlog/shortlog_data.html:20
 msgid "Click to open associated pull request"
 msgstr "Cliquez ici pour ouvrir la requête de pull associée."
 
-#: rhodecode/templates/changelog/changelog.html:102
-#: rhodecode/templates/changeset/changeset.html:78
+#: rhodecode/templates/changelog/changelog.html:104
+#: rhodecode/templates/changeset/changeset.html:85
 msgid "Parent"
 msgstr "Parent"
 
-#: rhodecode/templates/changelog/changelog.html:108
-#: rhodecode/templates/changeset/changeset.html:84
+#: rhodecode/templates/changelog/changelog.html:110
+#: rhodecode/templates/changeset/changeset.html:91
 msgid "No parents"
 msgstr "Aucun parent"
 
-#: rhodecode/templates/changelog/changelog.html:113
-#: rhodecode/templates/changeset/changeset.html:88
+#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changeset/changeset.html:95
+#: rhodecode/templates/changeset/changeset_range.html:79
 msgid "merge"
 msgstr "Fusion"
 
-#: rhodecode/templates/changelog/changelog.html:116
-#: rhodecode/templates/changeset/changeset.html:91
+#: rhodecode/templates/changelog/changelog.html:118
+#: rhodecode/templates/changeset/changeset.html:98
+#: 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:122
+#: rhodecode/templates/changelog/changelog.html:124
+#: rhodecode/templates/changeset/changeset_range.html:88
 msgid "bookmark"
 msgstr "Signet"
 
-#: rhodecode/templates/changelog/changelog.html:128
-#: rhodecode/templates/changeset/changeset.html:96
+#: rhodecode/templates/changelog/changelog.html:130
+#: rhodecode/templates/changeset/changeset.html:103
+#: rhodecode/templates/changeset/changeset_range.html:94
 msgid "tag"
 msgstr "Tag"
 
-#: rhodecode/templates/changelog/changelog.html:164
-msgid "Show selected changes __S -> __E"
-msgstr "Afficher les changements sélections de __S à __E"
-
-#: rhodecode/templates/changelog/changelog.html:255
+#: rhodecode/templates/changelog/changelog.html:301
 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:66
+#: rhodecode/templates/changeset/changeset.html:73
 msgid "removed"
 msgstr "Supprimés"
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/changeset.html:74
 msgid "changed"
 msgstr "Modifiés"
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:68
+#: rhodecode/templates/changeset/changeset.html:75
 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:70
-#: rhodecode/templates/changeset/changeset.html:71
-#: rhodecode/templates/changeset/changeset.html:72
+#: rhodecode/templates/changeset/changeset.html:77
+#: rhodecode/templates/changeset/changeset.html:78
+#: rhodecode/templates/changeset/changeset.html:79
 #, python-format
 msgid "affected %s files"
 msgstr "%s fichiers affectés"
 
 #: rhodecode/templates/changeset/changeset.html:6
 #, python-format
 msgid "%s Changeset"
 msgstr "Changeset de %s"
 
 #: rhodecode/templates/changeset/changeset.html:14
 msgid "Changeset"
 msgstr "Changements"
 
-#: rhodecode/templates/changeset/changeset.html:43
+#: rhodecode/templates/changeset/changeset.html:49
 #: rhodecode/templates/changeset/diff_block.html:20
 msgid "raw diff"
 msgstr "Diff brut"
 
-#: rhodecode/templates/changeset/changeset.html:44
+#: rhodecode/templates/changeset/changeset.html:50
+#, fuzzy
+msgid "patch diff"
+msgstr "Diff brut"
+
+#: rhodecode/templates/changeset/changeset.html:51
 #: rhodecode/templates/changeset/diff_block.html:21
 msgid "download diff"
 msgstr "Télécharger le diff"
 
-#: rhodecode/templates/changeset/changeset.html:48
+#: rhodecode/templates/changeset/changeset.html:55
 #: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d commentaire"
 msgstr[1] "%d commentaires"
 
-#: rhodecode/templates/changeset/changeset.html:48
+#: rhodecode/templates/changeset/changeset.html:55
 #: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
 msgstr[0] "(et %d en ligne)"
 msgstr[1] "(et %d en ligne)"
 
-#: rhodecode/templates/changeset/changeset.html:103
-#, python-format
-msgid "%s files affected with %s insertions and %s deletions:"
-msgstr "%s fichiers affectés avec %s insertions et %s suppressions :"
+#: rhodecode/templates/changeset/changeset.html:111
+#: rhodecode/templates/compare/compare_diff.html:44
+#: rhodecode/templates/pullrequests/pullrequest_show.html:76
+#, fuzzy, python-format
+msgid "%s file changed"
+msgid_plural "%s files changed"
+msgstr[0] "fichié modifié"
+msgstr[1] ""
+
+#: rhodecode/templates/changeset/changeset.html:113
+#: rhodecode/templates/compare/compare_diff.html:46
+#: rhodecode/templates/pullrequests/pullrequest_show.html:78
+#, 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] ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:42
 msgid "Submitting..."
 msgstr "Envoi…"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:45
 msgid "Commenting on line {1}."
 msgstr "Commentaire sur la ligne {1}."
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:46
 #: rhodecode/templates/changeset/changeset_file_comment.html:121
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
-msgstr "Les commentaires sont analysés avec la syntaxe %s, avec le support de la commande %s."
+msgstr ""
+"Les commentaires sont analysés avec la syntaxe %s, avec le support de la "
+"commande %s."
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:48
 #: rhodecode/templates/changeset/changeset_file_comment.html:123
 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."
+msgstr ""
+"Utilisez @nomutilisateur dans ce texte pour envoyer une notification à "
+"l’utilisateur RhodeCode en question."
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:59
 #: rhodecode/templates/changeset/changeset_file_comment.html:138
 msgid "Comment"
 msgstr "Commentaire"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:60
 #: rhodecode/templates/changeset/changeset_file_comment.html:71
 msgid "Hide"
 msgstr "Masquer"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "You need to be logged in to comment."
 msgstr "Vous devez être connecté pour poster des commentaires."
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "Login now"
 msgstr "Se connecter maintenant"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:118
 msgid "Leave a comment"
 msgstr "Laisser un commentaire"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:124
 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:124
 msgid "change status"
 msgstr "Modifier le statut"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:140
 msgid "Comment and close"
 msgstr "Commenter et fermer"
 
 #: rhodecode/templates/changeset/changeset_range.html:5
 #, python-format
 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/compare/compare_diff.html:41
-#: rhodecode/templates/pullrequests/pullrequest_show.html:73
 msgid "Files affected"
 msgstr "Fichiers affectés"
 
 #: rhodecode/templates/changeset/diff_block.html:19
-msgid "diff"
-msgstr "Diff"
+msgid "show full diff for this file"
+msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:27
 msgid "show inline comments"
 msgstr "Afficher les commentaires"
 
 #: rhodecode/templates/compare/compare_cs.html:5
 msgid "No changesets"
 msgstr "Aucun changeset"
 
 #: rhodecode/templates/compare/compare_diff.html:37
-msgid "Outgoing changesets"
-msgstr "Changesets sortants"
+#: rhodecode/templates/pullrequests/pullrequest_show.html:69
+#, fuzzy, python-format
+msgid "Showing %s commit"
+msgid_plural "Showing %s commits"
+msgstr[0] "Afficher les commentaires"
+msgstr[1] ""
+
+#: rhodecode/templates/compare/compare_diff.html:52
+#: rhodecode/templates/pullrequests/pullrequest_show.html:84
+#, fuzzy
+msgid "No files"
+msgstr "Fichiers"
 
 #: rhodecode/templates/data_table/_dt_elements.html:39
 #: rhodecode/templates/data_table/_dt_elements.html:41
 #: rhodecode/templates/data_table/_dt_elements.html:43
 msgid "Fork"
 msgstr "Fork"
 
 #: rhodecode/templates/data_table/_dt_elements.html:60
-#: rhodecode/templates/journal/journal.html:126
-#: rhodecode/templates/summary/summary.html:68
+#: rhodecode/templates/journal/journal.html:81
+#: rhodecode/templates/summary/summary.html:77
 msgid "Mercurial repository"
 msgstr "Dépôt Mercurial"
 
 #: rhodecode/templates/data_table/_dt_elements.html:62
-#: rhodecode/templates/journal/journal.html:128
-#: rhodecode/templates/summary/summary.html:71
+#: rhodecode/templates/journal/journal.html:83
+#: rhodecode/templates/summary/summary.html:80
 msgid "Git repository"
 msgstr "Dépôt Git"
 
 #: rhodecode/templates/data_table/_dt_elements.html:69
-#: rhodecode/templates/journal/journal.html:134
-#: rhodecode/templates/summary/summary.html:78
+#: rhodecode/templates/journal/journal.html:89
+#: rhodecode/templates/summary/summary.html:87
 msgid "public repository"
 msgstr "Dépôt public"
 
 #: rhodecode/templates/data_table/_dt_elements.html:80
-#: rhodecode/templates/summary/summary.html:87
-#: rhodecode/templates/summary/summary.html:88
+#: rhodecode/templates/summary/summary.html:96
+#: rhodecode/templates/summary/summary.html:97
 msgid "Fork of"
 msgstr "Fork de"
 
-#: rhodecode/templates/data_table/_dt_elements.html:92
+#: rhodecode/templates/data_table/_dt_elements.html:94
 msgid "No changesets yet"
 msgstr "Dépôt vide"
 
-#: rhodecode/templates/data_table/_dt_elements.html:104
+#: rhodecode/templates/data_table/_dt_elements.html:101
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#, python-format
+msgid "Subscribe to %s rss feed"
+msgstr "S’abonner au flux RSS de %s"
+
+#: rhodecode/templates/data_table/_dt_elements.html:109
+#: rhodecode/templates/data_table/_dt_elements.html:111
+#, python-format
+msgid "Subscribe to %s atom feed"
+msgstr "S’abonner au flux ATOM de %s"
+
+#: rhodecode/templates/data_table/_dt_elements.html:122
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?"
 
 #: rhodecode/templates/email_templates/main.html:8
-msgid "This is an notification from RhodeCode."
+#, fuzzy
+msgid "This is a notification from RhodeCode."
 msgstr "Ceci est une notification de RhodeCode."
 
 #: rhodecode/templates/errors/error_document.html:46
 #, 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"
 msgstr "Diff de fichier de %s"
 
 #: rhodecode/templates/files/file_diff.html:12
 msgid "File diff"
 msgstr "Diff de fichier"
 
 #: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:72
+#: rhodecode/templates/files/files.html:74
 #, python-format
 msgid "%s files"
 msgstr "Fichiers de %s"
 
 #: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:340
+#: rhodecode/templates/summary/summary.html:351
 msgid "files"
 msgstr "Fichiers"
 
-#: rhodecode/templates/files/files.html:92
-#: rhodecode/templates/files/files_source.html:124
-msgid "Selection link"
-msgstr "Lien vers la sélection"
-
 #: 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"
 
 #: rhodecode/templates/files/files_add.html:19
 msgid "add file"
 msgstr "Ajouter un fichier"
 
 #: rhodecode/templates/files/files_add.html:40
 msgid "Add new file"
 msgstr "Ajouter un nouveau fichier"
 
 #: rhodecode/templates/files/files_add.html:45
 msgid "File Name"
 msgstr "Nom de fichier"
 
 #: rhodecode/templates/files/files_add.html:49
 #: rhodecode/templates/files/files_add.html:58
 msgid "or"
 msgstr "ou"
 
 #: rhodecode/templates/files/files_add.html:49
 #: rhodecode/templates/files/files_add.html:54
 msgid "Upload file"
 msgstr "Téléverser un fichier"
 
 #: rhodecode/templates/files/files_add.html:58
 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_ypjax.html:3
 msgid "Location"
 msgstr "Emplacement"
 
 #: rhodecode/templates/files/files_add.html:67
 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/shortlog/shortlog_data.html:6
 msgid "commit message"
 msgstr "Message de commit"
 
 #: rhodecode/templates/files/files_add.html:81
 #: rhodecode/templates/files/files_edit.html:67
 msgid "Commit changes"
 msgstr "Commiter les changements"
 
 #: rhodecode/templates/files/files_browser.html:13
 msgid "view"
 msgstr "voir"
 
 #: rhodecode/templates/files/files_browser.html:14
 msgid "previous revision"
 msgstr "révision précédente"
 
 #: rhodecode/templates/files/files_browser.html:16
 msgid "next revision"
 msgstr "révision suivante"
 
 #: rhodecode/templates/files/files_browser.html:23
 msgid "follow current branch"
 msgstr "Suivre la branche actuelle"
 
 #: rhodecode/templates/files/files_browser.html:27
 msgid "search file list"
 msgstr "Rechercher un fichier"
 
 #: rhodecode/templates/files/files_browser.html:31
 #: rhodecode/templates/shortlog/shortlog_data.html:80
 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…"
 
 #: rhodecode/templates/files/files_browser.html:48
 msgid "Size"
 msgstr "Taille"
 
 #: rhodecode/templates/files/files_browser.html:49
 msgid "Mimetype"
 msgstr "Type MIME"
 
 #: rhodecode/templates/files/files_browser.html:50
 msgid "Last Revision"
 msgstr "Dernière révision"
 
 #: rhodecode/templates/files/files_browser.html:51
 msgid "Last modified"
 msgstr "Dernière modification"
 
 #: rhodecode/templates/files/files_browser.html:52
 msgid "Last commiter"
 msgstr "Dernier commiteur"
 
 #: rhodecode/templates/files/files_edit.html:19
 msgid "edit file"
 msgstr "Éditer le fichier"
 
 #: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:38
+#: rhodecode/templates/files/files_source.html:23
 msgid "show annotation"
 msgstr "Afficher les annotations"
 
 #: rhodecode/templates/files/files_edit.html:50
-#: rhodecode/templates/files/files_source.html:40
-#: rhodecode/templates/files/files_source.html:68
+#: rhodecode/templates/files/files_source.html:25
+#: rhodecode/templates/files/files_source.html:53
 msgid "show as raw"
 msgstr "montrer le fichier brut"
 
 #: rhodecode/templates/files/files_edit.html:51
-#: rhodecode/templates/files/files_source.html:41
+#: rhodecode/templates/files/files_source.html:26
 msgid "download as raw"
 msgstr "télécharger le fichier brut"
 
 #: rhodecode/templates/files/files_edit.html:54
 msgid "source"
 msgstr "Source"
 
 #: rhodecode/templates/files/files_edit.html:59
 msgid "Editing file"
 msgstr "Édition du fichier"
 
-#: rhodecode/templates/files/files_source.html:2
+#: rhodecode/templates/files/files_history_box.html:2
 msgid "History"
 msgstr "Historique"
 
-#: rhodecode/templates/files/files_source.html:9
+#: rhodecode/templates/files/files_history_box.html:9
 msgid "diff to revision"
 msgstr "Diff avec la révision"
 
-#: rhodecode/templates/files/files_source.html:10
+#: rhodecode/templates/files/files_history_box.html:10
 msgid "show at revision"
 msgstr "Afficher à la révision"
 
-#: rhodecode/templates/files/files_source.html:14
+#: rhodecode/templates/files/files_history_box.html:15
 #, python-format
 msgid "%s author"
 msgid_plural "%s authors"
 msgstr[0] "%s auteur"
 msgstr[1] "%s auteurs"
 
-#: rhodecode/templates/files/files_source.html:36
+#: rhodecode/templates/files/files_source.html:6
+#, fuzzy
+msgid "Load file history"
+msgstr "Chargement de la liste des fichiers…"
+
+#: rhodecode/templates/files/files_source.html:21
 msgid "show source"
 msgstr "montrer les sources"
 
-#: rhodecode/templates/files/files_source.html:59
+#: rhodecode/templates/files/files_source.html:44
 #, python-format
 msgid "Binary file (%s)"
 msgstr "Fichier binaire (%s)"
 
-#: rhodecode/templates/files/files_source.html:68
+#: rhodecode/templates/files/files_source.html:53
 msgid "File is too big to display"
 msgstr "Ce fichier est trop gros pour être affiché."
 
 #: rhodecode/templates/files/files_ypjax.html:5
 msgid "annotation"
 msgstr "annotation"
 
 #: rhodecode/templates/files/files_ypjax.html:15
 msgid "Go back"
 msgstr "Revenir en arrière"
 
 #: rhodecode/templates/files/files_ypjax.html:16
 msgid "No files at given path"
 msgstr "Aucun fichier à cet endroit"
 
 #: rhodecode/templates/followers/followers.html:5
 #, python-format
 msgid "%s Followers"
 msgstr "Followers de %s"
 
 #: rhodecode/templates/followers/followers.html:13
 msgid "followers"
 msgstr "followers"
 
 #: rhodecode/templates/followers/followers_data.html:12
 msgid "Started following -"
 msgstr "A commencé à suivre le dépôt :"
 
 #: rhodecode/templates/forks/fork.html:5
 #, python-format
 msgid "%s Fork"
 msgstr "Fork de %s"
 
 #: rhodecode/templates/forks/fork.html:31
 msgid "Fork name"
 msgstr "Nom du fork"
 
 #: rhodecode/templates/forks/fork.html:68
 msgid "Private"
 msgstr "Privé"
 
 #: rhodecode/templates/forks/fork.html:77
 msgid "Copy permissions"
 msgstr "Copier les permissions"
 
 #: rhodecode/templates/forks/fork.html:81
 msgid "Copy permissions from forked repository"
 msgstr "Copier les permissions depuis le dépôt forké"
 
 #: rhodecode/templates/forks/fork.html:86
 msgid "Update after clone"
 msgstr "MÀJ après le clonage"
 
 #: rhodecode/templates/forks/fork.html:90
 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"
 msgstr "Forker ce dépôt"
 
 #: rhodecode/templates/forks/forks.html:5
 #, python-format
 msgid "%s Forks"
 msgstr "Forks de %s"
 
 #: rhodecode/templates/forks/forks.html:13
 msgid "forks"
 msgstr "forks"
 
 #: rhodecode/templates/forks/forks_data.html:17
 msgid "forked"
 msgstr "forké"
 
-#: rhodecode/templates/forks/forks_data.html:38
+#: rhodecode/templates/forks/forks_data.html:42
 msgid "There are no forks yet"
 msgstr "Il n’y a pas encore de forks."
 
 #: rhodecode/templates/journal/journal.html:13
 msgid "ATOM journal feed"
 msgstr "Flux ATOM du journal"
 
 #: rhodecode/templates/journal/journal.html:14
 msgid "RSS journal feed"
 msgstr "Flux RSS du journal"
 
 #: rhodecode/templates/journal/journal.html:24
-#: rhodecode/templates/pullrequests/pullrequest.html:53
+#: rhodecode/templates/pullrequests/pullrequest.html:55
 msgid "Refresh"
 msgstr "Rafraîchir"
 
 #: rhodecode/templates/journal/journal.html:27
 #: rhodecode/templates/journal/public_journal.html:24
 msgid "RSS feed"
 msgstr "Flux RSS"
 
 #: rhodecode/templates/journal/journal.html:30
 #: rhodecode/templates/journal/public_journal.html:27
 msgid "ATOM feed"
 msgstr "Flux ATOM"
 
 #: rhodecode/templates/journal/journal.html:41
 msgid "Watched"
 msgstr "Surveillé"
 
 #: rhodecode/templates/journal/journal.html:46
 msgid "ADD"
 msgstr "AJOUTER"
 
-#: rhodecode/templates/journal/journal.html:114
+#: rhodecode/templates/journal/journal.html:69
 msgid "following user"
 msgstr "utilisateur suivant"
 
-#: rhodecode/templates/journal/journal.html:114
+#: rhodecode/templates/journal/journal.html:69
 msgid "user"
 msgstr "utilisateur"
 
-#: rhodecode/templates/journal/journal.html:147
+#: rhodecode/templates/journal/journal.html:102
 msgid "You are not following any users or repositories"
 msgstr "Vous ne suivez aucun utilisateur ou dépôt"
 
-#: rhodecode/templates/journal/journal_data.html:47
+#: rhodecode/templates/journal/journal_data.html:51
 msgid "No entries yet"
 msgstr "Aucune entrée pour le moment"
 
 #: rhodecode/templates/journal/public_journal.html:13
 msgid "ATOM public journal feed"
 msgstr "Flux ATOM du journal public"
 
 #: rhodecode/templates/journal/public_journal.html:14
 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
 msgid "New pull request"
 msgstr "Nouvelle requête de pull"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:52
+#: rhodecode/templates/pullrequests/pullrequest.html:54
 msgid "refresh overview"
 msgstr "Rafraîchir les informations"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:64
+#: rhodecode/templates/pullrequests/pullrequest.html:66
 msgid "Detailed compare view"
 msgstr "Comparaison détaillée"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:68
-#: rhodecode/templates/pullrequests/pullrequest_show.html:86
+#: rhodecode/templates/pullrequests/pullrequest.html:70
+#: rhodecode/templates/pullrequests/pullrequest_show.html:100
 msgid "Pull request reviewers"
 msgstr "Relecteurs de la requête de pull"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:77
-#: rhodecode/templates/pullrequests/pullrequest_show.html:98
+#: rhodecode/templates/pullrequests/pullrequest.html:79
+#: rhodecode/templates/pullrequests/pullrequest_show.html:112
 msgid "owner"
 msgstr "Propriétaire"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:89
-#: rhodecode/templates/pullrequests/pullrequest_show.html:113
+#: rhodecode/templates/pullrequests/pullrequest.html:91
+#: rhodecode/templates/pullrequests/pullrequest_show.html:127
 msgid "Add reviewer to this pull request."
 msgstr "Ajouter un relecteur à cette requête de pull."
 
-#: rhodecode/templates/pullrequests/pullrequest.html:95
+#: rhodecode/templates/pullrequests/pullrequest.html:97
 msgid "Create new pull request"
 msgstr "Nouvelle requête de pull"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:104
+#: rhodecode/templates/pullrequests/pullrequest.html:106
 #: rhodecode/templates/pullrequests/pullrequest_show.html:25
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
 msgid "Title"
 msgstr "Titre"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:113
+#: rhodecode/templates/pullrequests/pullrequest.html:115
 msgid "description"
 msgstr "Description"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:121
+#: rhodecode/templates/pullrequests/pullrequest.html:123
 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
 msgid "Pull request status"
 msgstr "Statut de la requête de pull"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:44
 msgid "Still not reviewed by"
 msgstr "Pas encore relue par"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:48
 #, 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 reviewers"
 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:58
 msgid "Created on"
 msgstr "Créé le"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:65
 msgid "Compare view"
 msgstr "Vue de comparaison"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:69
-msgid "Incoming changesets"
-msgstr "Changesets entrants"
-
 #: 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"
 
 #: rhodecode/templates/search/search.html:6
 #, python-format
 msgid "Search \"%s\" in repository: %s"
 msgstr "Rechercher « %s » 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
 msgid "Search in all repositories"
 msgstr "Rechercher dans tous les dépôts"
 
 #: rhodecode/templates/search/search.html:48
 msgid "Search term"
 msgstr "Termes de la recherches"
 
 #: rhodecode/templates/search/search.html:60
 msgid "Search in"
 msgstr "Rechercher dans"
 
 #: rhodecode/templates/search/search.html:63
 msgid "File contents"
 msgstr "Le contenu des fichiers"
 
 #: rhodecode/templates/search/search.html:64
 msgid "Commit messages"
 msgstr "Les messages de commit"
 
 #: rhodecode/templates/search/search.html:65
 msgid "File names"
 msgstr "Les noms de fichiers"
 
 #: rhodecode/templates/search/search_commit.html:35
 #: rhodecode/templates/search/search_content.html:21
 #: rhodecode/templates/search/search_path.html:15
 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/shortlog/shortlog.html:5
 #, python-format
 msgid "%s Shortlog"
 msgstr "Résumé de %s"
 
 #: rhodecode/templates/shortlog/shortlog.html:14
 msgid "shortlog"
 msgstr "Résumé"
 
+#: rhodecode/templates/shortlog/shortlog_data.html:5
+msgid "revision"
+msgstr "Révision"
+
 #: rhodecode/templates/shortlog/shortlog_data.html:7
 msgid "age"
 msgstr "Âge"
 
+#: rhodecode/templates/shortlog/shortlog_data.html:8
+msgid "author"
+msgstr "Auteur"
+
 #: rhodecode/templates/shortlog/shortlog_data.html:33
 msgid "No commit message"
 msgstr "Pas de message de commit"
 
 #: rhodecode/templates/shortlog/shortlog_data.html:77
 msgid "Add or upload files directly via RhodeCode"
 msgstr "Ajouter ou téléverser des fichiers directement via RhodeCode…"
 
 #: rhodecode/templates/shortlog/shortlog_data.html:86
 msgid "Push new repo"
 msgstr "Pusher le nouveau dépôt"
 
 #: rhodecode/templates/shortlog/shortlog_data.html:94
 msgid "Existing repository?"
 msgstr "Le dépôt existe déjà ?"
 
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 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:82
+#: rhodecode/templates/summary/summary.html:70
+#, fuzzy, python-format
+msgid "Repository locked by %s"
+msgstr "Ce dépôt n’est pas verrouillé."
+
+#: rhodecode/templates/summary/summary.html:72
+#, fuzzy
+msgid "Repository unlocked"
+msgstr "Ce dépôt n’est pas verrouillé."
+
+#: rhodecode/templates/summary/summary.html:91
 #, python-format
 msgid "Non changable ID %s"
 msgstr "Identifiant permanent : %s"
 
-#: rhodecode/templates/summary/summary.html:87
+#: rhodecode/templates/summary/summary.html:96
 msgid "public"
 msgstr "publique"
 
-#: rhodecode/templates/summary/summary.html:95
+#: rhodecode/templates/summary/summary.html:104
 msgid "remote clone"
 msgstr "Clone distant"
 
-#: rhodecode/templates/summary/summary.html:116
+#: rhodecode/templates/summary/summary.html:125
 msgid "Contact"
 msgstr "Contact"
 
-#: rhodecode/templates/summary/summary.html:130
+#: rhodecode/templates/summary/summary.html:139
 msgid "Clone url"
 msgstr "URL de clone"
 
-#: rhodecode/templates/summary/summary.html:133
+#: rhodecode/templates/summary/summary.html:142
 msgid "Show by Name"
 msgstr "Afficher par nom"
 
-#: rhodecode/templates/summary/summary.html:134
+#: rhodecode/templates/summary/summary.html:143
 msgid "Show by ID"
 msgstr "Afficher par ID"
 
-#: rhodecode/templates/summary/summary.html:142
+#: rhodecode/templates/summary/summary.html:151
 msgid "Trending files"
 msgstr "Populaires"
 
-#: rhodecode/templates/summary/summary.html:150
-#: rhodecode/templates/summary/summary.html:166
-#: rhodecode/templates/summary/summary.html:194
+#: 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:158
+#: rhodecode/templates/summary/summary.html:167
 msgid "Download"
 msgstr "Téléchargements"
 
-#: rhodecode/templates/summary/summary.html:162
+#: rhodecode/templates/summary/summary.html:171
 msgid "There are no downloads yet"
 msgstr "Il n’y a pas encore de téléchargements proposés."
 
-#: rhodecode/templates/summary/summary.html:164
+#: rhodecode/templates/summary/summary.html:173
 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:170
+#: rhodecode/templates/summary/summary.html:179
 msgid "Download as zip"
 msgstr "Télécharger en ZIP"
 
-#: rhodecode/templates/summary/summary.html:173
+#: rhodecode/templates/summary/summary.html:182
 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:173
+#: rhodecode/templates/summary/summary.html:182
 msgid "with subrepos"
 msgstr "avec les sous-dépôts"
 
-#: rhodecode/templates/summary/summary.html:186
+#: rhodecode/templates/summary/summary.html:195
 msgid "Commit activity by day / author"
 msgstr "Activité de commit par jour et par auteur"
 
-#: rhodecode/templates/summary/summary.html:197
+#: rhodecode/templates/summary/summary.html:206
 msgid "Stats gathered: "
 msgstr "Statistiques obtenues :"
 
-#: rhodecode/templates/summary/summary.html:218
+#: rhodecode/templates/summary/summary.html:227
 msgid "Shortlog"
 msgstr "Résumé des changements"
 
-#: rhodecode/templates/summary/summary.html:220
+#: rhodecode/templates/summary/summary.html:229
 msgid "Quick start"
 msgstr "Démarrage rapide"
 
-#: rhodecode/templates/summary/summary.html:233
+#: rhodecode/templates/summary/summary.html:243
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr "Fichier « Lisez-moi » à la révision « %s »"
 
-#: rhodecode/templates/summary/summary.html:236
+#: rhodecode/templates/summary/summary.html:246
 msgid "Permalink to this readme"
 msgstr "Lien permanent vers ce fichier « Lisez-moi »"
 
-#: rhodecode/templates/summary/summary.html:293
+#: rhodecode/templates/summary/summary.html:304
 #, python-format
 msgid "Download %s as %s"
 msgstr "Télécharger %s comme archive %s"
 
-#: rhodecode/templates/summary/summary.html:650
+#: rhodecode/templates/summary/summary.html:661
 msgid "commits"
 msgstr "commits"
 
-#: rhodecode/templates/summary/summary.html:651
+#: rhodecode/templates/summary/summary.html:662
 msgid "files added"
 msgstr "fichiers ajoutés"
 
-#: rhodecode/templates/summary/summary.html:652
+#: rhodecode/templates/summary/summary.html:663
 msgid "files changed"
 msgstr "fichiers modifiés"
 
-#: rhodecode/templates/summary/summary.html:653
+#: rhodecode/templates/summary/summary.html:664
 msgid "files removed"
 msgstr "fichiers supprimés"
 
-#: rhodecode/templates/summary/summary.html:656
+#: rhodecode/templates/summary/summary.html:667
 msgid "commit"
 msgstr "commit"
 
-#: rhodecode/templates/summary/summary.html:657
+#: rhodecode/templates/summary/summary.html:668
 msgid "file added"
 msgstr "fichier ajouté"
 
-#: rhodecode/templates/summary/summary.html:658
+#: rhodecode/templates/summary/summary.html:669
 msgid "file changed"
 msgstr "fichié modifié"
 
-#: rhodecode/templates/summary/summary.html:659
+#: rhodecode/templates/summary/summary.html:670
 msgid "file removed"
 msgstr "fichier supprimé"
 
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr "Tags de %s"
 
-#~ msgid "Groups"
-#~ msgstr "Groupes"
+#: rhodecode/templates/tags/tags.html:29
+#, fuzzy
+msgid "Compare tags"
+msgstr "Comparer"
+

rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po

@@ -1,3887 +1,4087 b''
 # Japanese translations for RhodeCode.
 # Copyright (C) 2011 ORGANIZATION
 # This file is distributed under the same license as the RhodeCode project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
 # Takumi IINO <[e-mail]> 2012
 # WAKAYAMA Shirou <[e-mail]> 2012
 #
 # Mercurial Japanese Translation.
 # - http://selenic.com/repo/hg/file/stable/i18n/ja.po
 # ========================================
 msgid ""
 msgstr ""
 "Project-Id-Version: RhodeCode 1.2.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-09-02 20:30+0200\n"
+"POT-Creation-Date: 2012-11-27 20:56+0100\n"
 "PO-Revision-Date: 2012-10-27 15:06+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ja <[e-mail]>\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: rhodecode/controllers/changelog.py:94
+#: rhodecode/controllers/changelog.py:95
 msgid "All Branches"
 msgstr "すべてのブランチ"
 
-#: rhodecode/controllers/changeset.py:83
+#: rhodecode/controllers/changeset.py:84
 msgid "show white space"
 msgstr "空白を表示"
 
-#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
+#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
 msgid "ignore white space"
 msgstr "空白を無視"
 
-#: rhodecode/controllers/changeset.py:157
+#: rhodecode/controllers/changeset.py:164
 #, python-format
 msgid "%s line context"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:333
-#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70
-msgid "binary file"
-msgstr "バイナリファイル"
-
-#: rhodecode/controllers/changeset.py:408
+#: rhodecode/controllers/changeset.py:315
+#: rhodecode/controllers/pullrequests.py:411
+#, fuzzy, python-format
+msgid "Status change -> %s"
+msgstr "最後の変更時刻"
+
+#: rhodecode/controllers/changeset.py:346
 msgid ""
 "Changing status on a changeset associated witha closed pull request is "
 "not allowed"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:69
+#: rhodecode/controllers/compare.py:75
+#: rhodecode/controllers/pullrequests.py:117
 msgid "There are no changesets yet"
 msgstr "まだ変更がありません"
 
 #: rhodecode/controllers/error.py:69
 msgid "Home page"
 msgstr "ホームページ"
 
 #: rhodecode/controllers/error.py:98
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr "形式が間違っているため、サーバーはリクエストを処理出来ませんでした"
 
 #: rhodecode/controllers/error.py:101
 msgid "Unauthorized access to resource"
 msgstr "リソースにアクセスする権限がありません"
 
 #: rhodecode/controllers/error.py:103
 msgid "You don't have permission to view this page"
 msgstr "このページを見る権限がありません"
 
 #: rhodecode/controllers/error.py:105
 msgid "The resource could not be found"
 msgstr "リソースが見つかりません"
 
 #: rhodecode/controllers/error.py:107
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr ""
 
-#: rhodecode/controllers/feed.py:49
+#: rhodecode/controllers/feed.py:52
 #, python-format
 msgid "Changes on %s repository"
 msgstr "%s リポジトリでの変更"
 
-#: rhodecode/controllers/feed.py:50
+#: rhodecode/controllers/feed.py:53
 #, python-format
 msgid "%s %s feed"
 msgstr "%s %s フィード"
 
-#: rhodecode/controllers/feed.py:75
+#: rhodecode/controllers/feed.py:86
+#: rhodecode/templates/changeset/changeset.html:126
+#: rhodecode/templates/changeset/changeset.html:138
+#: rhodecode/templates/compare/compare_diff.html:62
+#: rhodecode/templates/compare/compare_diff.html:73
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+#: rhodecode/templates/pullrequests/pullrequest_show.html:153
+msgid "Changeset was too big and was cut off..."
+msgstr "チェンジセットが大きすぎるため、省略しました"
+
+#: rhodecode/controllers/feed.py:92
 msgid "commited on"
 msgstr "コミット"
 
-#: rhodecode/controllers/files.py:84
+#: rhodecode/controllers/files.py:86
 msgid "click here to add new file"
 msgstr "新しいファイルを追加"
 
-#: rhodecode/controllers/files.py:85
+#: rhodecode/controllers/files.py:87
 #, python-format
 msgid "There are no files yet %s"
 msgstr "まだファイルがありません %s"
 
-#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299
+#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr "このリポジトリは %s によって %s にロックされました"
 
-#: rhodecode/controllers/files.py:266
+#: rhodecode/controllers/files.py:292
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr "RhodeCode経由で %s を変更"
 
-#: rhodecode/controllers/files.py:271
+#: rhodecode/controllers/files.py:297
 msgid "No changes"
 msgstr "変更点なし"
 
-#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346
+#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "%s へのコミットが成功しました"
 
-#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352
+#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378
 msgid "Error occurred during commit"
 msgstr "コミット中にエラーが発生しました"
 
-#: rhodecode/controllers/files.py:318
+#: rhodecode/controllers/files.py:344
 #, python-format
 msgid "Added %s via RhodeCode"
 msgstr "RhodeCode経由で %s を追加"
 
-#: rhodecode/controllers/files.py:332
+#: rhodecode/controllers/files.py:358
 msgid "No content"
 msgstr "内容がありません"
 
-#: rhodecode/controllers/files.py:336
+#: rhodecode/controllers/files.py:362
 msgid "No filename"
 msgstr "ファイル名がありません"
 
-#: rhodecode/controllers/files.py:378
+#: rhodecode/controllers/files.py:404
 msgid "downloads disabled"
 msgstr "ダウンロードは無効化されています"
 
-#: rhodecode/controllers/files.py:389
+#: rhodecode/controllers/files.py:415
 #, python-format
 msgid "Unknown revision %s"
 msgstr "%s は未知のリビジョンです"
 
-#: rhodecode/controllers/files.py:391
+#: rhodecode/controllers/files.py:417
 msgid "Empty repository"
 msgstr "空のリポジトリ"
 
-#: rhodecode/controllers/files.py:393
+#: rhodecode/controllers/files.py:419
 msgid "Unknown archive type"
 msgstr "未知のアーカイブ種別です"
 
-#: rhodecode/controllers/files.py:494
+#: rhodecode/controllers/files.py:564
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "チェンジセット"
 
-#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72
-#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543
+#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76
+#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550
 msgid "Branches"
 msgstr "ブランチ"
 
-#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76
-#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554
+#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80
+#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561
 msgid "Tags"
 msgstr "タグ"
 
-#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90
+#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
 "the filesystem please run the application again in order to rescan "
 "repositories"
 msgstr ""
 "%s "
 "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。"
 
-#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72
+#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
 "the file system please run the application again in order to rescan "
 "repositories"
 msgstr ""
 "%s "
 "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。"
 
-#: rhodecode/controllers/forks.py:167
+#: rhodecode/controllers/forks.py:168
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "リポジトリ %s を %s としてフォーク"
 
-#: rhodecode/controllers/forks.py:181
+#: rhodecode/controllers/forks.py:182
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "リポジトリ %s のフォーク中にエラーが発生しました"
 
-#: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239
+#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243
 msgid "public journal"
 msgstr "公開ジャーナル"
 
-#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243
-#: rhodecode/templates/base/base.html:220
+#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247
+#: rhodecode/templates/base/base.html:232
 msgid "journal"
 msgstr "ジャーナル"
 
 #: rhodecode/controllers/login.py:143
 msgid "You have successfully registered into rhodecode"
 msgstr "rhodecodeへの登録を受け付けました"
 
 #: rhodecode/controllers/login.py:164
 msgid "Your password reset link was sent"
 msgstr "パスワードリセットのリンクを送信しました"
 
 #: rhodecode/controllers/login.py:184
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
 msgstr "パスワードをリセットしました。新しいパスワードをあなたのメールアドレスに送りました"
 
-#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549
+#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
-#: rhodecode/controllers/pullrequests.py:158
+#: rhodecode/controllers/pullrequests.py:186
 msgid "Pull request requires a title with min. 3 chars"
 msgstr "プルリクエストには3文字以上のタイトルが必要です"
 
-#: rhodecode/controllers/pullrequests.py:160
+#: rhodecode/controllers/pullrequests.py:188
 msgid "error during creation of pull request"
 msgstr "プルリクエストの作成中にエラーが発生しました"
 
-#: rhodecode/controllers/pullrequests.py:181
+#: rhodecode/controllers/pullrequests.py:220
 msgid "Successfully opened new pull request"
 msgstr "新しいプルリクエストを作成しました"
 
-#: rhodecode/controllers/pullrequests.py:184
+#: rhodecode/controllers/pullrequests.py:223
 msgid "Error occurred during sending pull request"
 msgstr "プルリクエストの作成中にエラーが発生しました"
 
-#: rhodecode/controllers/pullrequests.py:217
+#: rhodecode/controllers/pullrequests.py:256
 msgid "Successfully deleted pull request"
 msgstr "プルリクエストを削除しました"
 
-#: rhodecode/controllers/search.py:131
+#: rhodecode/controllers/search.py:134
 msgid "Invalid search query. Try quoting it."
 msgstr "無効な検索クエリーです。\\\"で囲んで下さい"
 
-#: rhodecode/controllers/search.py:136
+#: rhodecode/controllers/search.py:139
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr "検索するためのインデックスがありません。whooshでインデックスを作成して下さい"
 
-#: rhodecode/controllers/search.py:140
+#: rhodecode/controllers/search.py:143
 msgid "An error occurred during this search operation"
 msgstr "検索を実行する際にエラーがおきました"
 
-#: rhodecode/controllers/settings.py:107
-#: rhodecode/controllers/admin/repos.py:266
+#: rhodecode/controllers/settings.py:108
+#: rhodecode/controllers/admin/repos.py:267
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "リポジトリ %s の更新に成功しました"
 
-#: rhodecode/controllers/settings.py:125
-#: rhodecode/controllers/admin/repos.py:284
+#: rhodecode/controllers/settings.py:126
+#: rhodecode/controllers/admin/repos.py:285
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr "リポジトリ %s の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/settings.py:143
-#: rhodecode/controllers/admin/repos.py:302
+#: rhodecode/controllers/settings.py:144
+#: rhodecode/controllers/admin/repos.py:303
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from "
 "the filesystem please run the application again in order to rescan "
 "repositories"
 msgstr ""
 "%s "
 "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。"
 
-#: rhodecode/controllers/settings.py:155
-#: rhodecode/controllers/admin/repos.py:314
+#: rhodecode/controllers/settings.py:156
+#: rhodecode/controllers/admin/repos.py:315
 #, python-format
 msgid "deleted repository %s"
 msgstr "リポジトリ %s を削除しました"
 
-#: rhodecode/controllers/settings.py:159
-#: rhodecode/controllers/admin/repos.py:324
-#: rhodecode/controllers/admin/repos.py:330
+#: rhodecode/controllers/settings.py:160
+#: rhodecode/controllers/admin/repos.py:325
+#: rhodecode/controllers/admin/repos.py:331
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "リポジトリ %s の削除中にエラーが発生しました"
 
-#: rhodecode/controllers/summary.py:138
+#: rhodecode/controllers/settings.py:179
+#, fuzzy
+msgid "unlocked"
+msgstr "変更可能にする"
+
+#: rhodecode/controllers/settings.py:182
+#, fuzzy
+msgid "locked"
+msgstr "変更可能にする"
+
+#: rhodecode/controllers/settings.py:184
+#, fuzzy, python-format
+msgid "Repository has been %s"
+msgstr "リポジトリ %s を %s としてフォーク"
+
+#: rhodecode/controllers/settings.py:188
+#: rhodecode/controllers/admin/repos.py:423
+msgid "An error occurred during unlocking"
+msgstr "アンロック時にエラーが発生しました"
+
+#: rhodecode/controllers/summary.py:140
 msgid "No data loaded yet"
 msgstr "まだデータが読み込まれていません"
 
-#: rhodecode/controllers/summary.py:142
-#: rhodecode/templates/summary/summary.html:148
+#: rhodecode/controllers/summary.py:144
+#: rhodecode/templates/summary/summary.html:157
 msgid "Statistics are disabled for this repository"
 msgstr "このリポジトリの統計は無効化されています"
 
 #: rhodecode/controllers/admin/ldap_settings.py:50
 msgid "BASE"
 msgstr "BASE"
 
 #: rhodecode/controllers/admin/ldap_settings.py:51
 msgid "ONELEVEL"
 msgstr "ONELEVEL"
 
 #: rhodecode/controllers/admin/ldap_settings.py:52
 msgid "SUBTREE"
 msgstr "SUBTREE"
 
 #: rhodecode/controllers/admin/ldap_settings.py:56
 msgid "NEVER"
 msgstr "NEVER"
 
 #: rhodecode/controllers/admin/ldap_settings.py:57
 msgid "ALLOW"
 msgstr "ALLOW"
 
 #: rhodecode/controllers/admin/ldap_settings.py:58
 msgid "TRY"
 msgstr "TRY"
 
 #: rhodecode/controllers/admin/ldap_settings.py:59
 msgid "DEMAND"
 msgstr "DEMAND"
 
 #: rhodecode/controllers/admin/ldap_settings.py:60
 msgid "HARD"
 msgstr "HARD"
 
 #: rhodecode/controllers/admin/ldap_settings.py:64
 msgid "No encryption"
 msgstr "暗号化なし"
 
 #: rhodecode/controllers/admin/ldap_settings.py:65
 msgid "LDAPS connection"
 msgstr "LDAPS接続"
 
 #: rhodecode/controllers/admin/ldap_settings.py:66
 msgid "START_TLS on LDAP connection"
 msgstr "LDAP接続でSTART_TLSを使用"
 
 #: rhodecode/controllers/admin/ldap_settings.py:126
 msgid "Ldap settings updated successfully"
 msgstr "LDAP設定を更新しました"
 
 #: rhodecode/controllers/admin/ldap_settings.py:130
 msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
 msgstr "LDAPを有効にできませんでした。\"python-ldap\"ライブラリがありません。"
 
 #: rhodecode/controllers/admin/ldap_settings.py:147
 msgid "error occurred during update of ldap settings"
 msgstr "LDAP設定の更新中にエラーが発生しました"
 
 #: rhodecode/controllers/admin/permissions.py:59
 msgid "None"
 msgstr "なし"
 
 #: rhodecode/controllers/admin/permissions.py:60
 msgid "Read"
 msgstr "読込"
 
 #: rhodecode/controllers/admin/permissions.py:61
 msgid "Write"
 msgstr "書込"
 
 #: rhodecode/controllers/admin/permissions.py:62
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
 #: rhodecode/templates/admin/repos/repo_add.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:9
 #: rhodecode/templates/admin/repos/repos.html: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/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:122
+#: rhodecode/templates/admin/users/user_edit.html:126
 #: rhodecode/templates/admin/users/users.html:9
 #: 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:197
-#: rhodecode/templates/base/base.html:337
-#: rhodecode/templates/base/base.html:339
-#: rhodecode/templates/base/base.html:341
+#: rhodecode/templates/base/base.html:349
+#: rhodecode/templates/base/base.html:351
+#: rhodecode/templates/base/base.html:353
 msgid "Admin"
 msgstr "管理"
 
 #: rhodecode/controllers/admin/permissions.py:65
 msgid "disabled"
 msgstr "無効にする"
 
 #: rhodecode/controllers/admin/permissions.py:67
 msgid "allowed with manual account activation"
 msgstr "手動でアカウントを有効にする"
 
 #: rhodecode/controllers/admin/permissions.py:69
 msgid "allowed with automatic account activation"
 msgstr "自動でアカウントを有効にする"
 
 #: rhodecode/controllers/admin/permissions.py:71
 #: rhodecode/controllers/admin/permissions.py:74
 msgid "Disabled"
 msgstr "無効"
 
 #: rhodecode/controllers/admin/permissions.py:72
 #: rhodecode/controllers/admin/permissions.py:75
 msgid "Enabled"
 msgstr "有効"
 
 #: rhodecode/controllers/admin/permissions.py:116
 msgid "Default permissions updated successfully"
 msgstr "デフォルトの権限を更新しました"
 
 #: rhodecode/controllers/admin/permissions.py:130
 msgid "error occurred during update of permissions"
 msgstr "権限の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:123
+#: rhodecode/controllers/admin/repos.py:124
 msgid "--REMOVE FORK--"
 msgstr "--フォーク元を削除--"
 
-#: rhodecode/controllers/admin/repos.py:192
+#: rhodecode/controllers/admin/repos.py:193
 #, python-format
 msgid "created repository %s from %s"
 msgstr "リポジトリ %s を %s から作成"
 
-#: rhodecode/controllers/admin/repos.py:196
+#: rhodecode/controllers/admin/repos.py:197
 #, python-format
 msgid "created repository %s"
 msgstr "リポジトリ %s を作成しました"
 
-#: rhodecode/controllers/admin/repos.py:227
+#: rhodecode/controllers/admin/repos.py:228
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr "リポジトリ %s を作成中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:319
+#: rhodecode/controllers/admin/repos.py:320
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:348
+#: rhodecode/controllers/admin/repos.py:349
 msgid "An error occurred during deletion of repository user"
 msgstr "リポジトリユーザーの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:367
+#: rhodecode/controllers/admin/repos.py:368
 msgid "An error occurred during deletion of repository users groups"
 msgstr "リポジトリユーザーグループの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:385
+#: rhodecode/controllers/admin/repos.py:386
 msgid "An error occurred during deletion of repository stats"
 msgstr "リポジトリステートの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:402
+#: rhodecode/controllers/admin/repos.py:403
 msgid "An error occurred during cache invalidation"
 msgstr "キャッシュの無効化時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:422
-msgid "An error occurred during unlocking"
-msgstr "アンロック時にエラーが発生しました"
-
-#: rhodecode/controllers/admin/repos.py:442
+#: rhodecode/controllers/admin/repos.py:443
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:446
+#: rhodecode/controllers/admin/repos.py:447
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299
+#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300
 msgid "Token mismatch"
 msgstr "トークンが合いません"
 
-#: rhodecode/controllers/admin/repos.py:464
+#: rhodecode/controllers/admin/repos.py:465
 msgid "Pulled from remote location"
 msgstr "リモートから取得"
 
-#: rhodecode/controllers/admin/repos.py:466
+#: rhodecode/controllers/admin/repos.py:467
 msgid "An error occurred during pull from remote location"
 msgstr "リモートから取得中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:482
+#: rhodecode/controllers/admin/repos.py:483
 msgid "Nothing"
 msgstr "ありません"
 
-#: rhodecode/controllers/admin/repos.py:484
+#: rhodecode/controllers/admin/repos.py:485
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "%s リポジトリを %s のフォークとして印をつける"
 
-#: rhodecode/controllers/admin/repos.py:488
+#: rhodecode/controllers/admin/repos.py:489
 msgid "An error occurred during this operation"
 msgstr "操作中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:116
+#: rhodecode/controllers/admin/repos_groups.py:120
 #, python-format
 msgid "created repos group %s"
 msgstr "リポジトリグループ %s を作成しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:129
+#: rhodecode/controllers/admin/repos_groups.py:133
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr "リポジトリグループ %s を作成中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:163
+#: rhodecode/controllers/admin/repos_groups.py:167
 #, python-format
 msgid "updated repos group %s"
 msgstr "リポジトリグループ %s を更新しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:176
+#: rhodecode/controllers/admin/repos_groups.py:180
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr "リポジトリグループ %s を更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:194
+#: rhodecode/controllers/admin/repos_groups.py:198
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr "このグループは %s リポジトリを含んでいるため削除出来ません"
 
-#: rhodecode/controllers/admin/repos_groups.py:202
+#: rhodecode/controllers/admin/repos_groups.py:206
 #, python-format
 msgid "removed repos group %s"
 msgstr "リポジトリグループ %s を削除しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:208
+#: rhodecode/controllers/admin/repos_groups.py:212
 msgid "Cannot delete this group it still contains subgroups"
 msgstr "サブグループを含んでいるため、このグループを削除できません"
 
-#: rhodecode/controllers/admin/repos_groups.py:213
-#: rhodecode/controllers/admin/repos_groups.py:218
+#: rhodecode/controllers/admin/repos_groups.py:217
+#: rhodecode/controllers/admin/repos_groups.py:222
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr "リポジトリグループ %s の削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:238
+#: rhodecode/controllers/admin/repos_groups.py:243
 msgid "An error occurred during deletion of group user"
 msgstr "グループユーザーを削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:258
+#: rhodecode/controllers/admin/repos_groups.py:264
 msgid "An error occurred during deletion of group users groups"
 msgstr "グループユーザーのグループを削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:121
+#: rhodecode/controllers/admin/settings.py:123
 #, python-format
 msgid "Repositories successfully rescanned added: %s,removed: %s"
 msgstr "リポジトリを再度スキャンしました。 追加: %s 削除: %s"
 
-#: rhodecode/controllers/admin/settings.py:129
+#: rhodecode/controllers/admin/settings.py:131
 msgid "Whoosh reindex task scheduled"
 msgstr "Whooshの再インデックスタスクを予定に入れました"
 
-#: rhodecode/controllers/admin/settings.py:160
+#: rhodecode/controllers/admin/settings.py:162
 msgid "Updated application settings"
 msgstr "アプリケーション設定を更新しました"
 
-#: rhodecode/controllers/admin/settings.py:164
-#: rhodecode/controllers/admin/settings.py:275
+#: rhodecode/controllers/admin/settings.py:166
+#: rhodecode/controllers/admin/settings.py:299
 msgid "error occurred during updating application settings"
 msgstr "アプリケーション設定を更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:200
+#: rhodecode/controllers/admin/settings.py:207
 msgid "Updated visualisation settings"
 msgstr "表示の設定を更新しました"
 
-#: rhodecode/controllers/admin/settings.py:205
+#: rhodecode/controllers/admin/settings.py:212
 msgid "error occurred during updating visualisation settings"
 msgstr "表示の設定を更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:271
+#: rhodecode/controllers/admin/settings.py:295
 msgid "Updated VCS settings"
 msgstr "VCSの設定を更新しました"
 
-#: rhodecode/controllers/admin/settings.py:285
+#: rhodecode/controllers/admin/settings.py:309
 msgid "Added new hook"
 msgstr "新しいフックを追加しました"
 
-#: rhodecode/controllers/admin/settings.py:297
+#: rhodecode/controllers/admin/settings.py:321
 msgid "Updated hooks"
 msgstr "フックを更新しました"
 
-#: rhodecode/controllers/admin/settings.py:301
+#: rhodecode/controllers/admin/settings.py:325
 msgid "error occurred during hook creation"
 msgstr "フックの作成時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:320
+#: rhodecode/controllers/admin/settings.py:344
 msgid "Email task created"
 msgstr "メールのタスクを作成しました"
 
-#: rhodecode/controllers/admin/settings.py:375
+#: rhodecode/controllers/admin/settings.py:399
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr "このユーザーを編集出来ません。このユーザーはアプリケーションにとって必要不可欠です。"
 
-#: rhodecode/controllers/admin/settings.py:406
+#: rhodecode/controllers/admin/settings.py:430
 msgid "Your account was updated successfully"
 msgstr "アカウントを更新しました"
 
-#: rhodecode/controllers/admin/settings.py:421
-#: rhodecode/controllers/admin/users.py:191
+#: rhodecode/controllers/admin/settings.py:445
+#: rhodecode/controllers/admin/users.py:196
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr "ユーザー %s の更新中にエラーが発生しました"
 
 #: rhodecode/controllers/admin/users.py:130
 #, python-format
 msgid "created user %s"
 msgstr "ユーザー %s を作成しました"
 
 #: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "error occurred during creation of user %s"
 msgstr "ユーザー %s の作成中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:171
+#: rhodecode/controllers/admin/users.py:176
 msgid "User updated successfully"
 msgstr "ユーザーの更新に成功しました"
 
-#: rhodecode/controllers/admin/users.py:207
-msgid "successfully deleted user"
-msgstr "ユーザーの削除に成功しました"
-
 #: rhodecode/controllers/admin/users.py:212
+msgid "successfully deleted user"
+msgstr "ユーザーの削除に成功しました"
+
+#: rhodecode/controllers/admin/users.py:217
 msgid "An error occurred during deletion of user"
 msgstr "ユーザーの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:226
+#: rhodecode/controllers/admin/users.py:231
 msgid "You can't edit this user"
 msgstr "このユーザーは編集できません"
 
-#: rhodecode/controllers/admin/users.py:266
+#: rhodecode/controllers/admin/users.py:272
 msgid "Granted 'repository create' permission to user"
 msgstr "ユーザーに 'リポジトリ作成' 権限を与えました"
 
-#: rhodecode/controllers/admin/users.py:271
+#: rhodecode/controllers/admin/users.py:277
 msgid "Revoked 'repository create' permission to user"
 msgstr "ユーザーの 'リポジトリ作成' 権限を取り消しました"
 
-#: rhodecode/controllers/admin/users.py:277
+#: rhodecode/controllers/admin/users.py:283
 msgid "Granted 'repository fork' permission to user"
 msgstr "ユーザーに 'リポジトリフォーク' 権限を与えました"
 
-#: rhodecode/controllers/admin/users.py:282
+#: rhodecode/controllers/admin/users.py:288
 msgid "Revoked 'repository fork' permission to user"
 msgstr "ユーザーの 'リポジトリフォーク' 権限を取り消しました"
 
-#: rhodecode/controllers/admin/users.py:288
-#: rhodecode/controllers/admin/users_groups.py:255
+#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users_groups.py:279
 msgid "An error occurred during permissions saving"
 msgstr "権限の保存時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:303
+#: rhodecode/controllers/admin/users.py:309
 #, python-format
 msgid "Added email %s to user"
 msgstr "ユーザーにメール %s を追加しました"
 
-#: rhodecode/controllers/admin/users.py:309
+#: rhodecode/controllers/admin/users.py:315
 msgid "An error occurred during email saving"
 msgstr "メールの保存時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:319
+#: rhodecode/controllers/admin/users.py:325
 msgid "Removed email from user"
 msgstr "ユーザーからメールを削除しました"
 
-#: rhodecode/controllers/admin/users_groups.py:84
+#: rhodecode/controllers/admin/users_groups.py:86
 #, python-format
 msgid "created users group %s"
 msgstr "ユーザーグループ %s を作成しました"
 
-#: rhodecode/controllers/admin/users_groups.py:95
+#: rhodecode/controllers/admin/users_groups.py:97
 #, python-format
 msgid "error occurred during creation of users group %s"
 msgstr "ユーザーグループ %s の作成中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users_groups.py:135
+#: rhodecode/controllers/admin/users_groups.py:164
 #, python-format
 msgid "updated users group %s"
 msgstr "ユーザーグループ %s を更新しました"
 
-#: rhodecode/controllers/admin/users_groups.py:157
+#: rhodecode/controllers/admin/users_groups.py:186
 #, python-format
 msgid "error occurred during update of users group %s"
 msgstr "ユーザーグループ %s の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users_groups.py:174
+#: rhodecode/controllers/admin/users_groups.py:203
 msgid "successfully deleted users group"
 msgstr "ユーザーグループ"
 
-#: rhodecode/controllers/admin/users_groups.py:179
+#: rhodecode/controllers/admin/users_groups.py:208
 msgid "An error occurred during deletion of users group"
 msgstr "ユーザーグループの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users_groups.py:233
+#: rhodecode/controllers/admin/users_groups.py:257
 msgid "Granted 'repository create' permission to users group"
 msgstr "ユーザーグループに 'リポジトリ作成' 権限を与えました"
 
-#: rhodecode/controllers/admin/users_groups.py:238
+#: rhodecode/controllers/admin/users_groups.py:262
 msgid "Revoked 'repository create' permission to users group"
 msgstr "ユーザーグループの 'リポジトリ作成' 権限を取り消しました"
 
-#: rhodecode/controllers/admin/users_groups.py:244
+#: rhodecode/controllers/admin/users_groups.py:268
 msgid "Granted 'repository fork' permission to users group"
 msgstr "ユーザーグループに 'リポジトリフォーク' 権限を与えました"
 
-#: rhodecode/controllers/admin/users_groups.py:249
+#: rhodecode/controllers/admin/users_groups.py:273
 msgid "Revoked 'repository fork' permission to users group"
 msgstr "ユーザーグループの 'リポジトリフォーク' 権限を取り消しました"
 
 #: rhodecode/lib/auth.py:499
 msgid "You need to be a registered user to perform this action"
 msgstr "このアクションを実行するためには登録ユーザーである必要があります"
 
 #: rhodecode/lib/auth.py:540
 msgid "You need to be a signed in to view this page"
 msgstr "このページを閲覧するためにはサインインが必要です"
 
-#: rhodecode/lib/diffs.py:86
+#: rhodecode/lib/diffs.py:74
+msgid "binary file"
+msgstr "バイナリファイル"
+
+#: rhodecode/lib/diffs.py:90
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:96
+#: rhodecode/lib/diffs.py:100
 msgid "No changes detected"
 msgstr "検出された変更はありません"
 
-#: rhodecode/lib/helpers.py:372
+#: rhodecode/lib/helpers.py:373
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr "%a, %d %b %Y %H:%M:%S"
 
-#: rhodecode/lib/helpers.py:484
+#: rhodecode/lib/helpers.py:485
 msgid "True"
 msgstr "True"
 
-#: rhodecode/lib/helpers.py:488
+#: rhodecode/lib/helpers.py:489
 msgid "False"
 msgstr "False"
 
+#: rhodecode/lib/helpers.py:529
+#, fuzzy, python-format
+msgid "Deleted branch: %s"
+msgstr "リポジトリ %s を削除しました"
+
 #: rhodecode/lib/helpers.py:532
+#, fuzzy, python-format
+msgid "Created tag: %s"
+msgstr "ユーザー %s を作成しました"
+
+#: rhodecode/lib/helpers.py:545
 msgid "Changeset not found"
 msgstr "リビジョンが見つかりません"
 
-#: rhodecode/lib/helpers.py:555
+#: rhodecode/lib/helpers.py:588
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "%s から %s までのすべてのチェンジセットを表示"
 
-#: rhodecode/lib/helpers.py:561
+#: rhodecode/lib/helpers.py:594
 msgid "compare view"
 msgstr "比較の表示"
 
-#: rhodecode/lib/helpers.py:581
+#: rhodecode/lib/helpers.py:614
 msgid "and"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:582
+#: rhodecode/lib/helpers.py:615
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48
+#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51
 msgid "revisions"
 msgstr "リビジョン"
 
-#: rhodecode/lib/helpers.py:606
-msgid "fork name "
+#: rhodecode/lib/helpers.py:640
+#, fuzzy, python-format
+msgid "fork name %s"
 msgstr "フォーク名 "
 
-#: rhodecode/lib/helpers.py:620
+#: rhodecode/lib/helpers.py:653
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #: rhodecode/templates/pullrequests/pullrequest_show.html:12
 #, python-format
 msgid "Pull request #%s"
 msgstr "プルリクエスト #%s"
 
-#: rhodecode/lib/helpers.py:626
+#: rhodecode/lib/helpers.py:659
 msgid "[deleted] repository"
 msgstr "リポジトリを[削除]"
 
-#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638
+#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671
 msgid "[created] repository"
 msgstr "リポジトリを[作成]"
 
-#: rhodecode/lib/helpers.py:630
+#: rhodecode/lib/helpers.py:663
 msgid "[created] repository as fork"
 msgstr "フォークしてリポジトリを[作成]"
 
-#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640
+#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673
 msgid "[forked] repository"
 msgstr "リポジトリを[フォーク]"
 
-#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642
+#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675
 msgid "[updated] repository"
 msgstr "リポジトリを[更新]"
 
-#: rhodecode/lib/helpers.py:636
+#: rhodecode/lib/helpers.py:669
 msgid "[delete] repository"
 msgstr "リポジトリを[削除]"
 
-#: rhodecode/lib/helpers.py:644
+#: rhodecode/lib/helpers.py:677
 msgid "[created] user"
 msgstr "ユーザーを[作成]"
 
-#: rhodecode/lib/helpers.py:646
+#: rhodecode/lib/helpers.py:679
 msgid "[updated] user"
 msgstr "ユーザーを[更新]"
 
-#: rhodecode/lib/helpers.py:648
+#: rhodecode/lib/helpers.py:681
 msgid "[created] users group"
 msgstr "ユーザーグループを[作成]"
 
-#: rhodecode/lib/helpers.py:650
+#: rhodecode/lib/helpers.py:683
 msgid "[updated] users group"
 msgstr "ユーザーグループを[更新]"
 
-#: rhodecode/lib/helpers.py:652
+#: rhodecode/lib/helpers.py:685
 msgid "[commented] on revision in repository"
 msgstr "リポジトリのリビジョンに[コメント]"
 
-#: rhodecode/lib/helpers.py:654
+#: rhodecode/lib/helpers.py:687
 msgid "[commented] on pull request for"
 msgstr "プルリクエストに[コメント]"
 
-#: rhodecode/lib/helpers.py:656
+#: rhodecode/lib/helpers.py:689
 msgid "[closed] pull request for"
 msgstr "プルリクエストを[クローズ]"
 
-#: rhodecode/lib/helpers.py:658
+#: rhodecode/lib/helpers.py:691
 msgid "[pushed] into"
 msgstr "[プッシュ]"
 
-#: rhodecode/lib/helpers.py:660
+#: rhodecode/lib/helpers.py:693
 msgid "[committed via RhodeCode] into repository"
 msgstr "リポジトリに[RhodeCode経由でコミット]"
 
-#: rhodecode/lib/helpers.py:662
+#: rhodecode/lib/helpers.py:695
 msgid "[pulled from remote] into repository"
 msgstr "リポジトリに[リモートからプル]"
 
-#: rhodecode/lib/helpers.py:664
+#: rhodecode/lib/helpers.py:697
 msgid "[pulled] from"
 msgstr "[プル]"
 
-#: rhodecode/lib/helpers.py:666
+#: rhodecode/lib/helpers.py:699
 msgid "[started following] repository"
 msgstr "リポジトリの[フォローを開始]"
 
-#: rhodecode/lib/helpers.py:668
+#: rhodecode/lib/helpers.py:701
 msgid "[stopped following] repository"
 msgstr "リポジトリの[フォローを停止]"
 
-#: rhodecode/lib/helpers.py:840
+#: rhodecode/lib/helpers.py:877
 #, python-format
 msgid " and %s more"
 msgstr " と %s 以上"
 
-#: rhodecode/lib/helpers.py:844
+#: rhodecode/lib/helpers.py:881
 msgid "No Files"
 msgstr "ファイルなし"
 
-#: rhodecode/lib/utils2.py:335
+#: rhodecode/lib/utils2.py:403
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d 年"
 
-#: rhodecode/lib/utils2.py:336
+#: rhodecode/lib/utils2.py:404
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d ヶ月"
 
-#: rhodecode/lib/utils2.py:337
+#: rhodecode/lib/utils2.py:405
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 
-#: rhodecode/lib/utils2.py:338
+#: rhodecode/lib/utils2.py:406
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 時間"
 
-#: rhodecode/lib/utils2.py:339
+#: rhodecode/lib/utils2.py:407
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 
-#: rhodecode/lib/utils2.py:340
+#: rhodecode/lib/utils2.py:408
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 
-#: rhodecode/lib/utils2.py:355
+#: rhodecode/lib/utils2.py:424
+#, python-format
+msgid "in %s"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:426
 #, python-format
 msgid "%s ago"
 msgstr "%s 前"
 
-#: rhodecode/lib/utils2.py:357
+#: rhodecode/lib/utils2.py:428
+#, fuzzy, python-format
+msgid "in %s and %s"
+msgstr "%s と %s 前"
+
+#: rhodecode/lib/utils2.py:431
 #, python-format
 msgid "%s and %s ago"
 msgstr "%s と %s 前"
 
-#: rhodecode/lib/utils2.py:360
+#: rhodecode/lib/utils2.py:434
 msgid "just now"
 msgstr "ちょうどいま"
 
-#: rhodecode/lib/celerylib/tasks.py:269
+#: rhodecode/lib/celerylib/tasks.py:270
 msgid "password reset link"
 msgstr "パスワードリセットのリンク"
 
 #: rhodecode/model/comment.py:110
 #, python-format
 msgid "on line %s"
 msgstr ""
 
-#: rhodecode/model/comment.py:157
+#: rhodecode/model/comment.py:173
 msgid "[Mention]"
 msgstr "[Mention]"
 
-#: rhodecode/model/db.py:1140
+#: rhodecode/model/db.py:1163
 msgid "Repository no access"
 msgstr ""
 
-#: rhodecode/model/db.py:1141
+#: rhodecode/model/db.py:1164
 msgid "Repository read access"
 msgstr ""
 
-#: rhodecode/model/db.py:1142
+#: rhodecode/model/db.py:1165
 msgid "Repository write access"
 msgstr ""
 
-#: rhodecode/model/db.py:1143
+#: rhodecode/model/db.py:1166
 msgid "Repository admin access"
 msgstr ""
 
-#: rhodecode/model/db.py:1145
+#: rhodecode/model/db.py:1168
 msgid "Repositories Group no access"
 msgstr ""
 
-#: rhodecode/model/db.py:1146
+#: rhodecode/model/db.py:1169
 msgid "Repositories Group read access"
 msgstr ""
 
-#: rhodecode/model/db.py:1147
+#: rhodecode/model/db.py:1170
 msgid "Repositories Group write access"
 msgstr ""
 
-#: rhodecode/model/db.py:1148
+#: rhodecode/model/db.py:1171
 msgid "Repositories Group admin access"
 msgstr ""
 
-#: rhodecode/model/db.py:1150
+#: rhodecode/model/db.py:1173
 msgid "RhodeCode Administrator"
 msgstr ""
 
-#: rhodecode/model/db.py:1151
+#: rhodecode/model/db.py:1174
 msgid "Repository creation disabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1152
+#: rhodecode/model/db.py:1175
 msgid "Repository creation enabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1153
+#: rhodecode/model/db.py:1176
 msgid "Repository forking disabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1154
+#: rhodecode/model/db.py:1177
 msgid "Repository forking enabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1155
+#: rhodecode/model/db.py:1178
 msgid "Register disabled"
 msgstr ""
 
-#: rhodecode/model/db.py:1156
+#: rhodecode/model/db.py:1179
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1159
+#: rhodecode/model/db.py:1182
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/model/db.py:1579
+#: rhodecode/model/db.py:1623
 msgid "Not Reviewed"
 msgstr "未レビュー"
 
-#: rhodecode/model/db.py:1580
+#: rhodecode/model/db.py:1624
 msgid "Approved"
 msgstr "承認"
 
-#: rhodecode/model/db.py:1581
+#: rhodecode/model/db.py:1625
 msgid "Rejected"
 msgstr "却下"
 
-#: rhodecode/model/db.py:1582
+#: rhodecode/model/db.py:1626
 msgid "Under Review"
 msgstr "レビュー中"
 
 #: rhodecode/model/forms.py:43
 msgid "Please enter a login"
 msgstr "ログイン名を入力してください"
 
 #: rhodecode/model/forms.py:44
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr "%(min)i 文字以上必要です"
 
 #: rhodecode/model/forms.py:52
 msgid "Please enter a password"
 msgstr "パスワードを入力してください"
 
 #: rhodecode/model/forms.py:53
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr "%(min)i 文字以上必要です"
 
 #: rhodecode/model/notification.py:220
-msgid "commented on commit"
+#, fuzzy, python-format
+msgid "commented on commit at %(when)s"
 msgstr "コミットに対するコメント"
 
 #: rhodecode/model/notification.py:221
-msgid "sent message"
+#, python-format
+msgid "sent message at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:222
-msgid "mentioned you"
+#, python-format
+msgid "mentioned you at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:223
-msgid "registered in RhodeCode"
+#, python-format
+msgid "registered in RhodeCode at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:224
-msgid "opened new pull request"
-msgstr ""
+#, fuzzy, python-format
+msgid "opened new pull request at %(when)s"
+msgstr "新しいプルリクエストを作成"
 
 #: rhodecode/model/notification.py:225
-msgid "commented on pull request"
-msgstr ""
-
-#: rhodecode/model/pull_request.py:84
+#, fuzzy, python-format
+msgid "commented on pull request at %(when)s"
+msgstr "プルリクエストに[コメント]"
+
+#: rhodecode/model/pull_request.py:90
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:535
+#: rhodecode/model/scm.py:542
 msgid "latest tip"
 msgstr "最新のtip"
 
 #: rhodecode/model/user.py:230
 msgid "new user registration"
 msgstr "新規ユーザー登録"
 
-#: rhodecode/model/user.py:255 rhodecode/model/user.py:277
-#: rhodecode/model/user.py:299
+#: rhodecode/model/user.py:255 rhodecode/model/user.py:279
+#: rhodecode/model/user.py:301
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:323
+#: rhodecode/model/user.py:325
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:329
+#: rhodecode/model/user.py:331
 #, 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:35 rhodecode/model/validators.py:36
+#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37
 msgid "Value cannot be an empty list"
 msgstr ""
 
-#: rhodecode/model/validators.py:82
+#: rhodecode/model/validators.py:83
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "ユーザー名 \"%(username)s\" はすでに使われています"
 
-#: rhodecode/model/validators.py:84
+#: rhodecode/model/validators.py:85
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr "ユーザー名 \"%(username)s\" は許可されていません"
 
-#: rhodecode/model/validators.py:86
+#: rhodecode/model/validators.py:87
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
 msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります"
 
-#: rhodecode/model/validators.py:114
+#: rhodecode/model/validators.py:115
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr "ユーザー名 %(username)s は不正です"
 
-#: rhodecode/model/validators.py:133
+#: rhodecode/model/validators.py:134
 msgid "Invalid users group name"
 msgstr "不正なユーザーグループ名です"
 
-#: rhodecode/model/validators.py:134
+#: rhodecode/model/validators.py:135
 #, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr "ユーザーグループ \"%(usersgroup)s\" はすでに存在します"
 
-#: rhodecode/model/validators.py:136
+#: rhodecode/model/validators.py:137
 msgid ""
 "users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります"
 " "
 
-#: rhodecode/model/validators.py:174
+#: rhodecode/model/validators.py:175
 msgid "Cannot assign this group as parent"
 msgstr "このグループは親にできません"
 
-#: rhodecode/model/validators.py:175
+#: rhodecode/model/validators.py:176
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "グループ \"%(group_name)s\" はすでに存在します"
 
-#: rhodecode/model/validators.py:177
+#: rhodecode/model/validators.py:178
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "グループ名 \"%(group_name)s\" を持つリポジトリはすでに存在します"
 
-#: rhodecode/model/validators.py:235
+#: rhodecode/model/validators.py:236
 msgid "Invalid characters (non-ascii) in password"
 msgstr "パスワードに利用出来ない文字列(non-ascii)です"
 
-#: rhodecode/model/validators.py:250
+#: rhodecode/model/validators.py:251
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: rhodecode/model/validators.py:267
+#: rhodecode/model/validators.py:268
 msgid "invalid password"
 msgstr "不正なパスワードです"
 
-#: rhodecode/model/validators.py:268
+#: rhodecode/model/validators.py:269
 msgid "invalid user name"
 msgstr "不正なユーザー名です"
 
-#: rhodecode/model/validators.py:269
+#: rhodecode/model/validators.py:270
 msgid "Your account is disabled"
 msgstr "アカウントは無効です"
 
-#: rhodecode/model/validators.py:313
+#: rhodecode/model/validators.py:314
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "リポジトリ名 %(repo)s は許可されていません"
 
-#: rhodecode/model/validators.py:315
+#: rhodecode/model/validators.py:316
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "リポジトリ %(repo)s はすでに存在します"
 
-#: rhodecode/model/validators.py:316
+#: rhodecode/model/validators.py:317
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "リポジトリ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します"
 
-#: rhodecode/model/validators.py:318
+#: rhodecode/model/validators.py:319
 #, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します"
 
-#: rhodecode/model/validators.py:431
+#: rhodecode/model/validators.py:432
 msgid "invalid clone url"
 msgstr "無効なクローンURIです"
 
-#: rhodecode/model/validators.py:432
+#: rhodecode/model/validators.py:433
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 
-#: rhodecode/model/validators.py:457
+#: rhodecode/model/validators.py:458
 msgid "Fork have to be the same type as parent"
 msgstr "フォークは親と同じタイプの必要があります"
 
-#: rhodecode/model/validators.py:478
+#: rhodecode/model/validators.py:473
+#, fuzzy
+msgid "You don't have permissions to create repository in this group"
+msgstr "このページを見る権限がありません"
+
+#: rhodecode/model/validators.py:498
 msgid "This username or users group name is not valid"
 msgstr "ユーザー名かユーザーグループが不正です"
 
-#: rhodecode/model/validators.py:562
+#: rhodecode/model/validators.py:582
 msgid "This is not a valid path"
 msgstr "不正なパスです"
 
-#: rhodecode/model/validators.py:577
+#: rhodecode/model/validators.py:597
 msgid "This e-mail address is already taken"
 msgstr "このメールアドレスはすでに取得されています"
 
-#: rhodecode/model/validators.py:597
+#: rhodecode/model/validators.py:617
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "メールアドレス \"%(email)s\" は存在しません"
 
-#: rhodecode/model/validators.py:634
+#: rhodecode/model/validators.py:654
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr "LDAPのこのCNに対するログイン属性は必須です。 - これは \"ユーザー名\" と同じです"
 
-#: rhodecode/model/validators.py:653
+#: rhodecode/model/validators.py:673
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr "ダッシュボード"
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/repo_switcher_list.html:4
 #: 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/branches/branches.html:9
 #: rhodecode/templates/journal/journal.html:40
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
 msgstr "クイックフィルタ..."
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:221
+#: rhodecode/templates/base/base.html:233
 msgid "repositories"
 msgstr "リポジトリ"
 
 #: rhodecode/templates/index_base.html:13
 #: rhodecode/templates/index_base.html:15
 #: rhodecode/templates/admin/repos/repos.html:21
 msgid "ADD REPOSITORY"
 msgstr "リポジトリの追加"
 
 #: rhodecode/templates/index_base.html:29
+#: rhodecode/templates/index_base.html:136
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
 #: rhodecode/templates/admin/users_groups/users_group_add.html:32
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33
 msgid "Group name"
 msgstr "グループ名"
 
 #: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/index_base.html:142
-#: rhodecode/templates/index_base.html:168
+#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/index_base.html:138
+#: rhodecode/templates/index_base.html:176
+#: rhodecode/templates/index_base.html:266
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:72
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
 #: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:66
-#: rhodecode/templates/summary/summary.html:105
+#: rhodecode/templates/summary/summary.html:114
 msgid "Description"
 msgstr "説明"
 
 #: rhodecode/templates/index_base.html:40
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47
 msgid "Repositories group"
 msgstr "リポジトリグループ"
 
-#: rhodecode/templates/index_base.html:70
-#: rhodecode/templates/index_base.html:166
+#: rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:174
+#: rhodecode/templates/index_base.html:264
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
 #: rhodecode/templates/admin/repos/repos.html:70
-#: rhodecode/templates/admin/users/user_edit.html:192
+#: rhodecode/templates/admin/users/user_edit.html:196
 #: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:157
-#: rhodecode/templates/admin/users/user_edit_my_account.html:193
+#: rhodecode/templates/admin/users/user_edit_my_account.html:180
+#: rhodecode/templates/admin/users/user_edit_my_account.html:216
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:184
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:51
+#: rhodecode/templates/branches/branches.html:50
+#: rhodecode/templates/branches/branches_data.html:6
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:59
-#: rhodecode/templates/journal/journal.html:107
-#: rhodecode/templates/journal/journal.html:186
+#: rhodecode/templates/journal/journal.html:62
+#: rhodecode/templates/journal/journal.html:168
+#: rhodecode/templates/journal/journal_page_repos.html:7
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:123
-#: rhodecode/templates/tags/tags.html:36
+#: rhodecode/templates/summary/summary.html:132
+#: rhodecode/templates/tags/tags.html:51
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr "名前"
 
-#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/index_base.html:73
 msgid "Last change"
 msgstr "最後の変更時刻"
 
-#: rhodecode/templates/index_base.html:73
-#: rhodecode/templates/index_base.html:171
-#: rhodecode/templates/admin/users/user_edit_my_account.html:159
-#: rhodecode/templates/journal/journal.html:188
+#: rhodecode/templates/index_base.html:74
+#: rhodecode/templates/index_base.html:179
+#: rhodecode/templates/admin/users/user_edit_my_account.html:182
+#: rhodecode/templates/journal/journal.html:170
 msgid "Tip"
 msgstr "Tip"
 
-#: rhodecode/templates/index_base.html:74
-#: rhodecode/templates/index_base.html:173
+#: rhodecode/templates/index_base.html:75
+#: rhodecode/templates/index_base.html:181
+#: rhodecode/templates/index_base.html:269
 #: rhodecode/templates/admin/repos/repo_edit.html:121
 #: rhodecode/templates/admin/repos/repos.html:73
 msgid "Owner"
 msgstr "所有者"
 
-#: rhodecode/templates/index_base.html:75
+#: rhodecode/templates/index_base.html:76
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr "RSS"
 
-#: rhodecode/templates/index_base.html:76
+#: rhodecode/templates/index_base.html:77
 msgid "Atom"
 msgstr "Atom"
 
-#: rhodecode/templates/index_base.html:110
-#: rhodecode/templates/index_base.html:112
-#, python-format
-msgid "Subscribe to %s rss feed"
-msgstr "%s の RSS フィードを購読"
-
-#: rhodecode/templates/index_base.html:117
-#: rhodecode/templates/index_base.html:119
-#, python-format
-msgid "Subscribe to %s atom feed"
-msgstr "%s の ATOM フィードを購読"
-
-#: rhodecode/templates/index_base.html:140
-msgid "Group Name"
-msgstr "グループ名"
-
-#: rhodecode/templates/index_base.html:158
-#: rhodecode/templates/index_base.html:198
+#: rhodecode/templates/index_base.html:167
+#: rhodecode/templates/index_base.html:207
+#: rhodecode/templates/index_base.html:291
 #: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:179
+#: rhodecode/templates/admin/users/user_edit_my_account.html:202
 #: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:211
-#: rhodecode/templates/tags/tags.html:60
+#: rhodecode/templates/branches/branches.html:76
+#: rhodecode/templates/journal/journal.html:193
+#: rhodecode/templates/tags/tags.html:77
 msgid "Click to sort ascending"
 msgstr "昇順で並び換え"
 
-#: rhodecode/templates/index_base.html:159
-#: rhodecode/templates/index_base.html:199
+#: rhodecode/templates/index_base.html:168
+#: rhodecode/templates/index_base.html:208
+#: rhodecode/templates/index_base.html:292
 #: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:180
+#: rhodecode/templates/admin/users/user_edit_my_account.html:203
 #: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
-#: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:212
-#: rhodecode/templates/tags/tags.html:61
+#: rhodecode/templates/branches/branches.html:77
+#: rhodecode/templates/journal/journal.html:194
+#: rhodecode/templates/tags/tags.html:78
 msgid "Click to sort descending"
 msgstr "降順で並び替え"
 
-#: rhodecode/templates/index_base.html:169
+#: rhodecode/templates/index_base.html:177
+#: rhodecode/templates/index_base.html:267
 msgid "Last Change"
 msgstr "最後の変更点"
 
-#: rhodecode/templates/index_base.html:200
+#: rhodecode/templates/index_base.html:209
+#: rhodecode/templates/index_base.html:293
 #: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:181
+#: rhodecode/templates/admin/users/user_edit_my_account.html:204
 #: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
-#: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:213
-#: rhodecode/templates/tags/tags.html:62
+#: rhodecode/templates/branches/branches.html:78
+#: rhodecode/templates/journal/journal.html:195
+#: rhodecode/templates/tags/tags.html:79
 msgid "No records found."
 msgstr "レコードが見つかりません"
 
-#: rhodecode/templates/index_base.html:201
+#: rhodecode/templates/index_base.html:210
+#: rhodecode/templates/index_base.html:294
 #: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:182
+#: rhodecode/templates/admin/users/user_edit_my_account.html:205
 #: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
-#: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:214
-#: rhodecode/templates/tags/tags.html:63
+#: rhodecode/templates/branches/branches.html:79
+#: rhodecode/templates/journal/journal.html:196
+#: rhodecode/templates/tags/tags.html:80
 msgid "Data error."
 msgstr "データエラー"
 
-#: rhodecode/templates/index_base.html:202
+#: rhodecode/templates/index_base.html:211
+#: rhodecode/templates/index_base.html:295
 #: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:183
+#: rhodecode/templates/admin/users/user_edit_my_account.html:206
 #: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
-#: rhodecode/templates/branches/branches.html:81
-#: rhodecode/templates/journal/journal.html:215
-#: rhodecode/templates/tags/tags.html:64
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:54
+#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/tags/tags.html:81
 msgid "Loading..."
 msgstr "読み込み中..."
 
 #: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
 msgid "Sign In"
 msgstr "サインイン"
 
 #: rhodecode/templates/login.html:21
 msgid "Sign In to"
 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:50
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
 #: rhodecode/templates/base/base.html:83
-#: rhodecode/templates/summary/summary.html:122
+#: rhodecode/templates/summary/summary.html:131
 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:92
 msgid "Password"
 msgstr "パスワード"
 
 #: rhodecode/templates/login.html:50
 msgid "Remember me"
 msgstr "次回から自動的にサインイン"
 
 #: rhodecode/templates/login.html:60
 msgid "Forgot your password ?"
 msgstr "パスワードを忘れた場合はこちら"
 
 #: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103
 msgid "Don't have an account ?"
 msgstr "アカウントを持っていない場合はこちら"
 
 #: rhodecode/templates/password_reset.html:5
 msgid "Reset your password"
 msgstr "パスワードリセット"
 
 #: rhodecode/templates/password_reset.html:11
 msgid "Reset your password to"
 msgstr "パスワードリセット"
 
 #: rhodecode/templates/password_reset.html:21
 msgid "Email address"
 msgstr "メールアドレス"
 
 #: rhodecode/templates/password_reset.html:30
 msgid "Reset my password"
 msgstr "パスワードをリセットする"
 
 #: rhodecode/templates/password_reset.html:31
 msgid "Password reset link will be send to matching email address"
 msgstr "該当するメールアドレスにパスワードリセットのリンクを送信します"
 
 #: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74
 msgid "Sign Up"
 msgstr "サインアップ"
 
 #: rhodecode/templates/register.html:11
 msgid "Sign Up to"
 msgstr "サインアップ"
 
 #: rhodecode/templates/register.html:38
 msgid "Re-enter password"
 msgstr "パスワード再入力"
 
 #: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:86
+#: rhodecode/templates/admin/users/user_edit.html:90
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
 msgid "First Name"
 msgstr "名前"
 
 #: rhodecode/templates/register.html:56
 #: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:95
+#: rhodecode/templates/admin/users/user_edit.html:99
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
 msgid "Last Name"
 msgstr "名字"
 
 #: rhodecode/templates/register.html:65
 #: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:104
+#: rhodecode/templates/admin/users/user_edit.html:108
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:124
+#: rhodecode/templates/summary/summary.html:133
 msgid "Email"
 msgstr "メールアドレス"
 
 #: rhodecode/templates/register.html:76
 msgid "Your account will be activated right after registration"
 msgstr "アカウントは登録後にアクティブになります"
 
 #: rhodecode/templates/register.html:78
 msgid "Your account must wait for activation by administrator"
 msgstr "アカウントは管理者のアクティベーションを待つ必要があります"
 
 #: rhodecode/templates/repo_switcher_list.html:11
 #: rhodecode/templates/admin/repos/repo_add_base.html:65
 #: rhodecode/templates/admin/repos/repo_edit.html:85
 #: rhodecode/templates/settings/repo_settings.html:76
 msgid "Private repository"
 msgstr "非公開リポジトリ"
 
 #: rhodecode/templates/repo_switcher_list.html:16
 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:33
+#: 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"
 msgstr "まだブックマークがありません"
 
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:9
 msgid "Admin journal"
 msgstr "管理者ジャーナル"
 
 #: rhodecode/templates/admin/admin_log.html:6
 #: rhodecode/templates/admin/repos/repos.html:74
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9
-#: rhodecode/templates/journal/journal.html:61
-#: rhodecode/templates/journal/journal.html:62
+#: rhodecode/templates/journal/journal_page_repos.html:9
+#: rhodecode/templates/journal/journal_page_repos.html:10
 msgid "Action"
 msgstr "アクション"
 
 #: rhodecode/templates/admin/admin_log.html:7
 msgid "Repository"
 msgstr "リポジトリ"
 
 #: rhodecode/templates/admin/admin_log.html:8
 #: rhodecode/templates/bookmarks/bookmarks.html:37
 #: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:52
-#: rhodecode/templates/tags/tags.html:37
+#: rhodecode/templates/branches/branches.html:51
+#: rhodecode/templates/branches/branches_data.html:7
+#: rhodecode/templates/tags/tags.html:52
 #: rhodecode/templates/tags/tags_data.html:7
 msgid "Date"
 msgstr "日時"
 
 #: rhodecode/templates/admin/admin_log.html:9
 msgid "From IP"
 msgstr "アクセス元IPアドレス"
 
-#: rhodecode/templates/admin/admin_log.html:53
+#: rhodecode/templates/admin/admin_log.html:57
 msgid "No actions yet"
 msgstr "まだアクションがありません"
 
 #: rhodecode/templates/admin/ldap/ldap.html:5
 msgid "LDAP administration"
 msgstr "LDAP管理"
 
 #: rhodecode/templates/admin/ldap/ldap.html:11
 msgid "Ldap"
 msgstr "LDAP"
 
 #: rhodecode/templates/admin/ldap/ldap.html:28
 msgid "Connection settings"
 msgstr "接続設定"
 
 #: rhodecode/templates/admin/ldap/ldap.html:30
 msgid "Enable LDAP"
 msgstr "LDAPを有効にする"
 
 #: rhodecode/templates/admin/ldap/ldap.html:34
 msgid "Host"
 msgstr "ホスト"
 
 #: rhodecode/templates/admin/ldap/ldap.html:38
 msgid "Port"
 msgstr "ポート"
 
 #: rhodecode/templates/admin/ldap/ldap.html:42
 msgid "Account"
 msgstr "アカウント"
 
 #: rhodecode/templates/admin/ldap/ldap.html:50
 msgid "Connection security"
 msgstr "接続のセキュリティ"
 
 #: rhodecode/templates/admin/ldap/ldap.html:54
 msgid "Certificate Checks"
 msgstr "証明書チェック"
 
 #: rhodecode/templates/admin/ldap/ldap.html:57
 msgid "Search settings"
 msgstr "検索設定"
 
 #: rhodecode/templates/admin/ldap/ldap.html:59
 msgid "Base DN"
 msgstr "Base DN"
 
 #: rhodecode/templates/admin/ldap/ldap.html:63
 msgid "LDAP Filter"
 msgstr "LDAPフィルター"
 
 #: rhodecode/templates/admin/ldap/ldap.html:67
 msgid "LDAP Search Scope"
 msgstr "LDAP検索範囲"
 
 #: rhodecode/templates/admin/ldap/ldap.html:70
 msgid "Attribute mappings"
 msgstr "属性マッピング"
 
 #: rhodecode/templates/admin/ldap/ldap.html:72
 msgid "Login Attribute"
 msgstr "ログイン属性"
 
 #: rhodecode/templates/admin/ldap/ldap.html:76
 msgid "First Name Attribute"
 msgstr "名前(First Name)属性"
 
 #: rhodecode/templates/admin/ldap/ldap.html:80
 msgid "Last Name Attribute"
 msgstr "名字(Last Name)属性"
 
 #: rhodecode/templates/admin/ldap/ldap.html:84
 msgid "E-mail Attribute"
 msgstr "メールアドレス属性"
 
 #: rhodecode/templates/admin/ldap/ldap.html:89
 #: rhodecode/templates/admin/repos/repo_edit.html:141
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
 #: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_edit.html:129
-#: rhodecode/templates/admin/users/user_edit.html:174
+#: rhodecode/templates/admin/users/user_edit.html:133
+#: rhodecode/templates/admin/users/user_edit.html:178
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:93
 msgid "Save"
 msgstr "保存"
 
 #: rhodecode/templates/admin/notifications/notifications.html:5
 #: rhodecode/templates/admin/notifications/notifications.html:9
 msgid "My Notifications"
 msgstr "通知"
 
 #: rhodecode/templates/admin/notifications/notifications.html:29
 msgid "All"
 msgstr "すべて"
 
 #: rhodecode/templates/admin/notifications/notifications.html:30
 msgid "Comments"
 msgstr "コメント"
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:254
-#: rhodecode/templates/base/base.html:256
+#: rhodecode/templates/base/base.html:266
+#: rhodecode/templates/base/base.html:268
 msgid "Pull requests"
 msgstr "プルリクエスト"
 
 #: rhodecode/templates/admin/notifications/notifications.html:35
 msgid "Mark all read"
 msgstr "すべて既読にする"
 
 #: rhodecode/templates/admin/notifications/notifications_data.html:39
 msgid "No notifications here yet"
 msgstr "通知はまだありません"
 
 #: rhodecode/templates/admin/notifications/show_notification.html:5
 #: rhodecode/templates/admin/notifications/show_notification.html:11
 msgid "Show notification"
 msgstr "通知を表示"
 
 #: rhodecode/templates/admin/notifications/show_notification.html:9
 msgid "Notifications"
 msgstr "通知"
 
 #: rhodecode/templates/admin/permissions/permissions.html:5
 msgid "Permissions administration"
 msgstr "権限管理"
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:134
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
-#: rhodecode/templates/admin/users/user_edit.html:139
+#: rhodecode/templates/admin/users/user_edit.html:143
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
 #: rhodecode/templates/settings/repo_settings.html:86
 msgid "Permissions"
 msgstr "権限設定"
 
 #: rhodecode/templates/admin/permissions/permissions.html:24
 msgid "Default permissions"
 msgstr "デフォルトの権限"
 
 #: rhodecode/templates/admin/permissions/permissions.html:31
 msgid "Anonymous access"
 msgstr "匿名アクセス"
 
 #: rhodecode/templates/admin/permissions/permissions.html:41
 msgid "Repository permission"
 msgstr "リポジトリの権限"
 
 #: rhodecode/templates/admin/permissions/permissions.html:49
 msgid ""
 "All default permissions on each repository will be reset to choosen "
 "permission, note that all custom default permission on repositories will "
 "be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:50
 msgid "overwrite existing settings"
 msgstr "現在の設定を上書きする"
 
 #: rhodecode/templates/admin/permissions/permissions.html:55
 msgid "Registration"
 msgstr "登録"
 
 #: rhodecode/templates/admin/permissions/permissions.html:63
 msgid "Repository creation"
 msgstr "リポジトリ作成"
 
 #: rhodecode/templates/admin/permissions/permissions.html:71
 msgid "Repository forking"
 msgstr "リポジトリフォーク"
 
 #: rhodecode/templates/admin/permissions/permissions.html:78
-#: rhodecode/templates/admin/repos/repo_edit.html:241
+#: rhodecode/templates/admin/repos/repo_edit.html:264
 msgid "set"
 msgstr "保存"
 
 #: rhodecode/templates/admin/repos/repo_add.html:5
 #: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
 msgid "Add repository"
 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
 msgid "Repositories"
 msgstr "リポジトリ"
 
 #: rhodecode/templates/admin/repos/repo_add.html:13
 msgid "add new"
 msgstr "新規追加"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:95
-#: rhodecode/templates/summary/summary.html:96
+#: rhodecode/templates/summary/summary.html:104
+#: rhodecode/templates/summary/summary.html:105
 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 "オプション：クローンするリポジトリのHTTP[S]のURLを指定します"
 
 #: 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 "リポジトリグループ"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:33
 #: rhodecode/templates/forks/fork.html:54
 msgid "Optionaly select a group to put this repository into."
 msgstr "オプション：このリポジトリが属するグループを選択します"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:38
 #: rhodecode/templates/admin/repos/repo_edit.html:58
 msgid "Type"
 msgstr "リポジトリのタイプ"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:42
 msgid "Type of repository to create."
 msgstr "作成するリポジトリのタイプを指定します"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:47
 #: rhodecode/templates/admin/repos/repo_edit.html:66
 #: rhodecode/templates/forks/fork.html:41
 #: rhodecode/templates/settings/repo_settings.html:57
 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
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します"
 
 #: 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
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。"
 
 #: 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
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
 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
 msgid "Edit repository"
 msgstr "リポジトリを編集"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:13
 #: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:224
-#: rhodecode/templates/admin/users/user_edit.html:226
+#: rhodecode/templates/admin/users/user_edit.html:228
+#: rhodecode/templates/admin/users/user_edit.html:230
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/files/files_source.html:44
-#: rhodecode/templates/journal/journal.html:81
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
+#: rhodecode/templates/files/files_source.html:29
+#: rhodecode/templates/journal/journal_page_repos.html:29
 msgid "edit"
 msgstr "編集"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:40
 #: rhodecode/templates/settings/repo_settings.html:39
 msgid "Clone uri"
 msgstr "クローンURI"
 
 #: 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 "オプション: このリポジトリを配置するグループを選択します"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:94
 msgid "Enable statistics"
 msgstr "統計を有効にする"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:98
 msgid "Enable statistics window on summary page."
 msgstr "概要ページの統計ウィンドウを有効にします"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:103
 msgid "Enable downloads"
 msgstr "ダウンロードを有効にする"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:107
 msgid "Enable download menu on summary page."
 msgstr "概要ページのダウンロードメニューを有効にします"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:112
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
 msgid "Enable locking"
 msgstr "ロックを有効にする"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:116
 msgid "Enable lock-by-pulling on repository."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:126
 msgid "Change owner of this repository."
 msgstr "リポジトリの所有者を変更"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:142
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
 #: rhodecode/templates/admin/settings/settings.html:113
-#: rhodecode/templates/admin/settings/settings.html:168
-#: rhodecode/templates/admin/settings/settings.html:258
-#: rhodecode/templates/admin/users/user_edit.html:130
-#: rhodecode/templates/admin/users/user_edit.html:175
-#: rhodecode/templates/admin/users/user_edit.html:278
+#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:269
+#: rhodecode/templates/admin/users/user_edit.html:134
+#: rhodecode/templates/admin/users/user_edit.html:179
+#: rhodecode/templates/admin/users/user_edit.html:282
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
 #: 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:94
 msgid "Reset"
 msgstr "リセット"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr "管理"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:155
 msgid "Statistics"
 msgstr "統計"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Reset current statistics"
 msgstr "現在の統計情報をリセットする"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Confirm to remove current statistics"
 msgstr "現在の統計情報をリセットしてもよろしいですか？"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Fetched to rev"
 msgstr "収集するリビジョン"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:163
 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:195
-#: rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:320
-#: rhodecode/templates/base/base.html:322
-msgid "Public journal"
-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 "Remove from public journal"
-msgstr "公開ジャーナルから削除する"
+msgid "Prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:202
+#, fuzzy
+msgid "Key"
+msgstr "APIキー"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:203
+#: rhodecode/templates/admin/users/user_add.html:86
+#: rhodecode/templates/admin/users/user_edit.html:117
+#: rhodecode/templates/admin/users_groups/users_group_add.html:41
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
+msgid "Active"
+msgstr "アクティブ"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:218
+#: rhodecode/templates/base/base.html:330
+#: rhodecode/templates/base/base.html:332
+#: rhodecode/templates/base/base.html:334
+msgid "Public journal"
+msgstr "公開ジャーナル"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:224
+msgid "Remove from public journal"
+msgstr "公開ジャーナルから削除する"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:226
 msgid "Add to public journal"
 msgstr "公開ジャーナルに追加する"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:208
+#: rhodecode/templates/admin/repos/repo_edit.html:231
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
 msgstr "公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:215
+#: rhodecode/templates/admin/repos/repo_edit.html:238
 msgid "Locking"
 msgstr "ロック"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:220
+#: rhodecode/templates/admin/repos/repo_edit.html:243
 msgid "Unlock locked repo"
 msgstr "リポジトリのアンロック"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:220
+#: rhodecode/templates/admin/repos/repo_edit.html:243
 msgid "Confirm to unlock repository"
 msgstr "このリポジトリのロックを外しますか？"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:223
+#: rhodecode/templates/admin/repos/repo_edit.html:246
 msgid "lock repo"
 msgstr "リポジトリのロック"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:223
+#: rhodecode/templates/admin/repos/repo_edit.html:246
 msgid "Confirm to lock repository"
 msgstr "このリポジトリをロックしますか？"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:224
+#: rhodecode/templates/admin/repos/repo_edit.html:247
 msgid "Repository is not locked"
 msgstr "リポジトリはロックされていません"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:229
+#: 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:236
+#: rhodecode/templates/admin/repos/repo_edit.html:259
 msgid "Set as fork of"
 msgstr "フォーク元の設定"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:245
+#: 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:251
+#: rhodecode/templates/admin/repos/repo_edit.html:274
 #: rhodecode/templates/changeset/changeset_file_comment.html:26
 msgid "Delete"
 msgstr "削除"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:255
+#: rhodecode/templates/admin/repos/repo_edit.html:278
 msgid "Remove this repository"
 msgstr "このリポジトリを削除"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:255
-#: rhodecode/templates/journal/journal.html:84
+#: rhodecode/templates/admin/repos/repo_edit.html:278
 msgid "Confirm to delete this repository"
 msgstr "このリポジトリを削除しますか？"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:259
+#: rhodecode/templates/admin/repos/repo_edit.html:282
 msgid ""
 "This repository will be renamed in a special way in order to be "
 "unaccesible for RhodeCode and VCS systems.\n"
 "                         If you need fully delete it from filesystem "
 "please do it manually"
 msgstr ""
 "このリポジトリはRhodeCodeとVCSシステムからアクセスされないような名前に、特別な方法で変更されます。\n"
 "もし、ファイルシステムから完全に削除したい場合、手動で行ってください"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
 msgid "none"
 msgstr "なし"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:4
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
 msgid "read"
 msgstr "読込"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:5
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
 msgid "write"
 msgstr "書込"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
 #: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/base/base.html:217
+#: rhodecode/templates/base/base.html:229
 msgid "admin"
 msgstr "管理"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:7
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7
 msgid "member"
 msgstr "メンバー"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
 #: rhodecode/templates/data_table/_dt_elements.html:67
-#: rhodecode/templates/journal/journal.html:132
-#: rhodecode/templates/summary/summary.html:76
+#: rhodecode/templates/journal/journal.html:87
+#: 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
 msgid "default"
 msgstr "default"
 
 #: 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
 msgid "revoke"
 msgstr "取消"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:83
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67
 msgid "Add another member"
 msgstr "別のメンバーを追加"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:97
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
 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:96
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103
 msgid "Failed to remove users group"
 msgstr "ユーザーグループの削除に失敗しました"
 
 #: rhodecode/templates/admin/repos/repos.html:5
 msgid "Repositories administration"
 msgstr "リポジトリ管理"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:8
-msgid "Groups"
-msgstr "グループ"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:12
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73
+msgid "apply to children"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74
+msgid ""
+"Set or revoke permission to all children of that group, including "
+"repositories and other groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:9
+#: rhodecode/templates/base/base.html:122
+#: rhodecode/templates/base/base.html:312
+#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:316
+#: 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 "ホーム"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:13
 msgid "with"
 msgstr "と"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
 msgid "Add repos group"
 msgstr "リポジトリグループを追加"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10
 msgid "Repos groups"
 msgstr "リポジトリグループ"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12
 msgid "add new repos group"
 msgstr "新しいリポジトリグループを追加"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50
 msgid "Group parent"
 msgstr "親グループ"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58
 #: rhodecode/templates/admin/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:113
+#: rhodecode/templates/pullrequests/pullrequest_show.html:131
 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:70
 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 "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:54
-#: rhodecode/templates/admin/users/user_edit.html:255
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/users/user_edit.html:259
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 #: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:121
 msgid "delete"
 msgstr "削除"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
-#, python-format
-msgid "Confirm to delete this group: %s"
-msgstr "グループ %s を削除してもよろしいですか？"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#, 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] "このリポジトリを削除しますか？"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63
 msgid "There are no repositories groups yet"
 msgstr "まだリポジトリグループがありません"
 
 #: rhodecode/templates/admin/settings/hooks.html:5
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr "設定管理"
 
 #: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:9
 #: rhodecode/templates/settings/repo_settings.html:13
 msgid "Settings"
 msgstr "設定"
 
 #: rhodecode/templates/admin/settings/hooks.html:24
 msgid "Built in hooks - read only"
 msgstr "組み込みフック - 読み込み専用"
 
 #: rhodecode/templates/admin/settings/hooks.html:40
 msgid "Custom hooks"
 msgstr "カスタムフック"
 
 #: rhodecode/templates/admin/settings/hooks.html:56
 msgid "remove"
 msgstr "削除"
 
 #: rhodecode/templates/admin/settings/hooks.html:88
 msgid "Failed to remove hook"
 msgstr "フックの削除に失敗しました"
 
 #: rhodecode/templates/admin/settings/settings.html:24
 msgid "Remap and rescan repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:32
 msgid "rescan option"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:38
 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 ""
 "Rescan repositories location for new repositories. Also deletes obsolete "
 "if `destroy` flag is checked "
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:46
 msgid "Rescan repositories"
 msgstr "リポジトリを再チェック"
 
 #: rhodecode/templates/admin/settings/settings.html:52
 msgid "Whoosh indexing"
 msgstr "Whooshインデックス"
 
 #: 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
 msgid "Reindex"
 msgstr "再インデックス"
 
 #: rhodecode/templates/admin/settings/settings.html:77
 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 "Realmテキスト"
 
 #: rhodecode/templates/admin/settings/settings.html:104
 msgid "GA code"
 msgstr "GAコード"
 
 #: rhodecode/templates/admin/settings/settings.html:112
-#: rhodecode/templates/admin/settings/settings.html:167
-#: rhodecode/templates/admin/settings/settings.html:257
+#: rhodecode/templates/admin/settings/settings.html:178
+#: rhodecode/templates/admin/settings/settings.html:268
 msgid "Save settings"
 msgstr "設定を保存"
 
 #: rhodecode/templates/admin/settings/settings.html:119
 msgid "Visualisation settings"
 msgstr "表示の設定"
 
-#: rhodecode/templates/admin/settings/settings.html:128
+#: rhodecode/templates/admin/settings/settings.html:127
+#, fuzzy
+msgid "General"
+msgstr "有効にする"
+
+#: rhodecode/templates/admin/settings/settings.html:132
+msgid "Use lightweight dashboard"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:139
 msgid "Icons"
 msgstr "アイコン"
 
-#: rhodecode/templates/admin/settings/settings.html:133
+#: rhodecode/templates/admin/settings/settings.html:144
 msgid "Show public repo icon on repositories"
 msgstr "公開リポジトリのアイコンを表示"
 
-#: rhodecode/templates/admin/settings/settings.html:137
+#: rhodecode/templates/admin/settings/settings.html:148
 msgid "Show private repo icon on repositories"
 msgstr "非公開リポジトリのアイコンを表示"
 
-#: rhodecode/templates/admin/settings/settings.html:144
+#: rhodecode/templates/admin/settings/settings.html:155
 msgid "Meta-Tagging"
 msgstr "メタタグ"
 
-#: rhodecode/templates/admin/settings/settings.html:149
+#: rhodecode/templates/admin/settings/settings.html:160
 msgid "Stylify recognised metatags:"
 msgstr "次のメタタグを変換する"
 
-#: rhodecode/templates/admin/settings/settings.html:176
+#: rhodecode/templates/admin/settings/settings.html:187
 msgid "VCS settings"
 msgstr "VCSの設定"
 
-#: rhodecode/templates/admin/settings/settings.html:185
+#: rhodecode/templates/admin/settings/settings.html:196
 msgid "Web"
 msgstr "Web"
 
-#: rhodecode/templates/admin/settings/settings.html:190
+#: rhodecode/templates/admin/settings/settings.html:201
 msgid "require ssl for vcs operations"
 msgstr "VCSの操作にSSLを必須とする"
 
-#: rhodecode/templates/admin/settings/settings.html:192
+#: rhodecode/templates/admin/settings/settings.html:203
 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:198
+#: rhodecode/templates/admin/settings/settings.html:209
 msgid "Hooks"
 msgstr "フック"
 
-#: rhodecode/templates/admin/settings/settings.html:203
+#: rhodecode/templates/admin/settings/settings.html:214
 msgid "Update repository after push (hg update)"
 msgstr "プッシュ後にリポジトリをを更新する (hg update)"
 
-#: rhodecode/templates/admin/settings/settings.html:207
+#: rhodecode/templates/admin/settings/settings.html:218
 msgid "Show repository size after push"
 msgstr "プッシュ後にリポジトリのサイズを表示する"
 
-#: rhodecode/templates/admin/settings/settings.html:211
+#: rhodecode/templates/admin/settings/settings.html:222
 msgid "Log user push commands"
 msgstr "ユーザーのプッシュコマンドを記録する"
 
-#: rhodecode/templates/admin/settings/settings.html:215
+#: rhodecode/templates/admin/settings/settings.html:226
 msgid "Log user pull commands"
 msgstr "ユーザーのプルコマンドを記録する"
 
-#: rhodecode/templates/admin/settings/settings.html:219
+#: rhodecode/templates/admin/settings/settings.html:230
 msgid "advanced setup"
 msgstr "高度な設定"
 
-#: rhodecode/templates/admin/settings/settings.html:224
+#: rhodecode/templates/admin/settings/settings.html:235
 msgid "Mercurial Extensions"
 msgstr "Mercurialエクステンション"
 
-#: rhodecode/templates/admin/settings/settings.html:229
+#: rhodecode/templates/admin/settings/settings.html:240
 msgid "largefiles extensions"
 msgstr "largefilesエクステンション"
 
-#: rhodecode/templates/admin/settings/settings.html:233
+#: rhodecode/templates/admin/settings/settings.html:244
 msgid "hgsubversion extensions"
 msgstr "hgsubversionエクステンション"
 
-#: rhodecode/templates/admin/settings/settings.html:235
+#: rhodecode/templates/admin/settings/settings.html:246
 msgid ""
 "Requires hgsubversion library installed. Allows clonning from svn remote "
 "locations"
-msgstr ""
-"hgsubversion のインストールが必要です。"
-"リモートロケーションのsvnからクローン出来るようになります"
-
-#: rhodecode/templates/admin/settings/settings.html:245
+msgstr "hgsubversion のインストールが必要です。リモートロケーションのsvnからクローン出来るようになります"
+
+#: rhodecode/templates/admin/settings/settings.html:256
 msgid "Repositories location"
 msgstr "リポジトリロケーション"
 
-#: rhodecode/templates/admin/settings/settings.html:250
+#: rhodecode/templates/admin/settings/settings.html:261
 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:251
+#: rhodecode/templates/admin/settings/settings.html:262
+#: rhodecode/templates/base/base.html:221
 msgid "unlock"
 msgstr "変更可能にする"
 
-#: rhodecode/templates/admin/settings/settings.html:252
+#: rhodecode/templates/admin/settings/settings.html:263
 msgid ""
 "Location where repositories are stored. After changing this value a "
 "restart, and rescan is required"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:272
+#: rhodecode/templates/admin/settings/settings.html:283
 msgid "Test Email"
 msgstr "テストメール"
 
-#: rhodecode/templates/admin/settings/settings.html:280
+#: rhodecode/templates/admin/settings/settings.html:291
 msgid "Email to"
 msgstr "送信先"
 
-#: rhodecode/templates/admin/settings/settings.html:288
+#: rhodecode/templates/admin/settings/settings.html:299
 msgid "Send"
 msgstr "送る"
 
-#: rhodecode/templates/admin/settings/settings.html:294
+#: rhodecode/templates/admin/settings/settings.html:305
 msgid "System Info and Packages"
 msgstr "システム情報とパッケージ"
 
-#: rhodecode/templates/admin/settings/settings.html:297
+#: rhodecode/templates/admin/settings/settings.html:308
 msgid "show"
 msgstr "表示"
 
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr "ユーザーを追加"
 
 #: rhodecode/templates/admin/users/user_add.html:10
 #: rhodecode/templates/admin/users/user_edit.html:11
 msgid "Users"
 msgstr "ユーザー"
 
 #: rhodecode/templates/admin/users/user_add.html:12
 msgid "add new user"
 msgstr "新しいユーザーを追加"
 
 #: rhodecode/templates/admin/users/user_add.html:50
 msgid "Password confirmation"
 msgstr "パスワード再入力"
 
-#: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:113
-#: rhodecode/templates/admin/users_groups/users_group_add.html:41
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-msgid "Active"
-msgstr "アクティブ"
-
 #: rhodecode/templates/admin/users/user_edit.html:5
 msgid "Edit user"
 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"
 msgstr "アイコンを変えられます : "
 
 #: rhodecode/templates/admin/users/user_edit.html:35
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:11
 msgid "Using"
 msgstr "メールアドレス:"
 
 #: rhodecode/templates/admin/users/user_edit.html:43
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:20
 msgid "API key"
 msgstr "APIキー"
 
-#: rhodecode/templates/admin/users/user_edit.html:59
+#: rhodecode/templates/admin/users/user_edit.html:63
 msgid "LDAP DN"
 msgstr "LDAP DN"
 
-#: rhodecode/templates/admin/users/user_edit.html:68
+#: rhodecode/templates/admin/users/user_edit.html:72
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:35
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: rhodecode/templates/admin/users/user_edit.html:77
+#: rhodecode/templates/admin/users/user_edit.html:81
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
 msgid "New password confirmation"
 msgstr "新しいパスワード 再入力"
 
-#: rhodecode/templates/admin/users/user_edit.html:147
+#: rhodecode/templates/admin/users/user_edit.html:151
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
 msgid "Inherit default permissions"
 msgstr "デフォルトの権限を継承する"
 
-#: rhodecode/templates/admin/users/user_edit.html:152
+#: rhodecode/templates/admin/users/user_edit.html:156
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113
 #, python-format
 msgid ""
 "Select to inherit permissions from %s settings. With this selected below "
 "options does not have any action"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:158
+#: rhodecode/templates/admin/users/user_edit.html:162
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr "リポジトリを作成する"
 
-#: rhodecode/templates/admin/users/user_edit.html:166
+#: rhodecode/templates/admin/users/user_edit.html:170
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127
 msgid "Fork repositories"
 msgstr "リポジトリをフォークする"
 
-#: rhodecode/templates/admin/users/user_edit.html:186
+#: rhodecode/templates/admin/users/user_edit.html:190
 #: 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/users/user_edit.html:193
+#: rhodecode/templates/admin/users/user_edit.html:197
 #: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:194
+#: rhodecode/templates/admin/users/user_edit_my_account.html:217
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
 msgid "Permission"
 msgstr "権限"
 
-#: rhodecode/templates/admin/users/user_edit.html:194
+#: rhodecode/templates/admin/users/user_edit.html:198
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
 msgid "Edit Permission"
 msgstr "権限の編集"
 
-#: rhodecode/templates/admin/users/user_edit.html:243
+#: rhodecode/templates/admin/users/user_edit.html:247
 msgid "Email addresses"
 msgstr "メールアドレス"
 
-#: rhodecode/templates/admin/users/user_edit.html:256
+#: rhodecode/templates/admin/users/user_edit.html:260
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr "このメールを削除してよろしいですか: %s"
 
-#: rhodecode/templates/admin/users/user_edit.html:270
+#: rhodecode/templates/admin/users/user_edit.html:274
 msgid "New email address"
 msgstr "新しいメールアドレス"
 
-#: rhodecode/templates/admin/users/user_edit.html:277
+#: rhodecode/templates/admin/users/user_edit.html:281
 msgid "Add"
 msgstr "追加"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
 #: rhodecode/templates/base/base.html:124
 msgid "My account"
 msgstr "アカウント"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:9
 msgid "My Account"
 msgstr "アカウント"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:35
 msgid "My permissions"
 msgstr "権限"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:38
 #: rhodecode/templates/journal/journal.html:41
 msgid "My repos"
 msgstr "リポジトリ"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:41
 msgid "My pull requests"
 msgstr "プルリクエスト"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:45
 msgid "Add repo"
 msgstr "リポジトリの追加"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
 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 "プルリクエスト #%s %s に作成"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
 msgid "Confirm to delete this pull request"
 msgstr "このプルリクエストを削除しますか？"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26
 msgid "I participate in"
 msgstr "レビュアーとして参加"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
 msgstr "プルリクエスト #%s %s によって %s に作成"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7
 #: rhodecode/templates/bookmarks/bookmarks.html:40
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:55
-#: rhodecode/templates/journal/journal.html:60
-#: rhodecode/templates/tags/tags.html:40
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/journal/journal_page_repos.html:8
+#: rhodecode/templates/tags/tags.html:55
 #: rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr "リビジョン"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/journal/journal.html:81
+#: rhodecode/templates/journal/journal_page_repos.html:29
 msgid "private"
 msgstr "非公開"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31
 #: rhodecode/templates/data_table/_dt_elements.html:7
+#: rhodecode/templates/journal/journal_page_repos.html:32
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr "このリポジトリを削除しますか？ : %s"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38
-#: rhodecode/templates/journal/journal.html:94
+#: rhodecode/templates/journal/journal_page_repos.html:42
 msgid "No repositories yet"
 msgstr "まだリポジトリがありません"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40
-#: rhodecode/templates/journal/journal.html:96
+#: rhodecode/templates/journal/journal_page_repos.html:44
 msgid "create one now"
 msgstr "今すぐ作成する"
 
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "ユーザー管理"
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:223
+#: rhodecode/templates/base/base.html:235
 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"
 msgstr "名前"
 
 #: rhodecode/templates/admin/users/users.html:81
 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:226
+#: rhodecode/templates/base/base.html:238
 msgid "ldap"
 msgstr "LDAP"
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:5
 msgid "Add users group"
 msgstr "ユーザーグループを追加"
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:10
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
 msgid "Users groups"
 msgstr "ユーザーグループ"
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:12
 msgid "add new users group"
 msgstr "新しいユーザーグループを追加"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:5
 msgid "Edit users group"
 msgstr "ユーザーグループを編集"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:11
 msgid "UsersGroups"
 msgstr "ユーザーグループ"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:50
 msgid "Members"
 msgstr "メンバー"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:58
 msgid "Choosen group members"
 msgstr "グループメンバーを選ぶ"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:61
 msgid "Remove all elements"
 msgstr "全ての要素を削除"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:75
 msgid "Available members"
 msgstr "有効なメンバー"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:79
 msgid "Add all elements"
 msgstr "全ての要素を追加"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:146
 msgid "Group members"
 msgstr "グループメンバー"
 
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:163
+#, fuzzy
+msgid "No members yet"
+msgstr "メンバー"
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:171
+#, fuzzy
+msgid "Permissions defined for this group"
+msgstr "権限管理"
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:178
+#, fuzzy
+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 "ユーザグループを削除しますか？: %s"
 
 #: rhodecode/templates/base/base.html:41
 msgid "Submit a bug"
 msgstr "バグレポート"
 
 #: rhodecode/templates/base/base.html:77
 msgid "Login to your account"
 msgstr "ログイン"
 
 #: rhodecode/templates/base/base.html:100
 msgid "Forgot password ?"
 msgstr "パスワードを忘れた場合はこちら"
 
 #: rhodecode/templates/base/base.html:107
 msgid "Log In"
 msgstr "ログイン"
 
 #: rhodecode/templates/base/base.html:118
 msgid "Inbox"
 msgstr "受信箱"
 
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:300
-#: rhodecode/templates/base/base.html:302
-#: rhodecode/templates/base/base.html:304
-#: 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 "ホーム"
-
 #: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:309
-#: rhodecode/templates/base/base.html:311
-#: rhodecode/templates/base/base.html:313
+#: rhodecode/templates/base/base.html:321
+#: rhodecode/templates/base/base.html:323
+#: rhodecode/templates/base/base.html:325
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr "ジャーナル"
 
 #: rhodecode/templates/base/base.html:125
 msgid "Log Out"
 msgstr "ログアウト"
 
 #: rhodecode/templates/base/base.html:144
 msgid "Switch repository"
 msgstr "リポジトリの切り替え"
 
 #: rhodecode/templates/base/base.html:146
 msgid "Products"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:152
-#: rhodecode/templates/base/base.html:182
+#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47
 msgid "loading..."
 msgstr "読み込み中..."
 
 #: rhodecode/templates/base/base.html:158
 #: rhodecode/templates/base/base.html:160
 #: rhodecode/templates/base/base.html:162
 #: rhodecode/templates/data_table/_dt_elements.html:15
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
 msgid "Summary"
 msgstr "要約"
 
 #: rhodecode/templates/base/base.html:166
 #: rhodecode/templates/base/base.html:168
 #: rhodecode/templates/base/base.html:170
 #: rhodecode/templates/changelog/changelog.html:15
 #: rhodecode/templates/data_table/_dt_elements.html:23
 #: rhodecode/templates/data_table/_dt_elements.html:25
 #: rhodecode/templates/data_table/_dt_elements.html:27
 msgid "Changelog"
 msgstr "履歴"
 
 #: rhodecode/templates/base/base.html:175
 #: rhodecode/templates/base/base.html:177
 #: rhodecode/templates/base/base.html:179
 msgid "Switch to"
 msgstr "ブランチの切り替え"
 
 #: rhodecode/templates/base/base.html:186
 #: rhodecode/templates/base/base.html:188
 #: rhodecode/templates/base/base.html:190
 #: rhodecode/templates/data_table/_dt_elements.html:31
 #: rhodecode/templates/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 msgid "Files"
 msgstr "ファイル"
 
 #: rhodecode/templates/base/base.html:195
 #: rhodecode/templates/base/base.html:199
 msgid "Options"
 msgstr "オプション"
 
 #: rhodecode/templates/base/base.html:204
 #: rhodecode/templates/base/base.html:206
-#: rhodecode/templates/base/base.html:227
-msgid "settings"
-msgstr "設定"
-
-#: rhodecode/templates/base/base.html:209
+#, fuzzy
+msgid "repository settings"
+msgstr "リポジトリ作成"
+
+#: rhodecode/templates/base/base.html:210
 #: rhodecode/templates/data_table/_dt_elements.html:80
 #: rhodecode/templates/forks/fork.html:13
 msgid "fork"
 msgstr "フォーク"
 
-#: rhodecode/templates/base/base.html:211
-#: rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50
+#: rhodecode/templates/changelog/changelog.html:43
 msgid "Open new pull request"
 msgstr "新しいプルリクエストを作成"
 
-#: rhodecode/templates/base/base.html:213
+#: rhodecode/templates/base/base.html:215
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr "フォークを比較"
+
+#: rhodecode/templates/base/base.html:217
 msgid "search"
 msgstr "検索"
 
-#: rhodecode/templates/base/base.html:222
+#: rhodecode/templates/base/base.html:223
+#, fuzzy
+msgid "lock"
+msgstr "変更可能にする"
+
+#: rhodecode/templates/base/base.html:234
 msgid "repositories groups"
 msgstr "リポジトリグループ"
 
-#: rhodecode/templates/base/base.html:224
+#: rhodecode/templates/base/base.html:236
 msgid "users groups"
 msgstr "ユーザーグループ"
 
-#: rhodecode/templates/base/base.html:225
+#: rhodecode/templates/base/base.html:237
 msgid "permissions"
 msgstr "権限"
 
-#: rhodecode/templates/base/base.html:238
-#: rhodecode/templates/base/base.html:240
+#: rhodecode/templates/base/base.html:239
+msgid "settings"
+msgstr "設定"
+
+#: rhodecode/templates/base/base.html:250
+#: rhodecode/templates/base/base.html:252
 msgid "Followers"
 msgstr "フォロワー"
 
-#: rhodecode/templates/base/base.html:246
-#: rhodecode/templates/base/base.html:248
+#: rhodecode/templates/base/base.html:258
+#: rhodecode/templates/base/base.html:260
 msgid "Forks"
 msgstr "フォーク"
 
-#: rhodecode/templates/base/base.html:327
-#: rhodecode/templates/base/base.html:329
-#: rhodecode/templates/base/base.html:331
+#: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:341
+#: rhodecode/templates/base/base.html:343
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "検索"
 
 #: rhodecode/templates/base/root.html:42
 msgid "add another comment"
 msgstr "別のコメントを追加"
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:120
+#: rhodecode/templates/journal/journal.html:75
 #: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr "このリポジトリのフォローをやめる"
 
 #: rhodecode/templates/base/root.html:44
 #: rhodecode/templates/summary/summary.html:61
 msgid "Start following this repository"
 msgstr "このリポジトリのフォローする"
 
 #: rhodecode/templates/base/root.html:45
 msgid "Group"
 msgstr "グループ"
 
-#: rhodecode/templates/base/root.html:47
+#: rhodecode/templates/base/root.html:48
 msgid "search truncated"
 msgstr "検索結果は省略されています"
 
-#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/base/root.html:49
 msgid "no matching files"
 msgstr "マッチするファイルはありません"
 
+#: rhodecode/templates/base/root.html:51
+#, fuzzy
+msgid "Open new pull request for selected changesets"
+msgstr "新しいプルリクエストを作成"
+
+#: rhodecode/templates/base/root.html:52
+msgid "Show selected changes __S -> __E"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:53
+msgid "Selection link"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr "%s ブックマーク"
 
 #: rhodecode/templates/bookmarks/bookmarks.html:39
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:54
-#: rhodecode/templates/tags/tags.html:39
+#: rhodecode/templates/branches/branches.html:53
+#: rhodecode/templates/branches/branches_data.html:8
+#: rhodecode/templates/tags/tags.html:54
 #: rhodecode/templates/tags/tags_data.html:8
 msgid "Author"
 msgstr "作成者"
 
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr "%s ブランチ"
 
 #: rhodecode/templates/branches/branches.html:29
 msgid "Compare branches"
 msgstr "ブランチの比較"
 
-#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/branches/branches.html:56
+#: 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_data.html:10
 msgid "Compare"
 msgstr "比較"
 
-#: rhodecode/templates/branches/branches_data.html:6
-msgid "name"
-msgstr "名前"
-
-#: rhodecode/templates/branches/branches_data.html:7
-msgid "date"
-msgstr "日付"
-
-#: rhodecode/templates/branches/branches_data.html:8
-#: rhodecode/templates/shortlog/shortlog_data.html:8
-msgid "author"
-msgstr "作成者"
-
-#: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/shortlog/shortlog_data.html:5
-msgid "revision"
-msgstr "リビジョン"
-
-#: rhodecode/templates/branches/branches_data.html:10
-msgid "compare"
-msgstr "比較"
-
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr "%s チェンジログ"
 
 #: rhodecode/templates/changelog/changelog.html:15
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
 msgstr[0] ""
 
 #: rhodecode/templates/changelog/changelog.html:37
+#, fuzzy
+msgid "Clear selection"
+msgstr "検索設定"
+
+#: rhodecode/templates/changelog/changelog.html:40
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "compare fork with %s"
 msgstr "%s とフォークを比較"
 
-#: rhodecode/templates/changelog/changelog.html:37
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
-msgstr "フォークを比較"
-
-#: rhodecode/templates/changelog/changelog.html:46
+#: rhodecode/templates/changelog/changelog.html:40
+#, fuzzy
+msgid "Compare fork with parent"
+msgstr "%s とフォークを比較"
+
+#: rhodecode/templates/changelog/changelog.html:49
 msgid "Show"
 msgstr "表示"
 
-#: rhodecode/templates/changelog/changelog.html:72
-#: rhodecode/templates/summary/summary.html:364
+#: rhodecode/templates/changelog/changelog.html:74
+#: rhodecode/templates/summary/summary.html:375
 msgid "show more"
 msgstr "もっと表示"
 
-#: rhodecode/templates/changelog/changelog.html:76
+#: rhodecode/templates/changelog/changelog.html:78
 msgid "Affected number of files, click to show more details"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:89
-#: rhodecode/templates/changeset/changeset.html:38
+#: rhodecode/templates/changelog/changelog.html:91
+#: rhodecode/templates/changeset/changeset.html:44
 #: rhodecode/templates/changeset/changeset_file_comment.html:20
 #: rhodecode/templates/changeset/changeset_range.html:46
 msgid "Changeset status"
 msgstr "リビジョンステータス"
 
-#: rhodecode/templates/changelog/changelog.html:92
+#: rhodecode/templates/changelog/changelog.html:94
+#: rhodecode/templates/shortlog/shortlog_data.html:20
 msgid "Click to open associated pull request"
 msgstr "関連するプルリクエストを開く"
 
-#: rhodecode/templates/changelog/changelog.html:102
-#: rhodecode/templates/changeset/changeset.html:78
+#: rhodecode/templates/changelog/changelog.html:104
+#: rhodecode/templates/changeset/changeset.html:85
 msgid "Parent"
 msgstr "親リビジョン"
 
-#: rhodecode/templates/changelog/changelog.html:108
-#: rhodecode/templates/changeset/changeset.html:84
+#: rhodecode/templates/changelog/changelog.html:110
+#: rhodecode/templates/changeset/changeset.html:91
 msgid "No parents"
 msgstr "親リビジョンはありません"
 
-#: rhodecode/templates/changelog/changelog.html:113
-#: rhodecode/templates/changeset/changeset.html:88
+#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changeset/changeset.html:95
+#: rhodecode/templates/changeset/changeset_range.html:79
 msgid "merge"
 msgstr "マージ"
 
-#: rhodecode/templates/changelog/changelog.html:116
-#: rhodecode/templates/changeset/changeset.html:91
+#: rhodecode/templates/changelog/changelog.html:118
+#: rhodecode/templates/changeset/changeset.html:98
+#: 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:122
+#: rhodecode/templates/changelog/changelog.html:124
+#: rhodecode/templates/changeset/changeset_range.html:88
 msgid "bookmark"
 msgstr "ブックマーク"
 
-#: rhodecode/templates/changelog/changelog.html:128
-#: rhodecode/templates/changeset/changeset.html:96
+#: rhodecode/templates/changelog/changelog.html:130
+#: rhodecode/templates/changeset/changeset.html:103
+#: rhodecode/templates/changeset/changeset_range.html:94
 msgid "tag"
 msgstr "タグ"
 
-#: rhodecode/templates/changelog/changelog.html:164
-msgid "Show selected changes __S -> __E"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:255
+#: rhodecode/templates/changelog/changelog.html:301
 msgid "There are no changes yet"
 msgstr "まだ変更がありません"
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:66
+#: rhodecode/templates/changeset/changeset.html:73
 msgid "removed"
 msgstr "削除"
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/changeset.html:74
 msgid "changed"
 msgstr "変更"
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:68
+#: rhodecode/templates/changeset/changeset.html:75
 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:70
-#: rhodecode/templates/changeset/changeset.html:71
-#: rhodecode/templates/changeset/changeset.html:72
+#: rhodecode/templates/changeset/changeset.html:77
+#: rhodecode/templates/changeset/changeset.html:78
+#: rhodecode/templates/changeset/changeset.html:79
 #, python-format
 msgid "affected %s files"
 msgstr "%s ファイルに影響"
 
 #: rhodecode/templates/changeset/changeset.html:6
 #, python-format
 msgid "%s Changeset"
 msgstr "%s チェンジセット"
 
 #: rhodecode/templates/changeset/changeset.html:14
 msgid "Changeset"
 msgstr "チェンジセット"
 
-#: rhodecode/templates/changeset/changeset.html:43
+#: rhodecode/templates/changeset/changeset.html:49
 #: rhodecode/templates/changeset/diff_block.html:20
 msgid "raw diff"
 msgstr "差分を表示"
 
-#: rhodecode/templates/changeset/changeset.html:44
+#: rhodecode/templates/changeset/changeset.html:50
+#, fuzzy
+msgid "patch diff"
+msgstr "差分を表示"
+
+#: rhodecode/templates/changeset/changeset.html:51
 #: rhodecode/templates/changeset/diff_block.html:21
 msgid "download diff"
 msgstr "差分をダウンロード"
 
-#: rhodecode/templates/changeset/changeset.html:48
+#: rhodecode/templates/changeset/changeset.html:55
 #: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d コメント"
 
-#: rhodecode/templates/changeset/changeset.html:48
+#: rhodecode/templates/changeset/changeset.html:55
 #: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
 msgstr[0] "(%d インライン)"
 
-#: rhodecode/templates/changeset/changeset.html:103
-#, python-format
-msgid "%s files affected with %s insertions and %s deletions:"
-msgstr "%s ファイルに影響。 %s 個の追加と %s 個の削除:"
-
-#: rhodecode/templates/changeset/changeset.html:119
-msgid "Changeset was too big and was cut off..."
-msgstr "チェンジセットが大きすぎるため、省略しました"
+#: rhodecode/templates/changeset/changeset.html:111
+#: rhodecode/templates/compare/compare_diff.html:44
+#: rhodecode/templates/pullrequests/pullrequest_show.html:76
+#, fuzzy, python-format
+msgid "%s file changed"
+msgid_plural "%s files changed"
+msgstr[0] "変更されたファイル"
+
+#: rhodecode/templates/changeset/changeset.html:113
+#: rhodecode/templates/compare/compare_diff.html:46
+#: rhodecode/templates/pullrequests/pullrequest_show.html:78
+#, 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 ファイルに影響。 %s 個の追加と %s 個の削除:"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:42
 msgid "Submitting..."
 msgstr "サブミット中..."
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:45
 msgid "Commenting on line {1}."
 msgstr "{1} 行目にコメント"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:46
 #: rhodecode/templates/changeset/changeset_file_comment.html:121
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr "コメントには %s 構文 ( %s サポートつき ) が利用出来ます"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:48
 #: rhodecode/templates/changeset/changeset_file_comment.html:123
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr "テキスト内で @username を使うと、この RhodeCode のユーザーに通知を送信します"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:59
 #: rhodecode/templates/changeset/changeset_file_comment.html:138
 msgid "Comment"
 msgstr "コメント"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:60
 #: rhodecode/templates/changeset/changeset_file_comment.html:71
 msgid "Hide"
 msgstr "隠す"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "You need to be logged in to comment."
 msgstr "コメントするにはログインが必要です"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "Login now"
 msgstr "今すぐログインする"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:118
 msgid "Leave a comment"
 msgstr "コメントを残す"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:124
 msgid "Check this to change current status of code-review for this changeset"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:124
 msgid "change status"
 msgstr "ステータスを変更する"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:140
 msgid "Comment and close"
 msgstr "コメントしてクローズ"
 
 #: rhodecode/templates/changeset/changeset_range.html:5
 #, python-format
 msgid "%s Changesets"
 msgstr "%s チェンジセット"
 
 #: 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
+#, fuzzy
+msgid "Show combined compare"
+msgstr "インラインコメントを表示"
+
 #: rhodecode/templates/changeset/changeset_range.html:54
-#: rhodecode/templates/compare/compare_diff.html:41
-#: rhodecode/templates/pullrequests/pullrequest_show.html:69
 msgid "Files affected"
 msgstr "影響のあるファイル"
 
 #: rhodecode/templates/changeset/diff_block.html:19
-msgid "diff"
-msgstr "差分"
+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
 msgid "No changesets"
 msgstr "チェンジセットはありません"
 
 #: rhodecode/templates/compare/compare_diff.html:37
-msgid "Outgoing changesets"
-msgstr "送信可能なチェンジセット"
+#: rhodecode/templates/pullrequests/pullrequest_show.html:69
+#, fuzzy, python-format
+msgid "Showing %s commit"
+msgid_plural "Showing %s commits"
+msgstr[0] "インラインコメントを表示"
+
+#: rhodecode/templates/compare/compare_diff.html:52
+#: rhodecode/templates/pullrequests/pullrequest_show.html:84
+#, fuzzy
+msgid "No files"
+msgstr "ファイル"
 
 #: rhodecode/templates/data_table/_dt_elements.html:39
 #: rhodecode/templates/data_table/_dt_elements.html:41
 #: rhodecode/templates/data_table/_dt_elements.html:43
 msgid "Fork"
 msgstr "フォーク"
 
 #: rhodecode/templates/data_table/_dt_elements.html:60
-#: rhodecode/templates/journal/journal.html:126
-#: rhodecode/templates/summary/summary.html:68
+#: rhodecode/templates/journal/journal.html:81
+#: rhodecode/templates/summary/summary.html:77
 msgid "Mercurial repository"
 msgstr "Mercurialリポジトリ"
 
 #: rhodecode/templates/data_table/_dt_elements.html:62
-#: rhodecode/templates/journal/journal.html:128
-#: rhodecode/templates/summary/summary.html:71
+#: rhodecode/templates/journal/journal.html:83
+#: rhodecode/templates/summary/summary.html:80
 msgid "Git repository"
 msgstr "Gitリポジトリ"
 
 #: rhodecode/templates/data_table/_dt_elements.html:69
-#: rhodecode/templates/journal/journal.html:134
-#: rhodecode/templates/summary/summary.html:78
+#: rhodecode/templates/journal/journal.html:89
+#: rhodecode/templates/summary/summary.html:87
 msgid "public repository"
 msgstr "公開リポジトリ"
 
 #: rhodecode/templates/data_table/_dt_elements.html:80
-#: rhodecode/templates/summary/summary.html:87
-#: rhodecode/templates/summary/summary.html:88
+#: rhodecode/templates/summary/summary.html:96
+#: rhodecode/templates/summary/summary.html:97
 msgid "Fork of"
 msgstr "フォーク元: "
 
-#: rhodecode/templates/data_table/_dt_elements.html:92
+#: rhodecode/templates/data_table/_dt_elements.html:94
 msgid "No changesets yet"
 msgstr "まだチェンジセットがありません"
 
-#: rhodecode/templates/data_table/_dt_elements.html:104
+#: rhodecode/templates/data_table/_dt_elements.html:101
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#, python-format
+msgid "Subscribe to %s rss feed"
+msgstr "%s の RSS フィードを購読"
+
+#: rhodecode/templates/data_table/_dt_elements.html:109
+#: rhodecode/templates/data_table/_dt_elements.html:111
+#, python-format
+msgid "Subscribe to %s atom feed"
+msgstr "%s の ATOM フィードを購読"
+
+#: rhodecode/templates/data_table/_dt_elements.html:122
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "このユーザーを本当に削除してよろしいですか？: %s"
 
 #: rhodecode/templates/email_templates/main.html:8
-msgid "This is an notification from RhodeCode."
+#, fuzzy
+msgid "This is a notification from RhodeCode."
 msgstr "RhodeCodeからの通知があります"
 
 #: rhodecode/templates/errors/error_document.html:46
 #, 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 "%s ファイル差分"
 
 #: rhodecode/templates/files/file_diff.html:12
 msgid "File diff"
 msgstr "ファイル差分"
 
 #: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:72
+#: rhodecode/templates/files/files.html:74
 #, python-format
 msgid "%s files"
 msgstr "%s ファイル"
 
 #: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:340
+#: rhodecode/templates/summary/summary.html:351
 msgid "files"
 msgstr "ファイル"
 
 #: rhodecode/templates/files/files_add.html:4
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
 msgid "%s Edit file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:19
 msgid "add file"
 msgstr "ファイルを追加"
 
 #: rhodecode/templates/files/files_add.html:40
 msgid "Add new file"
 msgstr "新しいファイルを追加"
 
 #: rhodecode/templates/files/files_add.html:45
 msgid "File Name"
 msgstr "ファイル名"
 
 #: rhodecode/templates/files/files_add.html:49
 #: rhodecode/templates/files/files_add.html:58
 msgid "or"
 msgstr "または"
 
 #: rhodecode/templates/files/files_add.html:49
 #: rhodecode/templates/files/files_add.html:54
 msgid "Upload file"
 msgstr "アップロード"
 
 #: rhodecode/templates/files/files_add.html:58
 msgid "Create new file"
 msgstr "新しいファイルを作成"
 
 #: rhodecode/templates/files/files_add.html:63
 #: rhodecode/templates/files/files_edit.html:39
 #: rhodecode/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "場所"
 
 #: rhodecode/templates/files/files_add.html:67
 msgid "use / to separate directories"
 msgstr "ディレクトリの区切りには / を使います"
 
 #: rhodecode/templates/files/files_add.html:77
 #: rhodecode/templates/files/files_edit.html:63
 #: 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 changes"
 msgstr "変更をコミット"
 
 #: rhodecode/templates/files/files_browser.html:13
 msgid "view"
 msgstr "表示"
 
 #: rhodecode/templates/files/files_browser.html:14
 msgid "previous revision"
 msgstr "前のリビジョン"
 
 #: rhodecode/templates/files/files_browser.html:16
 msgid "next revision"
 msgstr "次のリビジョン"
 
 #: rhodecode/templates/files/files_browser.html:23
 msgid "follow current branch"
 msgstr "このブランチで追跡"
 
 #: rhodecode/templates/files/files_browser.html:27
 msgid "search file list"
 msgstr "ファイル一覧を検索"
 
 #: rhodecode/templates/files/files_browser.html:31
-#: rhodecode/templates/shortlog/shortlog_data.html:65
+#: rhodecode/templates/shortlog/shortlog_data.html:80
 msgid "add new file"
 msgstr "新しいファイルを追加"
 
 #: rhodecode/templates/files/files_browser.html:35
 msgid "Loading file list..."
 msgstr "ファイル一覧を読み込み中..."
 
 #: rhodecode/templates/files/files_browser.html:48
 msgid "Size"
 msgstr "サイズ"
 
 #: rhodecode/templates/files/files_browser.html:49
 msgid "Mimetype"
 msgstr "Mimetype"
 
 #: rhodecode/templates/files/files_browser.html:50
 msgid "Last Revision"
 msgstr "最後のリビジョン"
 
 #: rhodecode/templates/files/files_browser.html:51
 msgid "Last modified"
 msgstr "最終更新日"
 
 #: rhodecode/templates/files/files_browser.html:52
 msgid "Last commiter"
 msgstr "最後の作成者"
 
 #: rhodecode/templates/files/files_edit.html:19
 msgid "edit file"
 msgstr "ファイルを編集"
 
 #: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:38
+#: rhodecode/templates/files/files_source.html:23
 msgid "show annotation"
 msgstr "アノテーションを表示"
 
 #: rhodecode/templates/files/files_edit.html:50
-#: rhodecode/templates/files/files_source.html:40
-#: rhodecode/templates/files/files_source.html:68
+#: rhodecode/templates/files/files_source.html:25
+#: rhodecode/templates/files/files_source.html:53
 msgid "show as raw"
 msgstr "元のファイルを表示"
 
 #: rhodecode/templates/files/files_edit.html:51
-#: rhodecode/templates/files/files_source.html:41
+#: 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 "Editing file"
 msgstr "ファイルを編集"
 
-#: rhodecode/templates/files/files_source.html:2
+#: rhodecode/templates/files/files_history_box.html:2
 msgid "History"
 msgstr "変更履歴"
 
-#: rhodecode/templates/files/files_source.html:9
+#: rhodecode/templates/files/files_history_box.html:9
 msgid "diff to revision"
 msgstr "このリビジョンの差分を見る"
 
-#: rhodecode/templates/files/files_source.html:10
+#: rhodecode/templates/files/files_history_box.html:10
 msgid "show at revision"
 msgstr "このリビジョンを見る"
 
-#: rhodecode/templates/files/files_source.html:14
+#: rhodecode/templates/files/files_history_box.html:15
 #, python-format
 msgid "%s author"
 msgid_plural "%s authors"
 msgstr[0] "%s 作成者"
 
-#: rhodecode/templates/files/files_source.html:36
+#: rhodecode/templates/files/files_source.html:6
+#, fuzzy
+msgid "Load file history"
+msgstr "ファイル一覧を読み込み中..."
+
+#: rhodecode/templates/files/files_source.html:21
 msgid "show source"
 msgstr "ソースを表示"
 
-#: rhodecode/templates/files/files_source.html:59
+#: rhodecode/templates/files/files_source.html:44
 #, python-format
 msgid "Binary file (%s)"
 msgstr "バイナリファイル (%s)"
 
-#: rhodecode/templates/files/files_source.html:68
+#: rhodecode/templates/files/files_source.html:53
 msgid "File is too big to display"
 msgstr "表示するには大きすぎるファイルです"
 
-#: rhodecode/templates/files/files_source.html:124
-msgid "Selection link"
-msgstr ""
-
 #: rhodecode/templates/files/files_ypjax.html:5
 msgid "annotation"
 msgstr "アノテーション"
 
 #: rhodecode/templates/files/files_ypjax.html:15
 msgid "Go back"
 msgstr "戻る"
 
 #: rhodecode/templates/files/files_ypjax.html:16
 msgid "No files at given path"
 msgstr "そのパスにはファイルはありません"
 
 #: rhodecode/templates/followers/followers.html:5
 #, python-format
 msgid "%s Followers"
 msgstr "%s フォロワー"
 
 #: rhodecode/templates/followers/followers.html:13
 msgid "followers"
 msgstr "フォロワー"
 
 #: rhodecode/templates/followers/followers_data.html:12
 msgid "Started following -"
 msgstr "フォロー開始日 -"
 
 #: rhodecode/templates/forks/fork.html:5
 #, python-format
 msgid "%s Fork"
 msgstr "%s フォーク"
 
 #: rhodecode/templates/forks/fork.html:31
 msgid "Fork name"
 msgstr "フォーク名"
 
 #: rhodecode/templates/forks/fork.html:68
 msgid "Private"
 msgstr "非公開"
 
 #: rhodecode/templates/forks/fork.html:77
 msgid "Copy permissions"
 msgstr "権限のコピー"
 
 #: rhodecode/templates/forks/fork.html:81
 msgid "Copy permissions from forked repository"
 msgstr "フォーク元リポジトリから権限をコピーします"
 
 #: rhodecode/templates/forks/fork.html:86
 msgid "Update after clone"
 msgstr "クローン後にupdateする"
 
 #: rhodecode/templates/forks/fork.html:90
 msgid "Checkout source after making a clone"
 msgstr "クローンした後にソースをチェックアウトします"
 
 #: rhodecode/templates/forks/fork.html:94
 msgid "fork this repository"
 msgstr "このリポジトリをフォーク"
 
 #: rhodecode/templates/forks/forks.html:5
 #, python-format
 msgid "%s Forks"
 msgstr "%s フォーク"
 
 #: rhodecode/templates/forks/forks.html:13
 msgid "forks"
 msgstr "フォーク"
 
 #: rhodecode/templates/forks/forks_data.html:17
 msgid "forked"
 msgstr "フォークしました"
 
-#: rhodecode/templates/forks/forks_data.html:38
+#: rhodecode/templates/forks/forks_data.html:42
 msgid "There are no forks yet"
 msgstr "まだフォークがありません"
 
 #: rhodecode/templates/journal/journal.html:13
 msgid "ATOM journal feed"
 msgstr "ATOM ジャーナルフィード"
 
 #: rhodecode/templates/journal/journal.html:14
 msgid "RSS journal feed"
 msgstr "RSS ジャーナルフィード"
 
 #: rhodecode/templates/journal/journal.html:24
-#: rhodecode/templates/pullrequests/pullrequest.html:27
+#: rhodecode/templates/pullrequests/pullrequest.html:55
 msgid "Refresh"
 msgstr "更新"
 
 #: rhodecode/templates/journal/journal.html:27
 #: rhodecode/templates/journal/public_journal.html:24
 msgid "RSS feed"
 msgstr "RSSフィード"
 
 #: rhodecode/templates/journal/journal.html:30
 #: rhodecode/templates/journal/public_journal.html:27
 msgid "ATOM feed"
 msgstr "ATOMフィード"
 
 #: rhodecode/templates/journal/journal.html:41
 msgid "Watched"
 msgstr "ウォッチ"
 
 #: rhodecode/templates/journal/journal.html:46
 msgid "ADD"
 msgstr "追加"
 
-#: rhodecode/templates/journal/journal.html:114
+#: rhodecode/templates/journal/journal.html:69
 msgid "following user"
 msgstr "フォローしているユーザー"
 
-#: rhodecode/templates/journal/journal.html:114
+#: rhodecode/templates/journal/journal.html:69
 msgid "user"
 msgstr "ユーザー"
 
-#: rhodecode/templates/journal/journal.html:147
+#: rhodecode/templates/journal/journal.html:102
 msgid "You are not following any users or repositories"
 msgstr "まだどのユーザーもリポジトリもフォローしていません"
 
-#: rhodecode/templates/journal/journal_data.html:47
+#: rhodecode/templates/journal/journal_data.html:51
 msgid "No entries yet"
 msgstr "まだエントリがありません"
 
 #: rhodecode/templates/journal/public_journal.html:13
 msgid "ATOM public journal feed"
 msgstr "ATOM 公開ジャーナルフィード"
 
 #: rhodecode/templates/journal/public_journal.html:14
 msgid "RSS public journal feed"
 msgstr "RSS 公開ジャーナルフィード"
 
 #: rhodecode/templates/journal/public_journal.html:21
 msgid "Public Journal"
 msgstr "公開ジャーナル"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:4
 #: rhodecode/templates/pullrequests/pullrequest.html:12
 msgid "New pull request"
 msgstr "新しいプルリクエスト"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:28
+#: rhodecode/templates/pullrequests/pullrequest.html:54
 msgid "refresh overview"
 msgstr "概要の更新"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:66
 msgid "Detailed compare view"
 msgstr "比較ビュー詳細"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:82
+#: rhodecode/templates/pullrequests/pullrequest_show.html:100
 msgid "Pull request reviewers"
 msgstr "プルリクエストレビュアー"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+#: rhodecode/templates/pullrequests/pullrequest_show.html:112
 msgid "owner"
 msgstr "所有者"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:109
+#: rhodecode/templates/pullrequests/pullrequest_show.html:127
 msgid "Add reviewer to this pull request."
 msgstr "このプルリクエストにレビュアーを追加"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:97
 msgid "Create new pull request"
 msgstr "新しいプルリクエストを作成"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:106
 #: rhodecode/templates/pullrequests/pullrequest_show.html:25
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
 msgid "Title"
 msgstr "タイトル"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:115
 msgid "description"
 msgstr "説明"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:123
 msgid "Send pull request"
 msgstr "プルリクエストを送る"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:23
 #, python-format
 msgid "Closed %s"
 msgstr "%s にクローズ"
 
+#: rhodecode/templates/pullrequests/pullrequest_show.html:23
+#, 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 "Pull request status"
 msgstr "プルリクエストステータス"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:44
 msgid "Still not reviewed by"
 msgstr "未レビュー"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:47
+#: rhodecode/templates/pullrequests/pullrequest_show.html:48
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
 msgstr[0] "%d レビュアー"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:54
+#: rhodecode/templates/pullrequests/pullrequest_show.html:50
+#, fuzzy
+msgid "pull request was reviewed by all reviewers"
+msgstr "プルリクエストレビュアー"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:58
 msgid "Created on"
 msgstr "作成日"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:61
+#: rhodecode/templates/pullrequests/pullrequest_show.html:65
 msgid "Compare view"
 msgstr "比較ビュー"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
-msgid "Incoming changesets"
-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"
 msgstr "クローズ"
 
 #: rhodecode/templates/search/search.html:6
 #, python-format
 msgid "Search \"%s\" in repository: %s"
 msgstr "\"%s\" を %s リポジトリから検索"
 
 #: rhodecode/templates/search/search.html:8
 #, python-format
 msgid "Search \"%s\" in all repositories"
 msgstr "\"%s\" を全てのリポジトリから検索"
 
 #: rhodecode/templates/search/search.html:12
 #: rhodecode/templates/search/search.html:32
 #, python-format
 msgid "Search in repository: %s"
 msgstr "%s リポジトリから検索"
 
 #: rhodecode/templates/search/search.html:14
 #: rhodecode/templates/search/search.html:34
 msgid "Search in all repositories"
 msgstr "全てのリポジトリから検索"
 
 #: rhodecode/templates/search/search.html:48
 msgid "Search term"
 msgstr "検索キーワード"
 
 #: rhodecode/templates/search/search.html:60
 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 names"
 msgstr "ファイル名"
 
 #: rhodecode/templates/search/search_commit.html:35
 #: rhodecode/templates/search/search_content.html:21
 #: rhodecode/templates/search/search_path.html:15
 msgid "Permission denied"
 msgstr "権限がありません"
 
 #: rhodecode/templates/settings/repo_settings.html:5
 #, python-format
 msgid "%s Settings"
 msgstr "%s 設定"
 
 #: rhodecode/templates/shortlog/shortlog.html:5
 #, python-format
 msgid "%s Shortlog"
 msgstr "%s 短いログ"
 
 #: rhodecode/templates/shortlog/shortlog.html:14
 msgid "shortlog"
 msgstr "ログ"
 
+#: rhodecode/templates/shortlog/shortlog_data.html:5
+msgid "revision"
+msgstr "リビジョン"
+
 #: rhodecode/templates/shortlog/shortlog_data.html:7
 msgid "age"
 msgstr "経過時間"
 
-#: rhodecode/templates/shortlog/shortlog_data.html:18
+#: rhodecode/templates/shortlog/shortlog_data.html:8
+msgid "author"
+msgstr "作成者"
+
+#: rhodecode/templates/shortlog/shortlog_data.html:33
 msgid "No commit message"
 msgstr "コミットメッセージが有りません"
 
-#: rhodecode/templates/shortlog/shortlog_data.html:62
+#: rhodecode/templates/shortlog/shortlog_data.html:77
 msgid "Add or upload files directly via RhodeCode"
 msgstr "RhodeCode経由で直接ファイルを追加またはアップロード"
 
-#: rhodecode/templates/shortlog/shortlog_data.html:71
+#: rhodecode/templates/shortlog/shortlog_data.html:86
 msgid "Push new repo"
 msgstr "新しいリポジトリをプッシュ"
 
-#: rhodecode/templates/shortlog/shortlog_data.html:79
+#: rhodecode/templates/shortlog/shortlog_data.html:94
 msgid "Existing repository?"
 msgstr "存在するリポジトリをプッシュ"
 
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
 msgstr "%s 要約"
 
 #: rhodecode/templates/summary/summary.html:12
 msgid "summary"
 msgstr "要約"
 
 #: rhodecode/templates/summary/summary.html:20
 #, python-format
 msgid "repo %s ATOM feed"
 msgstr "リポジトリ %s ATOM フィード"
 
 #: rhodecode/templates/summary/summary.html:21
 #, python-format
 msgid "repo %s RSS feed"
 msgstr "リポジトリ %s RSS フィード"
 
 #: rhodecode/templates/summary/summary.html:49
 #: rhodecode/templates/summary/summary.html:52
 msgid "ATOM"
 msgstr "ATOM"
 
-#: rhodecode/templates/summary/summary.html:82
+#: rhodecode/templates/summary/summary.html:70
+#, fuzzy, python-format
+msgid "Repository locked by %s"
+msgstr "リポジトリはロックされていません"
+
+#: rhodecode/templates/summary/summary.html:72
+#, fuzzy
+msgid "Repository unlocked"
+msgstr "リポジトリはロックされていません"
+
+#: rhodecode/templates/summary/summary.html:91
 #, python-format
 msgid "Non changable ID %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:87
+#: rhodecode/templates/summary/summary.html:96
 msgid "public"
 msgstr "公開"
 
-#: rhodecode/templates/summary/summary.html:95
+#: rhodecode/templates/summary/summary.html:104
 msgid "remote clone"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:116
+#: rhodecode/templates/summary/summary.html:125
 msgid "Contact"
 msgstr "コンタクト"
 
-#: rhodecode/templates/summary/summary.html:130
+#: rhodecode/templates/summary/summary.html:139
 msgid "Clone url"
 msgstr "クローンURL"
 
-#: rhodecode/templates/summary/summary.html:133
+#: rhodecode/templates/summary/summary.html:142
 msgid "Show by Name"
 msgstr "名前で表示"
 
-#: rhodecode/templates/summary/summary.html:134
+#: rhodecode/templates/summary/summary.html:143
 msgid "Show by ID"
 msgstr "IDで表示"
 
-#: rhodecode/templates/summary/summary.html:142
+#: rhodecode/templates/summary/summary.html:151
 msgid "Trending files"
 msgstr "トレンドファイル"
 
-#: rhodecode/templates/summary/summary.html:150
-#: rhodecode/templates/summary/summary.html:166
-#: rhodecode/templates/summary/summary.html:194
+#: 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:158
+#: rhodecode/templates/summary/summary.html:167
 msgid "Download"
 msgstr "ダウンロード"
 
-#: rhodecode/templates/summary/summary.html:162
+#: rhodecode/templates/summary/summary.html:171
 msgid "There are no downloads yet"
 msgstr "まだダウンロードがありません"
 
-#: rhodecode/templates/summary/summary.html:164
+#: rhodecode/templates/summary/summary.html:173
 msgid "Downloads are disabled for this repository"
 msgstr "このリポジトリのダウンロードは無効化されています"
 
-#: rhodecode/templates/summary/summary.html:170
+#: rhodecode/templates/summary/summary.html:179
 msgid "Download as zip"
 msgstr "ZIPとしてダウンロード"
 
-#: rhodecode/templates/summary/summary.html:173
+#: rhodecode/templates/summary/summary.html:182
 msgid "Check this to download archive with subrepos"
 msgstr "チェックするとダウンロードアーカイブにサブリポジトリが含まれます"
 
-#: rhodecode/templates/summary/summary.html:173
+#: rhodecode/templates/summary/summary.html:182
 msgid "with subrepos"
 msgstr "サブリポジトリを含む"
 
-#: rhodecode/templates/summary/summary.html:186
+#: rhodecode/templates/summary/summary.html:195
 msgid "Commit activity by day / author"
 msgstr "コミットアクティビティ 日/作成者"
 
-#: rhodecode/templates/summary/summary.html:197
+#: rhodecode/templates/summary/summary.html:206
 msgid "Stats gathered: "
 msgstr "収集した統計情報: "
 
-#: rhodecode/templates/summary/summary.html:218
+#: rhodecode/templates/summary/summary.html:227
 msgid "Shortlog"
 msgstr "ログ"
 
-#: rhodecode/templates/summary/summary.html:220
+#: rhodecode/templates/summary/summary.html:229
 msgid "Quick start"
 msgstr "クイックスタート"
 
-#: rhodecode/templates/summary/summary.html:233
+#: rhodecode/templates/summary/summary.html:243
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:236
+#: rhodecode/templates/summary/summary.html:246
 msgid "Permalink to this readme"
 msgstr "パーマリンク"
 
-#: rhodecode/templates/summary/summary.html:293
+#: rhodecode/templates/summary/summary.html:304
 #, python-format
 msgid "Download %s as %s"
 msgstr "%s を %sとしてダウンロード"
 
-#: rhodecode/templates/summary/summary.html:650
+#: rhodecode/templates/summary/summary.html:661
 msgid "commits"
 msgstr "コミット"
 
-#: rhodecode/templates/summary/summary.html:651
+#: rhodecode/templates/summary/summary.html:662
 msgid "files added"
 msgstr "追加されたファイル"
 
-#: rhodecode/templates/summary/summary.html:652
+#: rhodecode/templates/summary/summary.html:663
 msgid "files changed"
 msgstr "変更されたファイル"
 
-#: rhodecode/templates/summary/summary.html:653
+#: rhodecode/templates/summary/summary.html:664
 msgid "files removed"
 msgstr "削除されたファイル"
 
-#: rhodecode/templates/summary/summary.html:656
+#: rhodecode/templates/summary/summary.html:667
 msgid "commit"
 msgstr "コミット"
 
-#: rhodecode/templates/summary/summary.html:657
+#: rhodecode/templates/summary/summary.html:668
 msgid "file added"
 msgstr "追加されたファイル"
 
-#: rhodecode/templates/summary/summary.html:658
+#: rhodecode/templates/summary/summary.html:669
 msgid "file changed"
 msgstr "変更されたファイル"
 
-#: rhodecode/templates/summary/summary.html:659
+#: rhodecode/templates/summary/summary.html:670
 msgid "file removed"
 msgstr "削除されたファイル"
 
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr "%s タグ"
 
+#: rhodecode/templates/tags/tags.html:29
+#, fuzzy
+msgid "Compare tags"
+msgstr "比較"
+