Updated i18n

rhodecode/i18n/en/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: rhodecode 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-06-03 01:06+0200\n"
+"POT-Creation-Date: 2012-07-02 11:58+0200\n"
 "PO-Revision-Date: 2011-02-25 19:13+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <[e-mail]>\n"
@@ -17,25 +17,25 b' msgstr ""'
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: rhodecode/controllers/changelog.py:95
+#: rhodecode/controllers/changelog.py:94
 msgid "All Branches"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:80
+#: rhodecode/controllers/changeset.py:81
 msgid "show white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:87 rhodecode/controllers/changeset.py:94
+#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95
 msgid "ignore white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:154
+#: rhodecode/controllers/changeset.py:155
 #, python-format
 msgid "%s line context"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:324
-#: rhodecode/controllers/changeset.py:339 rhodecode/lib/diffs.py:62
+#: rhodecode/controllers/changeset.py:331
+#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69
 msgid "binary file"
 msgstr ""
 
@@ -65,16 +65,20 b' msgid ""'
 "fulfilling the request."
 msgstr ""
 
-#: rhodecode/controllers/feed.py:48
+#: rhodecode/controllers/feed.py:49
 #, python-format
 msgid "Changes on %s repository"
 msgstr ""
 
-#: rhodecode/controllers/feed.py:49
+#: rhodecode/controllers/feed.py:50
 #, python-format
 msgid "%s %s feed"
 msgstr ""
 
+#: rhodecode/controllers/feed.py:75
+msgid "commited on"
+msgstr ""
+
 #: rhodecode/controllers/files.py:86
 #: rhodecode/templates/admin/repos/repo_add.html:13
 msgid "add new"
@@ -85,72 +89,71 b' msgstr ""'
 msgid "There are no files yet %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:247
+#: rhodecode/controllers/files.py:256
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:252
+#: rhodecode/controllers/files.py:261
 msgid "No changes"
 msgstr ""
 
-#: rhodecode/controllers/files.py:263 rhodecode/controllers/files.py:316
+#: rhodecode/controllers/files.py:272 rhodecode/controllers/files.py:326
 #, python-format
 msgid "Successfully committed to %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:268 rhodecode/controllers/files.py:322
+#: rhodecode/controllers/files.py:277 rhodecode/controllers/files.py:332
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/controllers/files.py:288
+#: rhodecode/controllers/files.py:298
 #, python-format
 msgid "Added %s via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:302
+#: rhodecode/controllers/files.py:312
 msgid "No content"
 msgstr ""
 
-#: rhodecode/controllers/files.py:306
+#: rhodecode/controllers/files.py:316
 msgid "No filename"
 msgstr ""
 
-#: rhodecode/controllers/files.py:347
-msgid "downloads disabled"
-msgstr ""
-
 #: rhodecode/controllers/files.py:358
+msgid "downloads disabled"
+msgstr ""
+
+#: rhodecode/controllers/files.py:369
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:360
+#: rhodecode/controllers/files.py:371
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/controllers/files.py:362
+#: rhodecode/controllers/files.py:373
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/controllers/files.py:461
-#: rhodecode/templates/changeset/changeset_range.html:5
+#: rhodecode/controllers/files.py:474
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:230
-#: rhodecode/templates/branches/branches.html:5
+#: rhodecode/controllers/files.py:475 rhodecode/controllers/pullrequests.py:65
+#: rhodecode/controllers/summary.py:230 rhodecode/model/scm.py:497
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:231
-#: rhodecode/templates/tags/tags.html:5
+#: rhodecode/controllers/files.py:476 rhodecode/controllers/pullrequests.py:69
+#: rhodecode/controllers/summary.py:231 rhodecode/model/scm.py:508
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:69 rhodecode/controllers/admin/repos.py:86
+#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:88
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -158,7 +161,7 b' msgid ""'
 "repositories"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:128 rhodecode/controllers/settings.py:69
+#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -166,27 +169,23 b' msgid ""'
 "repositories"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:163
+#: rhodecode/controllers/forks.py:166
 #, python-format
 msgid "forked %s repository as %s"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:177
+#: rhodecode/controllers/forks.py:180
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:53
-#, python-format
-msgid "%s public journal %s feed"
-msgstr ""
-
-#: rhodecode/controllers/journal.py:190 rhodecode/controllers/journal.py:223
-#: rhodecode/templates/admin/repos/repo_edit.html:177
-#: rhodecode/templates/base/base.html:307
-#: rhodecode/templates/base/base.html:309
-#: rhodecode/templates/base/base.html:311
-msgid "Public journal"
+#: 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:217
+msgid "journal"
 msgstr ""
 
 #: rhodecode/controllers/login.py:116
@@ -203,6 +202,23 b' msgid ""'
 "email"
 msgstr ""
 
+#: rhodecode/controllers/pullrequests.py:67 rhodecode/model/scm.py:503
+msgid "Bookmarks"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:117
+#, python-format
+msgid "%s (owner)"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:142
+msgid "Successfully opened new pull request"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:145
+msgid "Error occurred during sending pull request"
+msgstr ""
+
 #: rhodecode/controllers/search.py:114
 msgid "Invalid search query. Try quoting it."
 msgstr ""
@@ -215,20 +231,20 b' msgstr ""'
 msgid "An error occurred during this search operation"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:103
-#: rhodecode/controllers/admin/repos.py:213
+#: rhodecode/controllers/settings.py:107
+#: rhodecode/controllers/admin/repos.py:221
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:121
-#: rhodecode/controllers/admin/repos.py:231
+#: rhodecode/controllers/settings.py:125
+#: rhodecode/controllers/admin/repos.py:239
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:139
-#: rhodecode/controllers/admin/repos.py:249
+#: rhodecode/controllers/settings.py:143
+#: rhodecode/controllers/admin/repos.py:257
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from "
@@ -236,15 +252,15 b' msgid ""'
 "repositories"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:151
-#: rhodecode/controllers/admin/repos.py:261
+#: rhodecode/controllers/settings.py:155
+#: rhodecode/controllers/admin/repos.py:269
 #, python-format
 msgid "deleted repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:155
-#: rhodecode/controllers/admin/repos.py:271
-#: rhodecode/controllers/admin/repos.py:277
+#: rhodecode/controllers/settings.py:159
+#: rhodecode/controllers/admin/repos.py:279
+#: rhodecode/controllers/admin/repos.py:285
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
@@ -254,7 +270,7 b' msgid "No data loaded yet"'
 msgstr ""
 
 #: rhodecode/controllers/summary.py:142
-#: rhodecode/templates/summary/summary.html:139
+#: rhodecode/templates/summary/summary.html:144
 msgid "Statistics are disabled for this repository"
 msgstr ""
 
@@ -345,9 +361,9 b' msgstr ""'
 #: 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:326
-#: rhodecode/templates/base/base.html:328
-#: rhodecode/templates/base/base.html:330
+#: rhodecode/templates/base/base.html:334
+#: rhodecode/templates/base/base.html:336
+#: rhodecode/templates/base/base.html:338
 msgid "Admin"
 msgstr ""
 
@@ -379,76 +395,76 b' msgstr ""'
 msgid "error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:116
+#: rhodecode/controllers/admin/repos.py:121
 msgid "--REMOVE FORK--"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:144
+#: rhodecode/controllers/admin/repos.py:151
 #, python-format
 msgid "created repository %s from %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:148
+#: rhodecode/controllers/admin/repos.py:155
 #, python-format
 msgid "created repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:179
+#: rhodecode/controllers/admin/repos.py:186
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:266
+#: rhodecode/controllers/admin/repos.py:274
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:295
+#: rhodecode/controllers/admin/repos.py:303
 msgid "An error occurred during deletion of repository user"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:314
+#: rhodecode/controllers/admin/repos.py:322
 msgid "An error occurred during deletion of repository users groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/admin/repos.py:339
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:347
+#: rhodecode/controllers/admin/repos.py:355
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:367
+#: rhodecode/controllers/admin/repos.py:375
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:371
+#: rhodecode/controllers/admin/repos.py:379
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:376 rhodecode/model/forms.py:54
+#: rhodecode/controllers/admin/repos.py:384 rhodecode/model/validators.py:269
 msgid "Token mismatch"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:389
+#: rhodecode/controllers/admin/repos.py:397
 msgid "Pulled from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:391
+#: rhodecode/controllers/admin/repos.py:399
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:407
+#: rhodecode/controllers/admin/repos.py:415
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:409
+#: rhodecode/controllers/admin/repos.py:417
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:413
+#: rhodecode/controllers/admin/repos.py:421
 msgid "An error occurred during this operation"
 msgstr ""
 
@@ -514,80 +530,93 b' msgid "Updated application settings"'
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:159
-#: rhodecode/controllers/admin/settings.py:226
+#: rhodecode/controllers/admin/settings.py:227
 msgid "error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:221
+#: rhodecode/controllers/admin/settings.py:222
 msgid "Updated mercurial settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:246
+#: rhodecode/controllers/admin/settings.py:247
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:258
+#: rhodecode/controllers/admin/settings.py:259
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:262
+#: rhodecode/controllers/admin/settings.py:263
 msgid "error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:281
+#: rhodecode/controllers/admin/settings.py:282
 msgid "Email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:336
+#: rhodecode/controllers/admin/settings.py:337
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:367
+#: rhodecode/controllers/admin/settings.py:368
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:387
-#: rhodecode/controllers/admin/users.py:138
+#: rhodecode/controllers/admin/settings.py:388
+#: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:83
+#: rhodecode/controllers/admin/users.py:84
 #, python-format
 msgid "created user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:95
+#: rhodecode/controllers/admin/users.py:96
 #, python-format
 msgid "error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:124
+#: rhodecode/controllers/admin/users.py:125
 msgid "User updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:155
+#: rhodecode/controllers/admin/users.py:159
 msgid "successfully deleted user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:160
+#: rhodecode/controllers/admin/users.py:164
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:175
+#: rhodecode/controllers/admin/users.py:178
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:205
+#: rhodecode/controllers/admin/users.py:210
 #: rhodecode/controllers/admin/users_groups.py:219
 msgid "Granted 'repository create' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:214
+#: rhodecode/controllers/admin/users.py:219
 #: rhodecode/controllers/admin/users_groups.py:229
 msgid "Revoked 'repository create' permission to user"
 msgstr ""
 
+#: rhodecode/controllers/admin/users.py:235
+#, python-format
+msgid "Added email %s to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:241
+msgid "An error occurred during email saving"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:251
+msgid "Removed email from user"
+msgstr ""
+
 #: rhodecode/controllers/admin/users_groups.py:84
 #, python-format
 msgid "created users group %s"
@@ -624,126 +653,135 b' msgstr ""'
 msgid "You need to be a signed in to view this page"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:78
+#: rhodecode/lib/diffs.py:85
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:88
+#: rhodecode/lib/diffs.py:95
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:415
+#: rhodecode/lib/helpers.py:369
+#, python-format
+msgid "%a, %d %b %Y %H:%M:%S"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:442
 msgid "True"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:419
+#: rhodecode/lib/helpers.py:446
 msgid "False"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:463
+#: rhodecode/lib/helpers.py:490
 msgid "Changeset not found"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:486
-#, python-format
-msgid "Show all combined changesets %s->%s"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:492
-msgid "compare view"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:512
-msgid "and"
-msgstr ""
-
 #: rhodecode/lib/helpers.py:513
 #, python-format
+msgid "Show all combined changesets %s->%s"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:519
+msgid "compare view"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:539
+msgid "and"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:540
+#, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:514 rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46
 msgid "revisions"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:537
+#: rhodecode/lib/helpers.py:564
 msgid "fork name "
 msgstr ""
 
-#: rhodecode/lib/helpers.py:550
+#: rhodecode/lib/helpers.py:577
 msgid "[deleted] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:552 rhodecode/lib/helpers.py:562
+#: rhodecode/lib/helpers.py:579 rhodecode/lib/helpers.py:589
 msgid "[created] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:554
+#: rhodecode/lib/helpers.py:581
 msgid "[created] repository as fork"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:556 rhodecode/lib/helpers.py:564
+#: rhodecode/lib/helpers.py:583 rhodecode/lib/helpers.py:591
 msgid "[forked] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:558 rhodecode/lib/helpers.py:566
+#: rhodecode/lib/helpers.py:585 rhodecode/lib/helpers.py:593
 msgid "[updated] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:560
+#: rhodecode/lib/helpers.py:587
 msgid "[delete] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:568
+#: rhodecode/lib/helpers.py:595
 msgid "[created] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:570
+#: rhodecode/lib/helpers.py:597
 msgid "[updated] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:572
+#: rhodecode/lib/helpers.py:599
 msgid "[created] users group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:574
+#: rhodecode/lib/helpers.py:601
 msgid "[updated] users group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:576
+#: rhodecode/lib/helpers.py:603
 msgid "[commented] on revision in repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:578
+#: rhodecode/lib/helpers.py:605
+msgid "[commented] on pull request"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:607
 msgid "[pushed] into"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:580
+#: rhodecode/lib/helpers.py:609
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:582
+#: rhodecode/lib/helpers.py:611
 msgid "[pulled from remote] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:584
+#: rhodecode/lib/helpers.py:613
 msgid "[pulled] from"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:586
+#: rhodecode/lib/helpers.py:615
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:588
+#: rhodecode/lib/helpers.py:617
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:752
+#: rhodecode/lib/helpers.py:781
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:756
+#: rhodecode/lib/helpers.py:785
 msgid "No Files"
 msgstr ""
 
@@ -807,194 +845,292 b' msgstr ""'
 msgid "password reset link"
 msgstr ""
 
-#: rhodecode/model/comment.py:85
+#: rhodecode/model/comment.py:109
 #, python-format
 msgid "on line %s"
 msgstr ""
 
-#: rhodecode/model/comment.py:113
+#: rhodecode/model/comment.py:146
 msgid "[Mention]"
 msgstr ""
 
-#: rhodecode/model/forms.py:72
-msgid "Invalid username"
-msgstr ""
-
-#: rhodecode/model/forms.py:80
-msgid "This username already exists"
-msgstr ""
-
-#: rhodecode/model/forms.py:85
-msgid ""
-"Username may only contain alphanumeric characters underscores, periods or"
-" dashes and must begin with alphanumeric character"
-msgstr ""
-
-#: rhodecode/model/forms.py:101
-msgid "Invalid group name"
-msgstr ""
-
-#: rhodecode/model/forms.py:111
-msgid "This users group already exists"
-msgstr ""
-
-#: rhodecode/model/forms.py:117
-msgid ""
-"RepoGroup name may only contain  alphanumeric characters underscores, "
-"periods or dashes and must begin with alphanumeric character"
-msgstr ""
-
-#: rhodecode/model/forms.py:145
-msgid "Cannot assign this group as parent"
-msgstr ""
-
-#: rhodecode/model/forms.py:164
-msgid "This group already exists"
-msgstr ""
-
-#: rhodecode/model/forms.py:176
-msgid "Repository with this name already exists"
-msgstr ""
-
-#: rhodecode/model/forms.py:195 rhodecode/model/forms.py:204
-#: rhodecode/model/forms.py:213
-msgid "Invalid characters in password"
-msgstr ""
-
-#: rhodecode/model/forms.py:226
-msgid "Passwords do not match"
-msgstr ""
-
-#: rhodecode/model/forms.py:232
-msgid "invalid password"
-msgstr ""
-
-#: rhodecode/model/forms.py:233
-msgid "invalid user name"
-msgstr ""
-
-#: rhodecode/model/forms.py:234
-msgid "Your account is disabled"
-msgstr ""
-
-#: rhodecode/model/forms.py:274
-msgid "This username is not valid"
-msgstr ""
-
-#: rhodecode/model/forms.py:287
-msgid "This repository name is disallowed"
-msgstr ""
-
-#: rhodecode/model/forms.py:310
-#, python-format
-msgid "This repository already exists in a group \"%s\""
-msgstr ""
-
-#: rhodecode/model/forms.py:317
-#, python-format
-msgid "There is a group with this name already \"%s\""
-msgstr ""
-
-#: rhodecode/model/forms.py:324
-msgid "This repository already exists"
-msgstr ""
-
-#: rhodecode/model/forms.py:367
-msgid "invalid clone url"
-msgstr ""
-
-#: rhodecode/model/forms.py:384
-msgid "Invalid clone url, provide a valid clone http\\s url"
-msgstr ""
-
-#: rhodecode/model/forms.py:398
-msgid "Fork have to be the same type as original"
-msgstr ""
-
-#: rhodecode/model/forms.py:414
-msgid "This username or users group name is not valid"
-msgstr ""
-
-#: rhodecode/model/forms.py:480
-msgid "This is not a valid path"
-msgstr ""
-
-#: rhodecode/model/forms.py:494
-msgid "This e-mail address is already taken"
-msgstr ""
-
-#: rhodecode/model/forms.py:507
-msgid "This e-mail address doesn't exist."
-msgstr ""
-
-#: rhodecode/model/forms.py:530
-msgid ""
-"The LDAP Login attribute of the CN must be specified - this is the name "
-"of the attribute that is equivalent to 'username'"
-msgstr ""
-
-#: rhodecode/model/forms.py:549
+#: rhodecode/model/db.py:1062
+msgid "Repository no access"
+msgstr ""
+
+#: rhodecode/model/db.py:1063
+msgid "Repository read access"
+msgstr ""
+
+#: rhodecode/model/db.py:1064
+msgid "Repository write access"
+msgstr ""
+
+#: rhodecode/model/db.py:1065
+msgid "Repository admin access"
+msgstr ""
+
+#: rhodecode/model/db.py:1067
+msgid "Repositories Group no access"
+msgstr ""
+
+#: rhodecode/model/db.py:1068
+msgid "Repositories Group read access"
+msgstr ""
+
+#: rhodecode/model/db.py:1069
+msgid "Repositories Group write access"
+msgstr ""
+
+#: rhodecode/model/db.py:1070
+msgid "Repositories Group admin access"
+msgstr ""
+
+#: rhodecode/model/db.py:1072
+msgid "RhodeCode Administrator"
+msgstr ""
+
+#: rhodecode/model/db.py:1073
+msgid "Repository creation disabled"
+msgstr ""
+
+#: rhodecode/model/db.py:1074
+msgid "Repository creation enabled"
+msgstr ""
+
+#: rhodecode/model/db.py:1075
+msgid "Register disabled"
+msgstr ""
+
+#: rhodecode/model/db.py:1076
+msgid "Register new user with RhodeCode with manual activation"
+msgstr ""
+
+#: rhodecode/model/db.py:1079
+msgid "Register new user with RhodeCode with auto activation"
+msgstr ""
+
+#: rhodecode/model/db.py:1479
+msgid "Not Reviewed"
+msgstr ""
+
+#: rhodecode/model/db.py:1480
+msgid "Approved"
+msgstr ""
+
+#: rhodecode/model/db.py:1481
+msgid "Rejected"
+msgstr ""
+
+#: rhodecode/model/db.py:1482
+msgid "Under Review"
+msgstr ""
+
+#: rhodecode/model/forms.py:43
 msgid "Please enter a login"
 msgstr ""
 
-#: rhodecode/model/forms.py:550
+#: rhodecode/model/forms.py:44
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
-#: rhodecode/model/forms.py:558
+#: rhodecode/model/forms.py:52
 msgid "Please enter a password"
 msgstr ""
 
-#: rhodecode/model/forms.py:559
+#: rhodecode/model/forms.py:53
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
-#: rhodecode/model/notification.py:175
+#: rhodecode/model/notification.py:203
 msgid "commented on commit"
 msgstr ""
 
-#: rhodecode/model/notification.py:176
+#: rhodecode/model/notification.py:204
 msgid "sent message"
 msgstr ""
 
-#: rhodecode/model/notification.py:177
+#: rhodecode/model/notification.py:205
 msgid "mentioned you"
 msgstr ""
 
-#: rhodecode/model/notification.py:178
+#: rhodecode/model/notification.py:206
 msgid "registered in RhodeCode"
 msgstr ""
 
-#: rhodecode/model/user.py:235
+#: rhodecode/model/notification.py:207
+msgid "opened new pull request"
+msgstr ""
+
+#: rhodecode/model/notification.py:208
+msgid "commented on pull request"
+msgstr ""
+
+#: rhodecode/model/pull_request.py:75
+#, python-format
+msgid "%(user)s wants you to review pull request #%(pr_id)s"
+msgstr ""
+
+#: rhodecode/model/scm.py:489
+msgid "latest tip"
+msgstr ""
+
+#: rhodecode/model/user.py:238
 msgid "new user registration"
 msgstr ""
 
-#: rhodecode/model/user.py:259 rhodecode/model/user.py:279
+#: rhodecode/model/user.py:263 rhodecode/model/user.py:284
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:300
-msgid "You can't remove this user since it's crucial for entire application"
-msgstr ""
-
 #: rhodecode/model/user.py:306
+msgid "You can't remove this user since it's crucial for entire application"
+msgstr ""
+
+#: rhodecode/model/user.py:312
 #, 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:52
+#, python-format
+msgid "Username \"%(username)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:54
+#, python-format
+msgid "Username \"%(username)s\" is forbidden"
+msgstr ""
+
+#: rhodecode/model/validators.py:56
+msgid ""
+"Username may only contain alphanumeric characters underscores, periods or"
+" dashes and must begin with alphanumeric character"
+msgstr ""
+
+#: rhodecode/model/validators.py:84
+#, python-format
+msgid "Username %(username)s is not valid"
+msgstr ""
+
+#: rhodecode/model/validators.py:103
+msgid "Invalid users group name"
+msgstr ""
+
+#: rhodecode/model/validators.py:104
+#, python-format
+msgid "Users group \"%(usersgroup)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:106
+msgid ""
+"users group name may only contain  alphanumeric characters underscores, "
+"periods or dashes and must begin with alphanumeric character"
+msgstr ""
+
+#: rhodecode/model/validators.py:144
+msgid "Cannot assign this group as parent"
+msgstr ""
+
+#: rhodecode/model/validators.py:145
+#, python-format
+msgid "Group \"%(group_name)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:147
+#, python-format
+msgid "Repository with name \"%(group_name)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:205
+msgid "Invalid characters (non-ascii) in password"
+msgstr ""
+
+#: rhodecode/model/validators.py:220
+msgid "Passwords do not match"
+msgstr ""
+
+#: rhodecode/model/validators.py:237
+msgid "invalid password"
+msgstr ""
+
+#: rhodecode/model/validators.py:238
+msgid "invalid user name"
+msgstr ""
+
+#: rhodecode/model/validators.py:239
+msgid "Your account is disabled"
+msgstr ""
+
+#: rhodecode/model/validators.py:283
+#, python-format
+msgid "Repository name %(repo)s is disallowed"
+msgstr ""
+
+#: rhodecode/model/validators.py:285
+#, python-format
+msgid "Repository named %(repo)s already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:286
+#, python-format
+msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
+msgstr ""
+
+#: rhodecode/model/validators.py:288
+#, python-format
+msgid "Repositories group with name \"%(repo)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:386
+msgid "invalid clone url"
+msgstr ""
+
+#: rhodecode/model/validators.py:387
+msgid "Invalid clone url, provide a valid clone http\\s url"
+msgstr ""
+
+#: rhodecode/model/validators.py:418
+msgid "Fork have to be the same type as parent"
+msgstr ""
+
+#: rhodecode/model/validators.py:439
+msgid "This username or users group name is not valid"
+msgstr ""
+
+#: rhodecode/model/validators.py:509
+msgid "This is not a valid path"
+msgstr ""
+
+#: rhodecode/model/validators.py:524
+msgid "This e-mail address is already taken"
+msgstr ""
+
+#: rhodecode/model/validators.py:544
+#, python-format
+msgid "e-mail \"%(email)s\" does not exist."
+msgstr ""
+
+#: rhodecode/model/validators.py:581
+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/templates/index.html:3
 msgid "Dashboard"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:6
+#: rhodecode/templates/repo_switcher_list.html:4
 #: rhodecode/templates/admin/users/user_edit_my_account.html:31
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 #: rhodecode/templates/branches/branches.html:9
-#: rhodecode/templates/journal/journal.html:31
+#: rhodecode/templates/journal/journal.html:40
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
 msgstr ""
@@ -1022,16 +1158,16 b' msgstr ""'
 #: rhodecode/templates/index_base.html:67
 #: rhodecode/templates/index_base.html:132
 #: rhodecode/templates/index_base.html:158
-#: rhodecode/templates/admin/repos/repo_add_base.html:47
-#: rhodecode/templates/admin/repos/repo_edit.html:66
+#: rhodecode/templates/admin/repos/repo_add_base.html:56
+#: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:37
 #: rhodecode/templates/admin/repos/repos.html:84
 #: 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:49
+#: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:57
-#: rhodecode/templates/summary/summary.html:100
+#: rhodecode/templates/summary/summary.html:105
 msgid "Description"
 msgstr ""
 
@@ -1046,20 +1182,21 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repo_edit.html:32
 #: rhodecode/templates/admin/repos/repos.html:36
 #: rhodecode/templates/admin/repos/repos.html:82
+#: rhodecode/templates/admin/users/user_edit.html:170
 #: rhodecode/templates/admin/users/user_edit_my_account.html:49
 #: rhodecode/templates/admin/users/user_edit_my_account.html:99
 #: rhodecode/templates/admin/users/user_edit_my_account.html:165
 #: rhodecode/templates/admin/users/user_edit_my_account.html:200
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:36
+#: rhodecode/templates/branches/branches.html:51
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:50
-#: rhodecode/templates/journal/journal.html:98
-#: rhodecode/templates/journal/journal.html:177
+#: rhodecode/templates/journal/journal.html:59
+#: rhodecode/templates/journal/journal.html:107
+#: rhodecode/templates/journal/journal.html:186
 #: rhodecode/templates/settings/repo_settings.html:31
-#: rhodecode/templates/summary/summary.html:38
-#: rhodecode/templates/summary/summary.html:114
+#: rhodecode/templates/summary/summary.html:43
+#: rhodecode/templates/summary/summary.html:119
 #: rhodecode/templates/tags/tags.html:36
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
@@ -1075,26 +1212,24 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:39
 #: rhodecode/templates/admin/repos/repos.html:87
 #: rhodecode/templates/admin/users/user_edit_my_account.html:167
-#: rhodecode/templates/journal/journal.html:179
+#: rhodecode/templates/journal/journal.html:188
 msgid "Tip"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:70
 #: rhodecode/templates/index_base.html:163
-#: rhodecode/templates/admin/repos/repo_edit.html:103
+#: rhodecode/templates/admin/repos/repo_edit.html:112
 #: rhodecode/templates/admin/repos/repos.html:89
 msgid "Owner"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/journal/public_journal.html:20
-#: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:46
+#: rhodecode/templates/summary/summary.html:48
+#: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:72
-#: rhodecode/templates/journal/public_journal.html:23
 msgid "Atom"
 msgstr ""
 
@@ -1119,8 +1254,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:112
 #: rhodecode/templates/admin/users/user_edit_my_account.html:186
 #: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:60
-#: rhodecode/templates/journal/journal.html:202
+#: rhodecode/templates/branches/branches.html:77
+#: rhodecode/templates/journal/journal.html:211
 #: rhodecode/templates/tags/tags.html:60
 msgid "Click to sort ascending"
 msgstr ""
@@ -1130,8 +1265,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:113
 #: rhodecode/templates/admin/users/user_edit_my_account.html:187
 #: rhodecode/templates/bookmarks/bookmarks.html:61
-#: rhodecode/templates/branches/branches.html:61
-#: rhodecode/templates/journal/journal.html:203
+#: rhodecode/templates/branches/branches.html:78
+#: rhodecode/templates/journal/journal.html:212
 #: rhodecode/templates/tags/tags.html:61
 msgid "Click to sort descending"
 msgstr ""
@@ -1145,8 +1280,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:114
 #: rhodecode/templates/admin/users/user_edit_my_account.html:188
 #: rhodecode/templates/bookmarks/bookmarks.html:62
-#: rhodecode/templates/branches/branches.html:62
-#: rhodecode/templates/journal/journal.html:204
+#: rhodecode/templates/branches/branches.html:79
+#: rhodecode/templates/journal/journal.html:213
 #: rhodecode/templates/tags/tags.html:62
 msgid "No records found."
 msgstr ""
@@ -1155,8 +1290,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:115
 #: rhodecode/templates/admin/users/user_edit_my_account.html:189
 #: rhodecode/templates/bookmarks/bookmarks.html:63
-#: rhodecode/templates/branches/branches.html:63
-#: rhodecode/templates/journal/journal.html:205
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:214
 #: rhodecode/templates/tags/tags.html:63
 msgid "Data error."
 msgstr ""
@@ -1165,8 +1300,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:116
 #: rhodecode/templates/admin/users/user_edit_my_account.html:190
 #: rhodecode/templates/bookmarks/bookmarks.html:64
-#: rhodecode/templates/branches/branches.html:64
-#: rhodecode/templates/journal/journal.html:206
+#: rhodecode/templates/branches/branches.html:81
+#: rhodecode/templates/journal/journal.html:215
 #: rhodecode/templates/tags/tags.html:64
 msgid "Loading..."
 msgstr ""
@@ -1185,7 +1320,7 b' msgstr ""'
 #: 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:113
+#: rhodecode/templates/summary/summary.html:118
 msgid "Username"
 msgstr ""
 
@@ -1258,7 +1393,7 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_add.html:77
 #: rhodecode/templates/admin/users/user_edit.html:104
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:115
+#: rhodecode/templates/summary/summary.html:120
 msgid "Email"
 msgstr ""
 
@@ -1271,8 +1406,8 b' msgid "Your account must wait for activa'
 msgstr ""
 
 #: rhodecode/templates/repo_switcher_list.html:11
-#: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:76
+#: rhodecode/templates/admin/repos/repo_add_base.html:65
+#: rhodecode/templates/admin/repos/repo_edit.html:85
 #: rhodecode/templates/settings/repo_settings.html:67
 msgid "Private repository"
 msgstr ""
@@ -1287,7 +1422,7 b' msgid "branches"'
 msgstr ""
 
 #: rhodecode/templates/switch_to_list.html:10
-#: rhodecode/templates/branches/branches_data.html:51
+#: rhodecode/templates/branches/branches_data.html:57
 msgid "There are no branches yet"
 msgstr ""
 
@@ -1322,8 +1457,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:90
 #: rhodecode/templates/admin/users/user_edit_my_account.html:51
 #: rhodecode/templates/admin/users/user_edit_my_account.html:52
-#: rhodecode/templates/journal/journal.html:52
-#: rhodecode/templates/journal/journal.html:53
+#: rhodecode/templates/journal/journal.html:61
+#: rhodecode/templates/journal/journal.html:62
 msgid "Action"
 msgstr ""
 
@@ -1334,7 +1469,7 b' 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:37
+#: rhodecode/templates/branches/branches.html:52
 #: rhodecode/templates/tags/tags.html:37
 #: rhodecode/templates/tags/tags_data.html:7
 msgid "Date"
@@ -1437,10 +1572,27 b' msgid "My Notifications"'
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:29
+msgid "All"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:30
+#, fuzzy, python-format
+#| msgid "%d comment"
+#| msgid_plural "%d comments"
+msgid "Comments"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:31
+#: rhodecode/templates/base/base.html:251
+#: rhodecode/templates/base/base.html:253
+msgid "Pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:35
 msgid "Mark all read"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/notifications_data.html:38
+#: rhodecode/templates/admin/notifications/notifications_data.html:34
 msgid "No notifications here yet"
 msgstr ""
 
@@ -1458,7 +1610,7 b' msgid "Permissions administration"'
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:116
+#: rhodecode/templates/admin/repos/repo_edit.html:125
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
 #: rhodecode/templates/admin/users/user_edit.html:139
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
@@ -1498,7 +1650,7 b' msgid "Repository creation"'
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:71
-#: rhodecode/templates/admin/repos/repo_edit.html:218
+#: rhodecode/templates/admin/repos/repo_edit.html:227
 msgid "set"
 msgstr ""
 
@@ -1515,8 +1667,8 b' msgid "Repositories"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:90
-#: rhodecode/templates/summary/summary.html:91
+#: rhodecode/templates/summary/summary.html:95
+#: rhodecode/templates/summary/summary.html:96
 msgid "Clone from"
 msgstr ""
 
@@ -1529,15 +1681,14 b' 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:41
+#: 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/admin/repos/repo_edit.html:53
-#: rhodecode/templates/settings/repo_settings.html:52
-msgid "Optional select a group to put this repository into."
+#: 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
@@ -1549,21 +1700,35 b' msgstr ""'
 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
+msgid "Landing revision"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_add_base.html:51
 #: rhodecode/templates/admin/repos/repo_edit.html:70
-#: rhodecode/templates/settings/repo_settings.html:61
-msgid "Keep it short and to the point. Use a README file for longer descriptions."
+#: rhodecode/templates/forks/fork.html:45
+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:80
+#: rhodecode/templates/admin/repos/repo_edit.html:79
+#: rhodecode/templates/forks/fork.html:63
+#: rhodecode/templates/settings/repo_settings.html:61
+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:71
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:64
+#: rhodecode/templates/admin/repos/repo_add_base.html:73
 msgid "add"
 msgstr ""
 
@@ -1579,8 +1744,8 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_edit.html:13
 #: rhodecode/templates/admin/users/user_edit_my_account.html:71
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/files/files_source.html:32
-#: rhodecode/templates/journal/journal.html:72
+#: rhodecode/templates/files/files_source.html:44
+#: rhodecode/templates/journal/journal.html:81
 msgid "edit"
 msgstr ""
 
@@ -1589,102 +1754,114 b' msgstr ""'
 msgid "Clone uri"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:85
-msgid "Enable statistics"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:89
-msgid "Enable statistics window on summary page."
+#: 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 downloads"
+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:108
+#: rhodecode/templates/admin/repos/repo_edit.html:117
 msgid "Change owner of this repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:134
+#: rhodecode/templates/admin/repos/repo_edit.html:143
 msgid "Administration"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:137
+#: rhodecode/templates/admin/repos/repo_edit.html:146
 msgid "Statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos/repo_edit.html:150
 msgid "Reset current statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos/repo_edit.html:150
 msgid "Confirm to remove current statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:144
-msgid "Fetched to rev"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:145
-msgid "Stats gathered"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:153
+msgid "Fetched to rev"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:154
+msgid "Stats gathered"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Remote"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:157
+#: rhodecode/templates/admin/repos/repo_edit.html:166
 msgid "Pull changes from remote location"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:157
+#: rhodecode/templates/admin/repos/repo_edit.html:166
 msgid "Confirm to pull changes from remote side"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:168
+#: rhodecode/templates/admin/repos/repo_edit.html:177
 msgid "Cache"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:172
+#: rhodecode/templates/admin/repos/repo_edit.html:181
 msgid "Invalidate repository cache"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:172
+#: rhodecode/templates/admin/repos/repo_edit.html:181
 msgid "Confirm to invalidate repository cache"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:183
+#: rhodecode/templates/admin/repos/repo_edit.html:186
+#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:319
+msgid "Public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:192
 msgid "Remove from public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:185
+#: rhodecode/templates/admin/repos/repo_edit.html:194
 msgid "Add to public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:190
+#: rhodecode/templates/admin/repos/repo_edit.html:199
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:197
-#: rhodecode/templates/changeset/changeset_file_comment.html:19
+#: rhodecode/templates/admin/repos/repo_edit.html:206
+#: rhodecode/templates/changeset/changeset_file_comment.html:26
 msgid "Delete"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:201
+#: rhodecode/templates/admin/repos/repo_edit.html:210
 msgid "Remove this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:201
+#: rhodecode/templates/admin/repos/repo_edit.html:210
 msgid "Confirm to delete this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:205
+#: rhodecode/templates/admin/repos/repo_edit.html:214
 msgid ""
 "This repository will be renamed in a special way in order to be "
 "unaccesible for RhodeCode and VCS systems.\n"
@@ -1692,12 +1869,12 b' msgid ""'
 "please do it manually"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:213
-msgid "Set as fork"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:222
-msgid "Manually set this repository as a fork of another"
+msgid "Set as fork of"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:231
+msgid "Manually set this repository as a fork of another from the list"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
@@ -1729,11 +1906,17 b' msgstr ""'
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
 #: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/journal/journal.html:123
-#: rhodecode/templates/summary/summary.html:71
+#: rhodecode/templates/journal/journal.html:132
+#: rhodecode/templates/summary/summary.html:76
 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
@@ -1761,12 +1944,13 b' msgid "Repositories administration"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:40
-#: rhodecode/templates/summary/summary.html:107
+#: rhodecode/templates/summary/summary.html:112
 msgid "Contact"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:68
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+#: rhodecode/templates/admin/users/user_edit.html:222
 #: rhodecode/templates/admin/users/users.html:55
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 msgid "delete"
@@ -1824,10 +2008,12 b' msgstr ""'
 #: rhodecode/templates/admin/settings/settings.html:177
 #: rhodecode/templates/admin/users/user_edit.html:130
 #: rhodecode/templates/admin/users/user_edit.html:155
+#: rhodecode/templates/admin/users/user_edit.html:245
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:116
 #: rhodecode/templates/files/files_add.html:82
 #: rhodecode/templates/files/files_edit.html:68
+#: rhodecode/templates/pullrequests/pullrequest.html:135
 #: rhodecode/templates/settings/repo_settings.html:85
 msgid "Reset"
 msgstr ""
@@ -1866,7 +2052,6 b' msgstr ""'
 
 #: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:9
-#: rhodecode/templates/settings/repo_settings.html:5
 #: rhodecode/templates/settings/repo_settings.html:13
 msgid "Settings"
 msgstr ""
@@ -2081,6 +2266,29 b' msgstr ""'
 msgid "Create repositories"
 msgstr ""
 
+#: rhodecode/templates/admin/users/user_edit.html:171
+#: rhodecode/templates/admin/users/user_edit_my_account.html:100
+#: rhodecode/templates/admin/users/user_edit_my_account.html:201
+msgid "Permission"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:210
+msgid "Email addresses"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:223
+#, python-format
+msgid "Confirm to delete this email: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:237
+msgid "New email address"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:244
+msgid "Add"
+msgstr ""
+
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
 #: rhodecode/templates/base/base.html:124
 msgid "My account"
@@ -2091,7 +2299,7 b' msgid "My Account"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:32
-#: rhodecode/templates/journal/journal.html:32
+#: rhodecode/templates/journal/journal.html:41
 msgid "My repos"
 msgstr ""
 
@@ -2100,40 +2308,35 b' msgid "My permissions"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:37
-#: rhodecode/templates/journal/journal.html:37
+#: rhodecode/templates/journal/journal.html:46
 msgid "ADD"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:50
 #: rhodecode/templates/bookmarks/bookmarks.html:40
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:40
-#: rhodecode/templates/journal/journal.html:51
+#: rhodecode/templates/branches/branches.html:55
+#: rhodecode/templates/journal/journal.html:60
 #: rhodecode/templates/tags/tags.html:40
 #: rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:71
-#: rhodecode/templates/journal/journal.html:72
+#: rhodecode/templates/journal/journal.html:81
 msgid "private"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:81
-#: rhodecode/templates/journal/journal.html:85
+#: rhodecode/templates/journal/journal.html:94
 msgid "No repositories yet"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:83
-#: rhodecode/templates/journal/journal.html:87
+#: rhodecode/templates/journal/journal.html:96
 msgid "create one now"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:100
-#: rhodecode/templates/admin/users/user_edit_my_account.html:201
-msgid "Permission"
-msgstr ""
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr ""
@@ -2204,6 +2407,7 b' msgid "Choosen group members"'
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:61
+#: rhodecode/templates/pullrequests/pullrequest.html:81
 msgid "Remove all elements"
 msgstr ""
 
@@ -2212,6 +2416,7 b' msgid "Available members"'
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:79
+#: rhodecode/templates/pullrequests/pullrequest.html:99
 msgid "Add all elements"
 msgstr ""
 
@@ -2262,18 +2467,37 b' msgid "Inbox"'
 msgstr ""
 
 #: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:289
-#: rhodecode/templates/base/base.html:291
-#: rhodecode/templates/base/base.html:293
+#: rhodecode/templates/base/base.html:297
+#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:301
+#: 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:298
-#: rhodecode/templates/base/base.html:300
-#: rhodecode/templates/base/base.html:302
+#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:308
+#: rhodecode/templates/base/base.html:310
 #: rhodecode/templates/journal/journal.html:4
-#: rhodecode/templates/journal/journal.html:17
+#: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr ""
@@ -2301,14 +2525,12 b' msgstr ""'
 #: rhodecode/templates/data_table/_dt_elements.html:9
 #: rhodecode/templates/data_table/_dt_elements.html:11
 #: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/summary/summary.html:4
 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:6
 #: rhodecode/templates/changelog/changelog.html:15
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
@@ -2328,7 +2550,6 b' msgstr ""'
 #: rhodecode/templates/data_table/_dt_elements.html:25
 #: rhodecode/templates/data_table/_dt_elements.html:27
 #: rhodecode/templates/data_table/_dt_elements.html:29
-#: rhodecode/templates/files/files.html:4
 #: rhodecode/templates/files/files.html:40
 msgid "Files"
 msgstr ""
@@ -2354,10 +2575,6 b' msgstr ""'
 msgid "search"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:217
-msgid "journal"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:219
 msgid "repositories groups"
 msgstr ""
@@ -2376,22 +2593,18 b' msgstr ""'
 
 #: rhodecode/templates/base/base.html:235
 #: rhodecode/templates/base/base.html:237
-#: rhodecode/templates/followers/followers.html:5
 msgid "Followers"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:243
 #: rhodecode/templates/base/base.html:245
-#: rhodecode/templates/forks/forks.html:5
 msgid "Forks"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:316
-#: rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:320
-#: rhodecode/templates/search/search.html:4
-#: rhodecode/templates/search/search.html:24
-#: rhodecode/templates/search/search.html:46
+#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:328
+#: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr ""
 
@@ -2400,13 +2613,13 b' msgid "add another comment"'
 msgstr ""
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:111
-#: rhodecode/templates/summary/summary.html:52
+#: rhodecode/templates/journal/journal.html:120
+#: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:44
-#: rhodecode/templates/summary/summary.html:56
+#: rhodecode/templates/summary/summary.html:61
 msgid "Start following this repository"
 msgstr ""
 
@@ -2414,18 +2627,42 b' msgstr ""'
 msgid "Group"
 msgstr ""
 
+#: rhodecode/templates/base/root.html:47
+msgid "search truncated"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:48
+msgid "no matching files"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
-msgid "Bookmarks"
+#, python-format
+msgid "%s Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.html:39
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:39
+#: rhodecode/templates/branches/branches.html:54
 #: rhodecode/templates/tags/tags.html:39
 #: 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/compare/compare_diff.html:5
+#: rhodecode/templates/compare/compare_diff.html:13
+msgid "Compare"
+msgstr ""
+
 #: rhodecode/templates/branches/branches_data.html:7
 msgid "date"
 msgstr ""
@@ -2440,6 +2677,15 b' msgstr ""'
 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"
@@ -2447,36 +2693,60 b' msgid_plural "showing %d out of %d revis'
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changelog/changelog.html:38
+#: rhodecode/templates/changelog/changelog.html:37
+#, python-format
+msgid "compare fork with %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:37
+msgid "Compare fork"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:39
+msgid "Open new pull request"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:44
 msgid "Show"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:64
-#: rhodecode/templates/summary/summary.html:352
+#: rhodecode/templates/changelog/changelog.html:70
+#: rhodecode/templates/summary/summary.html:357
 msgid "show more"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:68
+#: rhodecode/templates/changelog/changelog.html:74
 msgid "Affected number of files, click to show more details"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:82
-#: rhodecode/templates/changeset/changeset.html:72
+#: rhodecode/templates/changelog/changelog.html:87
+#: rhodecode/templates/changeset/changeset.html:38
+#: rhodecode/templates/changeset/changeset_file_comment.html:20
+#: rhodecode/templates/changeset/changeset_range.html:46
+msgid "Changeset status"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:90
+msgid "Click to open associated pull request"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:100
+#: rhodecode/templates/changeset/changeset.html:78
 msgid "Parent"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:88
-#: rhodecode/templates/changeset/changeset.html:78
+#: rhodecode/templates/changelog/changelog.html:106
+#: rhodecode/templates/changeset/changeset.html:84
 msgid "No parents"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:93
-#: rhodecode/templates/changeset/changeset.html:82
+#: rhodecode/templates/changelog/changelog.html:111
+#: rhodecode/templates/changeset/changeset.html:88
 msgid "merge"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:96
-#: rhodecode/templates/changeset/changeset.html:85
+#: rhodecode/templates/changelog/changelog.html:114
+#: rhodecode/templates/changeset/changeset.html:91
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_add.html:33
 #: rhodecode/templates/files/files_edit.html:33
@@ -2484,134 +2754,154 b' msgstr ""'
 msgid "branch"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:102
+#: rhodecode/templates/changelog/changelog.html:120
 msgid "bookmark"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:108
-#: rhodecode/templates/changeset/changeset.html:90
+#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changeset/changeset.html:96
 msgid "tag"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:144
+#: rhodecode/templates/changelog/changelog.html:162
 msgid "Show selected changes __S -> __E"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:235
+#: rhodecode/templates/changelog/changelog.html:253
 msgid "There are no changes yet"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_details.html:2
-#: rhodecode/templates/changeset/changeset.html:60
-msgid "removed"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_details.html:3
-#: rhodecode/templates/changeset/changeset.html:61
-msgid "changed"
-msgstr ""
-
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:62
-msgid "added"
+#: rhodecode/templates/changeset/changeset.html:66
+msgid "removed"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:5
+#: rhodecode/templates/changeset/changeset.html:67
+msgid "changed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changelog/changelog_details.html:7
+#: rhodecode/templates/changeset/changeset.html:68
+msgid "added"
+msgstr ""
+
 #: rhodecode/templates/changelog/changelog_details.html:8
-#: rhodecode/templates/changeset/changeset.html:64
-#: rhodecode/templates/changeset/changeset.html:65
-#: rhodecode/templates/changeset/changeset.html:66
+#: 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
 #, 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:37
+#: rhodecode/templates/changeset/changeset.html:43
 #: rhodecode/templates/changeset/diff_block.html:20
 msgid "raw diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:38
+#: rhodecode/templates/changeset/changeset.html:44
 #: rhodecode/templates/changeset/diff_block.html:21
 msgid "download diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:42
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+#: rhodecode/templates/changeset/changeset.html:48
+#: 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:42
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+#: rhodecode/templates/changeset/changeset.html:48
+#: 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:97
+#: rhodecode/templates/changeset/changeset.html:103
 #, python-format
 msgid "%s files affected with %s insertions and %s deletions:"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:113
+#: rhodecode/templates/changeset/changeset.html:119
 msgid "Changeset was too big and was cut off..."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:35
+#: rhodecode/templates/changeset/changeset_file_comment.html:42
 msgid "Submitting..."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:38
+#: rhodecode/templates/changeset/changeset_file_comment.html:45
 msgid "Commenting on line {1}."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:39
-#: rhodecode/templates/changeset/changeset_file_comment.html:102
+#: rhodecode/templates/changeset/changeset_file_comment.html:46
+#: rhodecode/templates/changeset/changeset_file_comment.html:115
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:41
-#: rhodecode/templates/changeset/changeset_file_comment.html:104
+#: rhodecode/templates/changeset/changeset_file_comment.html:48
+#: rhodecode/templates/changeset/changeset_file_comment.html:117
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:49
-#: rhodecode/templates/changeset/changeset_file_comment.html:110
+#: rhodecode/templates/changeset/changeset_file_comment.html:59
+#: rhodecode/templates/changeset/changeset_file_comment.html:132
 msgid "Comment"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:50
-#: rhodecode/templates/changeset/changeset_file_comment.html:61
+#: 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:57
+#: 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:57
+#: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "Login now"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:99
+#: rhodecode/templates/changeset/changeset_file_comment.html:112
 msgid "Leave a comment"
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset_file_comment.html:118
+msgid "Check this to change current status of code-review for this changeset"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:118
+msgid "change status"
+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:49
+#: rhodecode/templates/changeset/changeset_range.html:54
+#: rhodecode/templates/compare/compare_diff.html:41
+#: rhodecode/templates/pullrequests/pullrequest_show.html:71
 msgid "Files affected"
 msgstr ""
 
@@ -2623,34 +2913,41 b' msgstr ""'
 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/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 #: rhodecode/templates/data_table/_dt_elements.html:37
-#: rhodecode/templates/forks/fork.html:5
 msgid "Fork"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/journal/journal.html:117
-#: rhodecode/templates/summary/summary.html:63
+#: rhodecode/templates/journal/journal.html:126
+#: rhodecode/templates/summary/summary.html:68
 msgid "Mercurial repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/journal/journal.html:119
-#: rhodecode/templates/summary/summary.html:66
+#: rhodecode/templates/journal/journal.html:128
+#: rhodecode/templates/summary/summary.html:71
 msgid "Git repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/journal/journal.html:125
-#: rhodecode/templates/summary/summary.html:73
+#: rhodecode/templates/journal/journal.html:134
+#: rhodecode/templates/summary/summary.html:78
 msgid "public repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/summary/summary.html:82
-#: rhodecode/templates/summary/summary.html:83
+#: rhodecode/templates/summary/summary.html:87
+#: rhodecode/templates/summary/summary.html:88
 msgid "Fork of"
 msgstr ""
 
@@ -2662,32 +2959,34 b' msgstr ""'
 msgid "This is an notification from RhodeCode."
 msgstr ""
 
-#: rhodecode/templates/errors/error_document.html:44
+#: 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
+#, python-format
+msgid "%s Files"
+msgstr ""
+
 #: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:328
+#: rhodecode/templates/summary/summary.html:333
 msgid "files"
 msgstr ""
 
-#: rhodecode/templates/files/files.html:44
-msgid "search truncated"
-msgstr ""
-
-#: rhodecode/templates/files/files.html:45
-msgid "no matching files"
-msgstr ""
-
 #: rhodecode/templates/files/files_add.html:4
 #: rhodecode/templates/files/files_edit.html:4
-msgid "Edit file"
+#, python-format
+msgid "%s Edit file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:19
@@ -2791,18 +3090,18 b' msgid "edit file"'
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:26
+#: rhodecode/templates/files/files_source.html:38
 msgid "show annotation"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:50
-#: rhodecode/templates/files/files_source.html:28
-#: rhodecode/templates/files/files_source.html:56
+#: rhodecode/templates/files/files_source.html:40
+#: rhodecode/templates/files/files_source.html:68
 msgid "show as raw"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:51
-#: rhodecode/templates/files/files_source.html:29
+#: rhodecode/templates/files/files_source.html:41
 msgid "download as raw"
 msgstr ""
 
@@ -2818,20 +3117,40 b' msgstr ""'
 msgid "History"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:24
+#: rhodecode/templates/files/files_source.html:9
+msgid "diff to revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:10
+#, fuzzy, python-format
+#| msgid "showing %d out of %d revision"
+#| msgid_plural "showing %d out of %d revisions"
+msgid "show at revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:14
+#, fuzzy, python-format
+#| msgid "%d hour"
+#| msgid_plural "%d hours"
+msgid "%s author"
+msgid_plural "%s authors"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/files/files_source.html:36
 msgid "show source"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:47
+#: rhodecode/templates/files/files_source.html:59
 #, python-format
 msgid "Binary file (%s)"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:56
+#: rhodecode/templates/files/files_source.html:68
 msgid "File is too big to display"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:112
+#: rhodecode/templates/files/files_source.html:124
 msgid "Selection link"
 msgstr ""
 
@@ -2847,34 +3166,57 b' msgstr ""'
 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"
+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:57
+#: rhodecode/templates/forks/fork.html:68
 msgid "Private"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:65
+#: rhodecode/templates/forks/fork.html:77
 msgid "Copy permissions"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:73
+#: 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:80
+#: 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 ""
@@ -2887,23 +3229,42 b' msgstr ""'
 msgid "There are no forks yet"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:20
+#: 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
 msgid "Refresh"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:32
+#: 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:105
+#: rhodecode/templates/journal/journal.html:114
 msgid "following user"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:105
+#: rhodecode/templates/journal/journal.html:114
 msgid "user"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:138
+#: rhodecode/templates/journal/journal.html:147
 msgid "You are not following any users or repositories"
 msgstr ""
 
@@ -2911,33 +3272,122 b' msgstr ""'
 msgid "No entries yet"
 msgstr ""
 
-#: rhodecode/templates/journal/public_journal.html:17
+#: 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/search/search.html:7
-#: rhodecode/templates/search/search.html:26
-msgid "in repository: "
-msgstr ""
-
-#: rhodecode/templates/search/search.html:9
-#: rhodecode/templates/search/search.html:28
-msgid "in all repositories"
-msgstr ""
-
-#: rhodecode/templates/search/search.html:42
+#: rhodecode/templates/pullrequests/pullrequest.html:4
+#: rhodecode/templates/pullrequests/pullrequest.html:12
+msgid "New pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:28
+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:40
+msgid "Pull request reviewers"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:78
+msgid "Chosen reviewers"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:95
+msgid "Available reviewers"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:108
+msgid "Create new pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:117
+#: rhodecode/templates/pullrequests/pullrequest_show.html:23
+msgid "Title"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:126
+msgid "description"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:134
+msgid "Send pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:4
+#: rhodecode/templates/pullrequests/pullrequest_show.html:12
+#, python-format
+msgid "Pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:26
+msgid "Pull request status"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:33
+msgid "Created on"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:63
+msgid "Compare view"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:67
+msgid "Incoming changesets"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
+msgid "All pull requests"
+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:54
+#: rhodecode/templates/search/search.html:60
 msgid "Search in"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:57
+#: rhodecode/templates/search/search.html:63
 msgid "File contents"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:59
+#: rhodecode/templates/search/search.html:65
 msgid "File names"
 msgstr ""
 
@@ -2946,9 +3396,14 b' msgstr ""'
 msgid "Permission denied"
 msgstr ""
 
+#: rhodecode/templates/settings/repo_settings.html:5
+#, python-format
+msgid "%s Settings"
+msgstr ""
+
 #: rhodecode/templates/shortlog/shortlog.html:5
-#: rhodecode/templates/summary/summary.html:209
-msgid "Shortlog"
+#, python-format
+msgid "%s Shortlog"
 msgstr ""
 
 #: rhodecode/templates/shortlog/shortlog.html:14
@@ -2975,122 +3430,221 b' msgstr ""'
 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:44
-#: rhodecode/templates/summary/summary.html:47
+#: 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:77
-#, python-format
-msgid "Non changable ID %s"
-msgstr ""
-
 #: rhodecode/templates/summary/summary.html:82
+#, python-format
+msgid "Non changable ID %s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:87
 msgid "public"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:90
+#: rhodecode/templates/summary/summary.html:95
 msgid "remote clone"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:121
+#: rhodecode/templates/summary/summary.html:126
 msgid "Clone url"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:124
+#: rhodecode/templates/summary/summary.html:129
 msgid "Show by Name"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:125
+#: rhodecode/templates/summary/summary.html:130
 msgid "Show by ID"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:133
+#: rhodecode/templates/summary/summary.html:138
 msgid "Trending files"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:141
-#: rhodecode/templates/summary/summary.html:157
-#: rhodecode/templates/summary/summary.html:185
+#: rhodecode/templates/summary/summary.html:146
+#: rhodecode/templates/summary/summary.html:162
+#: rhodecode/templates/summary/summary.html:190
 msgid "enable"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/templates/summary/summary.html:154
 msgid "Download"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:153
+#: rhodecode/templates/summary/summary.html:158
 msgid "There are no downloads yet"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:155
+#: rhodecode/templates/summary/summary.html:160
 msgid "Downloads are disabled for this repository"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:164
+#: rhodecode/templates/summary/summary.html:166
+msgid "Download as zip"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:169
 msgid "Check this to download archive with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:164
+#: rhodecode/templates/summary/summary.html:169
 msgid "with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:177
+#: rhodecode/templates/summary/summary.html:182
 msgid "Commit activity by day / author"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:188
+#: rhodecode/templates/summary/summary.html:193
 msgid "Stats gathered: "
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:211
+#: rhodecode/templates/summary/summary.html:214
+msgid "Shortlog"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:216
 msgid "Quick start"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:281
+#: rhodecode/templates/summary/summary.html:286
 #, python-format
 msgid "Download %s as %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:638
+#: rhodecode/templates/summary/summary.html:643
 msgid "commits"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:639
-msgid "files added"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:640
-msgid "files changed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:641
-msgid "files removed"
-msgstr ""
-
 #: rhodecode/templates/summary/summary.html:644
-msgid "commit"
+msgid "files added"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:645
-msgid "file added"
+msgid "files changed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:646
+msgid "files removed"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:649
+msgid "commit"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:650
+msgid "file added"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:651
 msgid "file changed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:647
+#: rhodecode/templates/summary/summary.html:652
 msgid "file removed"
 msgstr ""
 
-#~ msgid "[committed via RhodeCode] into"
+#: rhodecode/templates/tags/tags.html:5
+#, python-format
+msgid "%s Tags"
+msgstr ""
+
+#~ msgid "%s public journal %s feed"
+#~ msgstr ""
+
+#~ msgid "Invalid username"
+#~ msgstr ""
+
+#~ msgid "This username already exists"
+#~ msgstr ""
+
+#~ msgid "Invalid group name"
+#~ msgstr ""
+
+#~ msgid "This users group already exists"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "RepoGroup name may only contain  "
+#~ "alphanumeric characters underscores, periods "
+#~ "or dashes and must begin with "
+#~ "alphanumeric character"
+#~ msgstr ""
+
+#~ msgid "This group already exists"
+#~ msgstr ""
+
+#~ msgid "Repository with this name already exists"
+#~ msgstr ""
+
+#~ msgid "Invalid characters in password"
+#~ msgstr ""
+
+#~ msgid "This username is not valid"
+#~ msgstr ""
+
+#~ msgid "This repository name is disallowed"
 #~ msgstr ""
 
-#~ msgid "[pulled from remote] into"
+#~ msgid "This repository already exists in a group \"%s\""
+#~ msgstr ""
+
+#~ msgid "There is a group with this name already \"%s\""
+#~ msgstr ""
+
+#~ msgid "This repository already exists"
+#~ msgstr ""
+
+#~ msgid "Fork have to be the same type as original"
+#~ msgstr ""
+
+#~ msgid "This e-mail address doesn't exist."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "The LDAP Login attribute of the CN"
+#~ " must be specified - this is "
+#~ "the name of the attribute that is"
+#~ " equivalent to 'username'"
+#~ msgstr ""
+
+#~ msgid "Set as fork"
+#~ msgstr ""
+
+#~ msgid "Manually set this repository as a fork of another"
+#~ msgstr ""
+
+#~ msgid "Edit file"
+#~ msgstr ""
+
+#~ msgid "Started following"
+#~ msgstr ""
+
+#~ msgid "in repository: "
+#~ msgstr ""
+
+#~ msgid "in all repositories"
+#~ msgstr ""
+

rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode 1.1.5\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-06-05 20:42+0200\n"
+"POT-Creation-Date: 2012-07-02 11:58+0200\n"
 "PO-Revision-Date: 2012-06-05 20:07+0100\n"
 "Last-Translator: Vincent Duvert <[e-mail]>\n"
 "Language-Team: fr <[e-mail]>\n"
@@ -21,21 +21,21 b' msgstr ""'
 msgid "All Branches"
 msgstr "Toutes les branches"
 
-#: rhodecode/controllers/changeset.py:80
+#: rhodecode/controllers/changeset.py:81
 msgid "show white space"
 msgstr "afficher les espaces et tabulations"
 
-#: rhodecode/controllers/changeset.py:87 rhodecode/controllers/changeset.py:94
+#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95
 msgid "ignore white space"
 msgstr "ignorer les espaces et tabulations"
 
-#: rhodecode/controllers/changeset.py:154
+#: rhodecode/controllers/changeset.py:155
 #, python-format
 msgid "%s line context"
 msgstr "afficher %s lignes de contexte"
 
-#: rhodecode/controllers/changeset.py:324
-#: rhodecode/controllers/changeset.py:339 rhodecode/lib/diffs.py:62
+#: rhodecode/controllers/changeset.py:331
+#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69
 msgid "binary file"
 msgstr "fichier binaire"
 
@@ -93,69 +93,71 b' msgstr "ajouter un nouveau"'
 msgid "There are no files yet %s"
 msgstr "Il n’y a pas encore de fichiers %s"
 
-#: rhodecode/controllers/files.py:247
+#: rhodecode/controllers/files.py:256
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr "%s édité via RhodeCode"
 
-#: rhodecode/controllers/files.py:252
+#: rhodecode/controllers/files.py:261
 msgid "No changes"
 msgstr "Aucun changement"
 
-#: rhodecode/controllers/files.py:263 rhodecode/controllers/files.py:316
+#: rhodecode/controllers/files.py:272 rhodecode/controllers/files.py:326
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Commit réalisé avec succès sur %s"
 
-#: rhodecode/controllers/files.py:268 rhodecode/controllers/files.py:322
+#: rhodecode/controllers/files.py:277 rhodecode/controllers/files.py:332
 msgid "Error occurred during commit"
 msgstr "Une erreur est survenue durant le commit"
 
-#: rhodecode/controllers/files.py:288
+#: rhodecode/controllers/files.py:298
 #, python-format
 msgid "Added %s via RhodeCode"
 msgstr "%s ajouté par RhodeCode"
 
-#: rhodecode/controllers/files.py:302
+#: rhodecode/controllers/files.py:312
 msgid "No content"
 msgstr "Aucun contenu"
 
-#: rhodecode/controllers/files.py:306
+#: rhodecode/controllers/files.py:316
 msgid "No filename"
 msgstr "Aucun nom de fichier"
 
-#: rhodecode/controllers/files.py:347
+#: rhodecode/controllers/files.py:358
 msgid "downloads disabled"
 msgstr "Les téléchargements sont désactivés"
 
-#: rhodecode/controllers/files.py:358
+#: rhodecode/controllers/files.py:369
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Révision %s inconnue."
 
-#: rhodecode/controllers/files.py:360
+#: rhodecode/controllers/files.py:371
 msgid "Empty repository"
 msgstr "Dépôt vide."
 
-#: rhodecode/controllers/files.py:362
+#: rhodecode/controllers/files.py:373
 msgid "Unknown archive type"
 msgstr "Type d’archive inconnu"
 
-#: rhodecode/controllers/files.py:461
+#: rhodecode/controllers/files.py:474
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "Changesets"
 
-#: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:230
+#: rhodecode/controllers/files.py:475 rhodecode/controllers/pullrequests.py:65
+#: rhodecode/controllers/summary.py:230 rhodecode/model/scm.py:497
 msgid "Branches"
 msgstr "Branches"
 
-#: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:231
+#: rhodecode/controllers/files.py:476 rhodecode/controllers/pullrequests.py:69
+#: rhodecode/controllers/summary.py:231 rhodecode/model/scm.py:508
 msgid "Tags"
 msgstr "Tags"
 
-#: rhodecode/controllers/forks.py:69 rhodecode/controllers/admin/repos.py:86
+#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:88
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -166,7 +168,7 b' msgstr ""'
 "probablement été créé ou renommé manuellement. Veuillez relancer "
 "l’application pour rescanner les dépôts."
 
-#: rhodecode/controllers/forks.py:128 rhodecode/controllers/settings.py:69
+#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -177,29 +179,27 b' msgstr ""'
 "probablement été créé ou renommé manuellement. Veuillez relancer "
 "l’application pour rescanner les dépôts."
 
-#: rhodecode/controllers/forks.py:163
+#: rhodecode/controllers/forks.py:166
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "dépôt %s forké en tant que %s"
 
-#: rhodecode/controllers/forks.py:177
+#: rhodecode/controllers/forks.py:180
 #, 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:53
-#, python-format
-msgid "%s public journal %s feed"
-msgstr "%s — Flux %s du journal public"
-
-#: rhodecode/controllers/journal.py:190 rhodecode/controllers/journal.py:223
-#: rhodecode/templates/admin/repos/repo_edit.html:177
-#: rhodecode/templates/base/base.html:307
-#: rhodecode/templates/base/base.html:309
-#: rhodecode/templates/base/base.html:311
-msgid "Public journal"
+#: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239
+#, fuzzy
+#| msgid "Public journal"
+msgid "public journal"
 msgstr "Journal public"
 
+#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243
+#: rhodecode/templates/base/base.html:217
+msgid "journal"
+msgstr "Journal"
+
 #: rhodecode/controllers/login.py:116
 msgid "You have successfully registered into rhodecode"
 msgstr "Vous vous êtes inscrits avec succès à RhodeCode"
@@ -216,6 +216,30 b' msgstr ""'
 "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a "
 "été envoyé par e-mail."
 
+#: rhodecode/controllers/pullrequests.py:67 rhodecode/model/scm.py:503
+#, fuzzy
+#| msgid "bookmarks"
+msgid "Bookmarks"
+msgstr "Signets"
+
+#: rhodecode/controllers/pullrequests.py:117
+#, fuzzy, python-format
+#| msgid "%s Followers"
+msgid "%s (owner)"
+msgstr "Followers de %s"
+
+#: rhodecode/controllers/pullrequests.py:142
+#, fuzzy
+#| msgid "successfully deleted user"
+msgid "Successfully opened new pull request"
+msgstr "L’utilisateur a été supprimé avec succès."
+
+#: rhodecode/controllers/pullrequests.py:145
+#, fuzzy, python-format
+#| msgid "error occurred during creation of repository %s"
+msgid "Error occurred during sending pull request"
+msgstr "Une erreur est survenue durant la création du dépôt %s."
+
 #: rhodecode/controllers/search.py:114
 msgid "Invalid search query. Try quoting it."
 msgstr "Requête invalide. Essayer de la mettre entre guillemets."
@@ -230,20 +254,20 b' msgstr ""'
 msgid "An error occurred during this search operation"
 msgstr "Une erreur est survenue durant l’opération de recherche."
 
-#: rhodecode/controllers/settings.py:103
-#: rhodecode/controllers/admin/repos.py:213
+#: rhodecode/controllers/settings.py:107
+#: rhodecode/controllers/admin/repos.py:221
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Dépôt %s mis à jour avec succès."
 
-#: rhodecode/controllers/settings.py:121
-#: rhodecode/controllers/admin/repos.py:231
+#: rhodecode/controllers/settings.py:125
+#: rhodecode/controllers/admin/repos.py:239
 #, 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:139
-#: rhodecode/controllers/admin/repos.py:249
+#: rhodecode/controllers/settings.py:143
+#: rhodecode/controllers/admin/repos.py:257
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from "
@@ -254,15 +278,15 b' msgstr ""'
 "probablement été déplacé ou renommé manuellement. Veuillez relancer "
 "l’application pour rescanner les dépôts."
 
-#: rhodecode/controllers/settings.py:151
-#: rhodecode/controllers/admin/repos.py:261
+#: rhodecode/controllers/settings.py:155
+#: rhodecode/controllers/admin/repos.py:269
 #, python-format
 msgid "deleted repository %s"
 msgstr "Dépôt %s supprimé"
 
-#: rhodecode/controllers/settings.py:155
-#: rhodecode/controllers/admin/repos.py:271
-#: rhodecode/controllers/admin/repos.py:277
+#: rhodecode/controllers/settings.py:159
+#: rhodecode/controllers/admin/repos.py:279
+#: rhodecode/controllers/admin/repos.py:285
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Erreur pendant la suppression de %s"
@@ -272,7 +296,7 b' msgid "No data loaded yet"'
 msgstr "Aucune donnée actuellement disponible."
 
 #: rhodecode/controllers/summary.py:142
-#: rhodecode/templates/summary/summary.html:139
+#: rhodecode/templates/summary/summary.html:144
 msgid "Statistics are disabled for this repository"
 msgstr "La mise à jour des statistiques est désactivée pour ce dépôt."
 
@@ -363,9 +387,9 b' msgstr "\xc3\x89crire"'
 #: 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:326
-#: rhodecode/templates/base/base.html:328
-#: rhodecode/templates/base/base.html:330
+#: rhodecode/templates/base/base.html:334
+#: rhodecode/templates/base/base.html:336
+#: rhodecode/templates/base/base.html:338
 msgid "Admin"
 msgstr "Administration"
 
@@ -397,80 +421,80 b' msgstr "Permissions par d\xc3\xa9faut mises \xc3\xa0 jour avec succ\xc3\xa8s"'
 msgid "error occurred during update of permissions"
 msgstr "erreur pendant la mise à jour des permissions"
 
-#: rhodecode/controllers/admin/repos.py:116
+#: rhodecode/controllers/admin/repos.py:121
 msgid "--REMOVE FORK--"
 msgstr "[Pas un fork]"
 
-#: rhodecode/controllers/admin/repos.py:144
+#: rhodecode/controllers/admin/repos.py:151
 #, python-format
 msgid "created repository %s from %s"
 msgstr "Le dépôt %s a été créé depuis %s."
 
-#: rhodecode/controllers/admin/repos.py:148
+#: rhodecode/controllers/admin/repos.py:155
 #, python-format
 msgid "created repository %s"
 msgstr "Le dépôt %s a été créé."
 
-#: rhodecode/controllers/admin/repos.py:179
+#: rhodecode/controllers/admin/repos.py:186
 #, 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:266
+#: rhodecode/controllers/admin/repos.py:274
 #, 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:295
+#: rhodecode/controllers/admin/repos.py:303
 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:314
+#: rhodecode/controllers/admin/repos.py:322
 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:331
+#: rhodecode/controllers/admin/repos.py:339
 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:347
+#: rhodecode/controllers/admin/repos.py:355
 msgid "An error occurred during cache invalidation"
 msgstr "Une erreur est survenue durant l’invalidation du cache."
 
-#: rhodecode/controllers/admin/repos.py:367
+#: rhodecode/controllers/admin/repos.py:375
 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:371
+#: rhodecode/controllers/admin/repos.py:379
 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:376 rhodecode/model/forms.py:54
+#: rhodecode/controllers/admin/repos.py:384 rhodecode/model/validators.py:269
 msgid "Token mismatch"
 msgstr "Jeton d’authentification incorrect."
 
-#: rhodecode/controllers/admin/repos.py:389
+#: rhodecode/controllers/admin/repos.py:397
 msgid "Pulled from remote location"
 msgstr "Les changements distants ont été récupérés."
 
-#: rhodecode/controllers/admin/repos.py:391
+#: rhodecode/controllers/admin/repos.py:399
 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:407
+#: rhodecode/controllers/admin/repos.py:415
 msgid "Nothing"
 msgstr "[Aucun dépôt]"
 
-#: rhodecode/controllers/admin/repos.py:409
+#: rhodecode/controllers/admin/repos.py:417
 #, 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:413
+#: rhodecode/controllers/admin/repos.py:421
 msgid "An error occurred during this operation"
 msgstr "Une erreur est survenue durant cette opération."
 
@@ -540,82 +564,99 b' msgid "Updated application settings"'
 msgstr "Réglages mis à jour"
 
 #: rhodecode/controllers/admin/settings.py:159
-#: rhodecode/controllers/admin/settings.py:226
+#: rhodecode/controllers/admin/settings.py:227
 msgid "error occurred during updating application settings"
 msgstr "Une erreur est survenue durant la mise à jour des options."
 
-#: rhodecode/controllers/admin/settings.py:221
+#: rhodecode/controllers/admin/settings.py:222
 msgid "Updated mercurial settings"
 msgstr "Réglages de Mercurial mis à jour"
 
-#: rhodecode/controllers/admin/settings.py:246
+#: rhodecode/controllers/admin/settings.py:247
 msgid "Added new hook"
 msgstr "Le nouveau hook a été ajouté."
 
-#: rhodecode/controllers/admin/settings.py:258
+#: rhodecode/controllers/admin/settings.py:259
 msgid "Updated hooks"
 msgstr "Hooks mis à jour"
 
-#: rhodecode/controllers/admin/settings.py:262
+#: rhodecode/controllers/admin/settings.py:263
 msgid "error occurred during hook creation"
 msgstr "Une erreur est survenue durant la création du hook."
 
-#: rhodecode/controllers/admin/settings.py:281
+#: rhodecode/controllers/admin/settings.py:282
 msgid "Email task created"
 msgstr "La tâche d’e-mail a été créée."
 
-#: rhodecode/controllers/admin/settings.py:336
+#: rhodecode/controllers/admin/settings.py:337
 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:367
+#: rhodecode/controllers/admin/settings.py:368
 msgid "Your account was updated successfully"
 msgstr "Votre compte a été mis à jour avec succès"
 
-#: rhodecode/controllers/admin/settings.py:387
-#: rhodecode/controllers/admin/users.py:138
+#: rhodecode/controllers/admin/settings.py:388
+#: rhodecode/controllers/admin/users.py:142
 #, 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:83
+#: rhodecode/controllers/admin/users.py:84
 #, python-format
 msgid "created user %s"
 msgstr "utilisateur %s créé"
 
-#: rhodecode/controllers/admin/users.py:95
+#: rhodecode/controllers/admin/users.py:96
 #, 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:124
+#: rhodecode/controllers/admin/users.py:125
 msgid "User updated successfully"
 msgstr "L’utilisateur a été mis à jour avec succès."
 
-#: rhodecode/controllers/admin/users.py:155
+#: rhodecode/controllers/admin/users.py:159
 msgid "successfully deleted user"
 msgstr "L’utilisateur a été supprimé avec succès."
 
-#: rhodecode/controllers/admin/users.py:160
+#: rhodecode/controllers/admin/users.py:164
 msgid "An error occurred during deletion of user"
 msgstr "Une erreur est survenue durant la suppression de l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:175
+#: rhodecode/controllers/admin/users.py:178
 msgid "You can't edit this user"
 msgstr "Vous ne pouvez pas éditer cet utilisateur"
 
-#: rhodecode/controllers/admin/users.py:205
+#: rhodecode/controllers/admin/users.py:210
 #: rhodecode/controllers/admin/users_groups.py:219
 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:214
+#: rhodecode/controllers/admin/users.py:219
 #: rhodecode/controllers/admin/users_groups.py:229
 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:235
+#, python-format
+msgid "Added email %s to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:241
+#, fuzzy
+#| msgid "An error occurred during this operation"
+msgid "An error occurred during email saving"
+msgstr "Une erreur est survenue durant cette opération."
+
+#: rhodecode/controllers/admin/users.py:251
+#, fuzzy, python-format
+#| msgid "removed repos group %s"
+msgid "Removed email from user"
+msgstr "Le groupe de dépôts %s a été supprimé."
+
 #: rhodecode/controllers/admin/users_groups.py:84
 #, python-format
 msgid "created users group %s"
@@ -652,133 +693,139 b' msgstr "Vous devez \xc3\xaatre un utilisateur enregistr\xc3\xa9 pour effectuer cette action."'
 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:78
+#: rhodecode/lib/diffs.py:85
 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:88
+#: rhodecode/lib/diffs.py:95
 msgid "No changes detected"
 msgstr "Aucun changement détecté."
 
-#: rhodecode/lib/helpers.py:350
+#: rhodecode/lib/helpers.py:369
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr "%d/%m/%Y à %H:%M:%S"
 
-#: rhodecode/lib/helpers.py:423
+#: rhodecode/lib/helpers.py:442
 msgid "True"
 msgstr "Vrai"
 
-#: rhodecode/lib/helpers.py:427
+#: rhodecode/lib/helpers.py:446
 msgid "False"
 msgstr "Faux"
 
-#: rhodecode/lib/helpers.py:471
+#: rhodecode/lib/helpers.py:490
 msgid "Changeset not found"
 msgstr "Ensemble de changements non trouvé"
 
-#: rhodecode/lib/helpers.py:494
+#: rhodecode/lib/helpers.py:513
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "Afficher les changements combinés %s->%s"
 
-#: rhodecode/lib/helpers.py:500
+#: rhodecode/lib/helpers.py:519
 msgid "compare view"
 msgstr "vue de comparaison"
 
-#: rhodecode/lib/helpers.py:520
+#: rhodecode/lib/helpers.py:539
 msgid "and"
 msgstr "et"
 
-#: rhodecode/lib/helpers.py:521
+#: rhodecode/lib/helpers.py:540
 #, python-format
 msgid "%s more"
 msgstr "%s de plus"
 
-#: rhodecode/lib/helpers.py:522 rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46
 msgid "revisions"
 msgstr "révisions"
 
-#: rhodecode/lib/helpers.py:545
+#: rhodecode/lib/helpers.py:564
 msgid "fork name "
 msgstr "Nom du fork"
 
-#: rhodecode/lib/helpers.py:558
+#: rhodecode/lib/helpers.py:577
 msgid "[deleted] repository"
 msgstr "[a supprimé] le dépôt"
 
-#: rhodecode/lib/helpers.py:560 rhodecode/lib/helpers.py:570
+#: rhodecode/lib/helpers.py:579 rhodecode/lib/helpers.py:589
 msgid "[created] repository"
 msgstr "[a créé] le dépôt"
 
-#: rhodecode/lib/helpers.py:562
+#: rhodecode/lib/helpers.py:581
 msgid "[created] repository as fork"
 msgstr "[a créé] le dépôt en tant que fork"
 
-#: rhodecode/lib/helpers.py:564 rhodecode/lib/helpers.py:572
+#: rhodecode/lib/helpers.py:583 rhodecode/lib/helpers.py:591
 msgid "[forked] repository"
 msgstr "[a forké] le dépôt"
 
-#: rhodecode/lib/helpers.py:566 rhodecode/lib/helpers.py:574
+#: rhodecode/lib/helpers.py:585 rhodecode/lib/helpers.py:593
 msgid "[updated] repository"
 msgstr "[a mis à jour] le dépôt"
 
-#: rhodecode/lib/helpers.py:568
+#: rhodecode/lib/helpers.py:587
 msgid "[delete] repository"
 msgstr "[a supprimé] le dépôt"
 
-#: rhodecode/lib/helpers.py:576
+#: rhodecode/lib/helpers.py:595
 msgid "[created] user"
 msgstr "[a créé] l’utilisateur"
 
-#: rhodecode/lib/helpers.py:578
+#: rhodecode/lib/helpers.py:597
 msgid "[updated] user"
 msgstr "[a mis à jour] l’utilisateur"
 
-#: rhodecode/lib/helpers.py:580
+#: rhodecode/lib/helpers.py:599
 msgid "[created] users group"
 msgstr "[a créé] le groupe d’utilisateurs"
 
-#: rhodecode/lib/helpers.py:582
+#: rhodecode/lib/helpers.py:601
 msgid "[updated] users group"
 msgstr "[a mis à jour] le groupe d’utilisateurs"
 
-#: rhodecode/lib/helpers.py:584
+#: rhodecode/lib/helpers.py:603
 msgid "[commented] on revision in repository"
 msgstr "[a commenté] une révision du dépôt"
 
-#: rhodecode/lib/helpers.py:586
+#: rhodecode/lib/helpers.py:605
+#, fuzzy
+#| msgid "[commented] on revision in repository"
+msgid "[commented] on pull request"
+msgstr "[a commenté] une révision du dépôt"
+
+#: rhodecode/lib/helpers.py:607
 msgid "[pushed] into"
 msgstr "[a pushé] dans"
 
-#: rhodecode/lib/helpers.py:588
+#: rhodecode/lib/helpers.py:609
 msgid "[committed via RhodeCode] into repository"
 msgstr "[a commité via RhodeCode] dans le dépôt"
 
-#: rhodecode/lib/helpers.py:590
+#: rhodecode/lib/helpers.py:611
 msgid "[pulled from remote] into repository"
 msgstr "[a pullé depuis un site distant] dans le dépôt"
 
-#: rhodecode/lib/helpers.py:592
+#: rhodecode/lib/helpers.py:613
 msgid "[pulled] from"
 msgstr "[a pullé] depuis"
 
-#: rhodecode/lib/helpers.py:594
+#: rhodecode/lib/helpers.py:615
 msgid "[started following] repository"
 msgstr "[suit maintenant] le dépôt"
 
-#: rhodecode/lib/helpers.py:596
+#: rhodecode/lib/helpers.py:617
 msgid "[stopped following] repository"
 msgstr "[ne suit plus] le dépôt"
 
-#: rhodecode/lib/helpers.py:760
+#: rhodecode/lib/helpers.py:781
 #, python-format
 msgid " and %s more"
 msgstr "et %s de plus"
 
-#: rhodecode/lib/helpers.py:764
+#: rhodecode/lib/helpers.py:785
 msgid "No Files"
 msgstr "Aucun fichier"
 
@@ -842,24 +889,205 b' msgstr "\xc3\xa0 l\xe2\x80\x99instant"'
 msgid "password reset link"
 msgstr "Réinitialisation du mot de passe"
 
-#: rhodecode/model/comment.py:85
+#: rhodecode/model/comment.py:109
 #, python-format
 msgid "on line %s"
 msgstr "à la ligne %s"
 
-#: rhodecode/model/comment.py:114
+#: rhodecode/model/comment.py:146
 msgid "[Mention]"
 msgstr "[Mention]"
 
-#: rhodecode/model/forms.py:72
-msgid "Invalid username"
-msgstr "Nom d’utilisateur invalide"
-
-#: rhodecode/model/forms.py:80
-msgid "This username already exists"
+#: rhodecode/model/db.py:1062
+#, fuzzy
+#| msgid "repositories"
+msgid "Repository no access"
+msgstr "Dépôts"
+
+#: rhodecode/model/db.py:1063
+#, fuzzy
+#| msgid "This repository already exists"
+msgid "Repository read access"
+msgstr "Ce dépôt existe déjà"
+
+#: rhodecode/model/db.py:1064
+#, fuzzy
+#| msgid "repositories"
+msgid "Repository write access"
+msgstr "Dépôts"
+
+#: rhodecode/model/db.py:1065
+#, fuzzy
+#| msgid "repositories"
+msgid "Repository admin access"
+msgstr "Dépôts"
+
+#: rhodecode/model/db.py:1067
+#, fuzzy
+#| msgid "repositories groups"
+msgid "Repositories Group no access"
+msgstr "Groupes de dépôts"
+
+#: rhodecode/model/db.py:1068
+#, fuzzy
+#| msgid "repositories groups"
+msgid "Repositories Group read access"
+msgstr "Groupes de dépôts"
+
+#: rhodecode/model/db.py:1069
+#, fuzzy
+#| msgid "repositories groups"
+msgid "Repositories Group write access"
+msgstr "Groupes de dépôts"
+
+#: rhodecode/model/db.py:1070
+#, fuzzy
+#| msgid "repositories groups"
+msgid "Repositories Group admin access"
+msgstr "Groupes de dépôts"
+
+#: rhodecode/model/db.py:1072
+#, fuzzy
+#| msgid "Users administration"
+msgid "RhodeCode Administrator"
+msgstr "Administration des utilisateurs"
+
+#: rhodecode/model/db.py:1073
+#, fuzzy
+#| msgid "Repository creation"
+msgid "Repository creation disabled"
+msgstr "Création de dépôt"
+
+#: rhodecode/model/db.py:1074
+#, fuzzy
+#| msgid "Repository creation"
+msgid "Repository creation enabled"
+msgstr "Création de dépôt"
+
+#: rhodecode/model/db.py:1075
+#, fuzzy
+#| msgid "disabled"
+msgid "Register disabled"
+msgstr "Désactivé"
+
+#: rhodecode/model/db.py:1076
+msgid "Register new user with RhodeCode with manual activation"
+msgstr ""
+
+#: rhodecode/model/db.py:1079
+msgid "Register new user with RhodeCode with auto activation"
+msgstr ""
+
+#: rhodecode/model/db.py:1479
+msgid "Not Reviewed"
+msgstr ""
+
+#: rhodecode/model/db.py:1480
+#, fuzzy
+#| msgid "removed"
+msgid "Approved"
+msgstr "Supprimés"
+
+#: rhodecode/model/db.py:1481
+msgid "Rejected"
+msgstr ""
+
+#: rhodecode/model/db.py:1482
+msgid "Under Review"
+msgstr ""
+
+#: 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:203
+msgid "commented on commit"
+msgstr "a posté un commentaire sur le commit"
+
+#: rhodecode/model/notification.py:204
+msgid "sent message"
+msgstr "a envoyé un message"
+
+#: rhodecode/model/notification.py:205
+msgid "mentioned you"
+msgstr "vous a mentioné"
+
+#: rhodecode/model/notification.py:206
+msgid "registered in RhodeCode"
+msgstr "s’est enregistré sur RhodeCode"
+
+#: rhodecode/model/notification.py:207
+msgid "opened new pull request"
+msgstr ""
+
+#: rhodecode/model/notification.py:208
+#, fuzzy
+#| msgid "commented on commit"
+msgid "commented on pull request"
+msgstr "a posté un commentaire sur le commit"
+
+#: rhodecode/model/pull_request.py:75
+#, python-format
+msgid "%(user)s wants you to review pull request #%(pr_id)s"
+msgstr ""
+
+#: rhodecode/model/scm.py:489
+#, fuzzy
+#| msgid "last login"
+msgid "latest tip"
+msgstr "Dernière connexion"
+
+#: rhodecode/model/user.py:238
+msgid "new user registration"
+msgstr "Nouveau compte utilisateur enregistré"
+
+#: rhodecode/model/user.py:263 rhodecode/model/user.py:284
+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:306
+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:312
+#, 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:52
+#, fuzzy, python-format
+#| msgid "This username already exists"
+msgid "Username \"%(username)s\" already exists"
 msgstr "Ce nom d’utilisateur existe déjà"
 
-#: rhodecode/model/forms.py:85
+#: rhodecode/model/validators.py:54
+#, python-format
+msgid "Username \"%(username)s\" is forbidden"
+msgstr ""
+
+#: rhodecode/model/validators.py:56
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
@@ -868,175 +1096,144 b' msgstr ""'
 "numériques ainsi que les caractères suivants : « _ . - ». Il doit "
 "commencer par un caractère alpha-numérique."
 
-#: rhodecode/model/forms.py:101
-msgid "Invalid group name"
-msgstr "Nom de groupe invalide"
-
-#: rhodecode/model/forms.py:111
-msgid "This users group already exists"
+#: rhodecode/model/validators.py:84
+#, fuzzy, python-format
+#| msgid "This username or users group name is not valid"
+msgid "Username %(username)s is not valid"
+msgstr "Ce nom d’utilisateur ou de groupe n’est pas valide."
+
+#: rhodecode/model/validators.py:103
+#, fuzzy
+#| msgid "invalid user name"
+msgid "Invalid users group name"
+msgstr "nom d’utilisateur invalide"
+
+#: rhodecode/model/validators.py:104
+#, fuzzy, python-format
+#| msgid "This users group already exists"
+msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr "Ce groupe d’utilisateurs existe déjà."
 
-#: rhodecode/model/forms.py:117
+#: rhodecode/model/validators.py:106
+#, fuzzy
+#| msgid "" "RepoGroup name may only contain  alphanumeric characters
+#| underscores, " "periods or dashes and must begin with alphanumeric
+#| character"
 msgid ""
-"RepoGroup name may only contain  alphanumeric characters underscores, "
+"users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 "Le nom de groupe de dépôts 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/forms.py:145
+#: rhodecode/model/validators.py:144
 msgid "Cannot assign this group as parent"
 msgstr "Impossible d’assigner ce groupe en tant que parent."
 
-#: rhodecode/model/forms.py:164
-msgid "This group already exists"
-msgstr "Ce groupe existe déjà."
-
-#: rhodecode/model/forms.py:176
-msgid "Repository with this name already exists"
+#: rhodecode/model/validators.py:145
+#, fuzzy, python-format
+#| msgid "This username already exists"
+msgid "Group \"%(group_name)s\" already exists"
+msgstr "Ce nom d’utilisateur existe déjà"
+
+#: rhodecode/model/validators.py:147
+#, fuzzy, python-format
+#| msgid "Repository with this name already exists"
+msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "Un dépôt portant ce nom existe déjà."
 
-#: rhodecode/model/forms.py:195 rhodecode/model/forms.py:204
-#: rhodecode/model/forms.py:213
-msgid "Invalid characters in password"
+#: rhodecode/model/validators.py:205
+#, fuzzy
+#| msgid "Invalid characters in password"
+msgid "Invalid characters (non-ascii) in password"
 msgstr "Caractères incorrects dans le mot de passe"
 
-#: rhodecode/model/forms.py:226
+#: rhodecode/model/validators.py:220
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas."
 
-#: rhodecode/model/forms.py:232
+#: rhodecode/model/validators.py:237
 msgid "invalid password"
 msgstr "mot de passe invalide"
 
-#: rhodecode/model/forms.py:233
+#: rhodecode/model/validators.py:238
 msgid "invalid user name"
 msgstr "nom d’utilisateur invalide"
 
-#: rhodecode/model/forms.py:234
+#: rhodecode/model/validators.py:239
 msgid "Your account is disabled"
 msgstr "Votre compte est désactivé"
 
-#: rhodecode/model/forms.py:274
-msgid "This username is not valid"
-msgstr "Ce nom d’utilisateur n’est plus valide"
-
-#: rhodecode/model/forms.py:287
-msgid "This repository name is disallowed"
+#: rhodecode/model/validators.py:283
+#, fuzzy, python-format
+#| msgid "This repository name is disallowed"
+msgid "Repository name %(repo)s is disallowed"
 msgstr "Ce nom de dépôt est interdit"
 
-#: rhodecode/model/forms.py:310
-#, python-format
-msgid "This repository already exists in a group \"%s\""
+#: rhodecode/model/validators.py:285
+#, fuzzy, python-format
+#| msgid "Repository with this name already exists"
+msgid "Repository named %(repo)s already exists"
+msgstr "Un dépôt portant ce nom existe déjà."
+
+#: rhodecode/model/validators.py:286
+#, fuzzy, python-format
+#| msgid "This repository already exists in a group \"%s\""
+msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "Ce dépôt existe déjà dans le groupe « %s »."
 
-#: rhodecode/model/forms.py:317
-#, python-format
-msgid "There is a group with this name already \"%s\""
-msgstr "Un groupe portant le nom « %s » existe déjà."
-
-#: rhodecode/model/forms.py:324
-msgid "This repository already exists"
-msgstr "Ce dépôt existe déjà"
-
-#: rhodecode/model/forms.py:367
+#: rhodecode/model/validators.py:288
+#, fuzzy, python-format
+#| msgid "Repository with this name already exists"
+msgid "Repositories group with name \"%(repo)s\" already exists"
+msgstr "Un dépôt portant ce nom existe déjà."
+
+#: rhodecode/model/validators.py:386
 msgid "invalid clone url"
 msgstr "URL de clonage invalide."
 
-#: rhodecode/model/forms.py:384
+#: rhodecode/model/validators.py:387
 msgid "Invalid clone url, provide a valid clone http\\s url"
 msgstr ""
 "URL à cloner invalide. Veuillez fournir une URL valide commençant par "
 "http(s)."
 
-#: rhodecode/model/forms.py:398
-msgid "Fork have to be the same type as original"
+#: rhodecode/model/validators.py:418
+#, fuzzy
+#| msgid "Fork have to be the same type as original"
+msgid "Fork have to be the same type as parent"
 msgstr "Le fork doit être du même type que l’original"
 
-#: rhodecode/model/forms.py:414
+#: rhodecode/model/validators.py:439
 msgid "This username or users group name is not valid"
 msgstr "Ce nom d’utilisateur ou de groupe n’est pas valide."
 
-#: rhodecode/model/forms.py:480
+#: rhodecode/model/validators.py:509
 msgid "This is not a valid path"
 msgstr "Ceci n’est pas un chemin valide"
 
-#: rhodecode/model/forms.py:494
+#: rhodecode/model/validators.py:524
 msgid "This e-mail address is already taken"
 msgstr "Cette adresse e-mail est déjà enregistrée"
 
-#: rhodecode/model/forms.py:507
-msgid "This e-mail address doesn't exist."
+#: rhodecode/model/validators.py:544
+#, fuzzy, python-format
+#| msgid "This e-mail address doesn't exist."
+msgid "e-mail \"%(email)s\" does not exist."
 msgstr "Cette adresse e-mail n’existe pas"
 
-#: rhodecode/model/forms.py:530
+#: rhodecode/model/validators.py:581
+#, fuzzy
+#| msgid "" "The LDAP Login attribute of the CN must be specified - this is the
+#| name " "of the attribute that is equivalent to 'username'"
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
-"of the attribute that is equivalent to 'username'"
+"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/forms.py:549
-msgid "Please enter a login"
-msgstr "Veuillez entrer un identifiant"
-
-#: rhodecode/model/forms.py:550
-#, 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:558
-msgid "Please enter a password"
-msgstr "Veuillez entrer un mot de passe"
-
-#: rhodecode/model/forms.py:559
-#, python-format
-msgid "Enter %(min)i characters or more"
-msgstr "Entrez au moins %(min)i caractères"
-
-#: rhodecode/model/notification.py:178
-msgid "commented on commit"
-msgstr "a posté un commentaire sur le commit"
-
-#: rhodecode/model/notification.py:179
-msgid "sent message"
-msgstr "a envoyé un message"
-
-#: rhodecode/model/notification.py:180
-msgid "mentioned you"
-msgstr "vous a mentioné"
-
-#: rhodecode/model/notification.py:181
-msgid "registered in RhodeCode"
-msgstr "s’est enregistré sur RhodeCode"
-
-#: rhodecode/model/user.py:235
-msgid "new user registration"
-msgstr "Nouveau compte utilisateur enregistré"
-
-#: rhodecode/model/user.py:259 rhodecode/model/user.py:279
-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:300
-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:306
-#, 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/templates/index.html:3
 msgid "Dashboard"
 msgstr "Tableau de bord"
@@ -1046,7 +1243,7 b' msgstr "Tableau de bord"'
 #: rhodecode/templates/admin/users/user_edit_my_account.html:31
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 #: rhodecode/templates/branches/branches.html:9
-#: rhodecode/templates/journal/journal.html:31
+#: rhodecode/templates/journal/journal.html:40
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
 msgstr "Filtre rapide…"
@@ -1074,16 +1271,16 b' msgstr "Nom de groupe"'
 #: rhodecode/templates/index_base.html:67
 #: rhodecode/templates/index_base.html:132
 #: rhodecode/templates/index_base.html:158
-#: rhodecode/templates/admin/repos/repo_add_base.html:47
-#: rhodecode/templates/admin/repos/repo_edit.html:66
+#: rhodecode/templates/admin/repos/repo_add_base.html:56
+#: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:37
 #: rhodecode/templates/admin/repos/repos.html:84
 #: 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:49
+#: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:57
-#: rhodecode/templates/summary/summary.html:100
+#: rhodecode/templates/summary/summary.html:105
 msgid "Description"
 msgstr "Description"
 
@@ -1098,20 +1295,21 b' msgstr "Groupe de d\xc3\xa9p\xc3\xb4ts"'
 #: rhodecode/templates/admin/repos/repo_edit.html:32
 #: rhodecode/templates/admin/repos/repos.html:36
 #: rhodecode/templates/admin/repos/repos.html:82
+#: rhodecode/templates/admin/users/user_edit.html:170
 #: rhodecode/templates/admin/users/user_edit_my_account.html:49
 #: rhodecode/templates/admin/users/user_edit_my_account.html:99
 #: rhodecode/templates/admin/users/user_edit_my_account.html:165
 #: rhodecode/templates/admin/users/user_edit_my_account.html:200
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:36
+#: rhodecode/templates/branches/branches.html:51
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:50
-#: rhodecode/templates/journal/journal.html:98
-#: rhodecode/templates/journal/journal.html:177
+#: rhodecode/templates/journal/journal.html:59
+#: rhodecode/templates/journal/journal.html:107
+#: rhodecode/templates/journal/journal.html:186
 #: rhodecode/templates/settings/repo_settings.html:31
-#: rhodecode/templates/summary/summary.html:38
-#: rhodecode/templates/summary/summary.html:114
+#: rhodecode/templates/summary/summary.html:43
+#: rhodecode/templates/summary/summary.html:119
 #: rhodecode/templates/tags/tags.html:36
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
@@ -1127,26 +1325,24 b' msgstr "Derni\xc3\xa8re modification"'
 #: rhodecode/templates/admin/repos/repos.html:39
 #: rhodecode/templates/admin/repos/repos.html:87
 #: rhodecode/templates/admin/users/user_edit_my_account.html:167
-#: rhodecode/templates/journal/journal.html:179
+#: rhodecode/templates/journal/journal.html:188
 msgid "Tip"
 msgstr "Sommet"
 
 #: rhodecode/templates/index_base.html:70
 #: rhodecode/templates/index_base.html:163
-#: rhodecode/templates/admin/repos/repo_edit.html:103
+#: rhodecode/templates/admin/repos/repo_edit.html:112
 #: rhodecode/templates/admin/repos/repos.html:89
 msgid "Owner"
 msgstr "Propriétaire"
 
 #: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/journal/public_journal.html:20
-#: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:46
+#: rhodecode/templates/summary/summary.html:48
+#: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr "RSS"
 
 #: rhodecode/templates/index_base.html:72
-#: rhodecode/templates/journal/public_journal.html:23
 msgid "Atom"
 msgstr "Atom"
 
@@ -1171,8 +1367,8 b' msgstr "Nom du groupe"'
 #: rhodecode/templates/admin/repos/repos.html:112
 #: rhodecode/templates/admin/users/user_edit_my_account.html:186
 #: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:60
-#: rhodecode/templates/journal/journal.html:202
+#: rhodecode/templates/branches/branches.html:77
+#: rhodecode/templates/journal/journal.html:211
 #: rhodecode/templates/tags/tags.html:60
 msgid "Click to sort ascending"
 msgstr "Tri ascendant"
@@ -1182,8 +1378,8 b' msgstr "Tri ascendant"'
 #: rhodecode/templates/admin/repos/repos.html:113
 #: rhodecode/templates/admin/users/user_edit_my_account.html:187
 #: rhodecode/templates/bookmarks/bookmarks.html:61
-#: rhodecode/templates/branches/branches.html:61
-#: rhodecode/templates/journal/journal.html:203
+#: rhodecode/templates/branches/branches.html:78
+#: rhodecode/templates/journal/journal.html:212
 #: rhodecode/templates/tags/tags.html:61
 msgid "Click to sort descending"
 msgstr "Tri descendant"
@@ -1197,8 +1393,8 b' msgstr "Derni\xc3\xa8re modification"'
 #: rhodecode/templates/admin/repos/repos.html:114
 #: rhodecode/templates/admin/users/user_edit_my_account.html:188
 #: rhodecode/templates/bookmarks/bookmarks.html:62
-#: rhodecode/templates/branches/branches.html:62
-#: rhodecode/templates/journal/journal.html:204
+#: rhodecode/templates/branches/branches.html:79
+#: rhodecode/templates/journal/journal.html:213
 #: rhodecode/templates/tags/tags.html:62
 msgid "No records found."
 msgstr "Aucun élément n’a été trouvé."
@@ -1207,8 +1403,8 b' msgstr "Aucun \xc3\xa9l\xc3\xa9ment n\xe2\x80\x99a \xc3\xa9t\xc3\xa9 trouv\xc3\xa9."'
 #: rhodecode/templates/admin/repos/repos.html:115
 #: rhodecode/templates/admin/users/user_edit_my_account.html:189
 #: rhodecode/templates/bookmarks/bookmarks.html:63
-#: rhodecode/templates/branches/branches.html:63
-#: rhodecode/templates/journal/journal.html:205
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:214
 #: rhodecode/templates/tags/tags.html:63
 msgid "Data error."
 msgstr "Erreur d’intégrité des données."
@@ -1217,8 +1413,8 b' msgstr "Erreur d\xe2\x80\x99int\xc3\xa9grit\xc3\xa9 des donn\xc3\xa9es."'
 #: rhodecode/templates/admin/repos/repos.html:116
 #: rhodecode/templates/admin/users/user_edit_my_account.html:190
 #: rhodecode/templates/bookmarks/bookmarks.html:64
-#: rhodecode/templates/branches/branches.html:64
-#: rhodecode/templates/journal/journal.html:206
+#: rhodecode/templates/branches/branches.html:81
+#: rhodecode/templates/journal/journal.html:215
 #: rhodecode/templates/tags/tags.html:64
 msgid "Loading..."
 msgstr "Chargement…"
@@ -1237,7 +1433,7 b' msgstr "Connexion \xc3\xa0"'
 #: 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:113
+#: rhodecode/templates/summary/summary.html:118
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
@@ -1310,7 +1506,7 b' msgstr "Nom"'
 #: rhodecode/templates/admin/users/user_add.html:77
 #: rhodecode/templates/admin/users/user_edit.html:104
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:115
+#: rhodecode/templates/summary/summary.html:120
 msgid "Email"
 msgstr "E-mail"
 
@@ -1323,8 +1519,8 b' msgid "Your account must wait for activa'
 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:56
-#: rhodecode/templates/admin/repos/repo_edit.html:76
+#: rhodecode/templates/admin/repos/repo_add_base.html:65
+#: rhodecode/templates/admin/repos/repo_edit.html:85
 #: rhodecode/templates/settings/repo_settings.html:67
 msgid "Private repository"
 msgstr "Dépôt privé"
@@ -1339,7 +1535,7 b' msgid "branches"'
 msgstr "Branches"
 
 #: rhodecode/templates/switch_to_list.html:10
-#: rhodecode/templates/branches/branches_data.html:51
+#: rhodecode/templates/branches/branches_data.html:57
 msgid "There are no branches yet"
 msgstr "Aucune branche n’a été créée pour le moment."
 
@@ -1374,8 +1570,8 b' msgstr "Historique d\xe2\x80\x99administration"'
 #: rhodecode/templates/admin/repos/repos.html:90
 #: rhodecode/templates/admin/users/user_edit_my_account.html:51
 #: rhodecode/templates/admin/users/user_edit_my_account.html:52
-#: rhodecode/templates/journal/journal.html:52
-#: rhodecode/templates/journal/journal.html:53
+#: rhodecode/templates/journal/journal.html:61
+#: rhodecode/templates/journal/journal.html:62
 msgid "Action"
 msgstr "Action"
 
@@ -1386,7 +1582,7 b' msgstr "D\xc3\xa9p\xc3\xb4t"'
 #: 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:37
+#: rhodecode/templates/branches/branches.html:52
 #: rhodecode/templates/tags/tags.html:37
 #: rhodecode/templates/tags/tags_data.html:7
 msgid "Date"
@@ -1489,10 +1685,26 b' msgid "My Notifications"'
 msgstr "Mes notifications"
 
 #: rhodecode/templates/admin/notifications/notifications.html:29
+msgid "All"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:30
+#, fuzzy
+#| msgid "commits"
+msgid "Comments"
+msgstr "commits"
+
+#: rhodecode/templates/admin/notifications/notifications.html:31
+#: rhodecode/templates/base/base.html:251
+#: rhodecode/templates/base/base.html:253
+msgid "Pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:35
 msgid "Mark all read"
 msgstr "Tout marquer comme lu"
 
-#: rhodecode/templates/admin/notifications/notifications_data.html:38
+#: rhodecode/templates/admin/notifications/notifications_data.html:34
 msgid "No notifications here yet"
 msgstr "Aucune notification pour le moment."
 
@@ -1510,7 +1722,7 b' msgid "Permissions administration"'
 msgstr "Gestion des permissions"
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:116
+#: rhodecode/templates/admin/repos/repo_edit.html:125
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
 #: rhodecode/templates/admin/users/user_edit.html:139
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
@@ -1553,7 +1765,7 b' msgid "Repository creation"'
 msgstr "Création de dépôt"
 
 #: rhodecode/templates/admin/permissions/permissions.html:71
-#: rhodecode/templates/admin/repos/repo_edit.html:218
+#: rhodecode/templates/admin/repos/repo_edit.html:227
 msgid "set"
 msgstr "Définir"
 
@@ -1570,8 +1782,8 b' msgid "Repositories"'
 msgstr "Dépôts"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:90
-#: rhodecode/templates/summary/summary.html:91
+#: rhodecode/templates/summary/summary.html:95
+#: rhodecode/templates/summary/summary.html:96
 msgid "Clone from"
 msgstr "Cloner depuis"
 
@@ -1584,15 +1796,16 b' msgstr "URL http(s) depuis laquelle le d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre clon\xc3\xa9."'
 #: 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:41
+#: 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/admin/repos/repo_edit.html:53
-#: rhodecode/templates/settings/repo_settings.html:52
-msgid "Optional select a group to put this repository into."
+#: rhodecode/templates/forks/fork.html:54
+#, fuzzy
+#| msgid "Optional select a group to put this repository into."
+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
@@ -1604,16 +1817,32 b' msgstr "Type"'
 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
+#, fuzzy
+#| msgid "next revision"
+msgid "Landing revision"
+msgstr "révision suivante"
+
 #: rhodecode/templates/admin/repos/repo_add_base.html:51
 #: rhodecode/templates/admin/repos/repo_edit.html:70
+#: rhodecode/templates/forks/fork.html:45
+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:61
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 "Gardez cette description précise et concise. Utilisez un fichier README "
 "pour des descriptions plus détaillées."
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:80
+#: 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:71
 msgid ""
 "Private repositories are only visible to people explicitly added as "
@@ -1622,7 +1851,7 b' 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:64
+#: rhodecode/templates/admin/repos/repo_add_base.html:73
 msgid "add"
 msgstr "Ajouter"
 
@@ -1638,8 +1867,8 b' msgstr "\xc3\x89diter le d\xc3\xa9p\xc3\xb4t"'
 #: rhodecode/templates/admin/users/user_edit.html:13
 #: rhodecode/templates/admin/users/user_edit_my_account.html:71
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/files/files_source.html:32
-#: rhodecode/templates/journal/journal.html:72
+#: rhodecode/templates/files/files_source.html:44
+#: rhodecode/templates/journal/journal.html:81
 msgid "edit"
 msgstr "éditer"
 
@@ -1648,83 +1877,95 b' msgstr "\xc3\xa9diter"'
 msgid "Clone uri"
 msgstr "URL de clone"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:85
-msgid "Enable statistics"
-msgstr "Activer les statistiques"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:89
-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: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 downloads"
-msgstr "Activer les téléchargements"
+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:108
+#: rhodecode/templates/admin/repos/repo_edit.html:117
 msgid "Change owner of this repository."
 msgstr "Changer le propriétaire de ce dépôt."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:134
+#: rhodecode/templates/admin/repos/repo_edit.html:143
 msgid "Administration"
 msgstr "Administration"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:137
+#: rhodecode/templates/admin/repos/repo_edit.html:146
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos/repo_edit.html:150
 msgid "Reset current statistics"
 msgstr "Réinitialiser les statistiques"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos/repo_edit.html:150
 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:144
+#: rhodecode/templates/admin/repos/repo_edit.html:153
 msgid "Fetched to rev"
 msgstr "Parcouru jusqu’à la révision"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:145
+#: rhodecode/templates/admin/repos/repo_edit.html:154
 msgid "Stats gathered"
 msgstr "Statistiques obtenues"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:153
+#: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Remote"
 msgstr "Dépôt distant"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:157
+#: rhodecode/templates/admin/repos/repo_edit.html:166
 msgid "Pull changes from remote location"
 msgstr "Récupérer les changements depuis le site distant"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:157
+#: rhodecode/templates/admin/repos/repo_edit.html:166
 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:168
+#: rhodecode/templates/admin/repos/repo_edit.html:177
 msgid "Cache"
 msgstr "Cache"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:172
+#: rhodecode/templates/admin/repos/repo_edit.html:181
 msgid "Invalidate repository cache"
 msgstr "Invalider le cache du dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:172
+#: rhodecode/templates/admin/repos/repo_edit.html:181
 msgid "Confirm to invalidate repository cache"
 msgstr "Voulez-vous vraiment invalider le cache du dépôt ?"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:183
+#: rhodecode/templates/admin/repos/repo_edit.html:186
+#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:319
+msgid "Public journal"
+msgstr "Journal public"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:192
 msgid "Remove from public journal"
 msgstr "Supprimer du journal public"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:185
+#: rhodecode/templates/admin/repos/repo_edit.html:194
 msgid "Add to public journal"
 msgstr "Ajouter le dépôt au journal public"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:190
+#: rhodecode/templates/admin/repos/repo_edit.html:199
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
@@ -1732,20 +1973,20 b' msgstr ""'
 "Le descriptif des actions réalisées sur ce dépôt sera visible à tous "
 "depuis le journal public."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:197
-#: rhodecode/templates/changeset/changeset_file_comment.html:19
+#: rhodecode/templates/admin/repos/repo_edit.html:206
+#: rhodecode/templates/changeset/changeset_file_comment.html:26
 msgid "Delete"
 msgstr "Supprimer"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:201
+#: rhodecode/templates/admin/repos/repo_edit.html:210
 msgid "Remove this repository"
 msgstr "Supprimer ce dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:201
+#: rhodecode/templates/admin/repos/repo_edit.html:210
 msgid "Confirm to delete this repository"
 msgstr "Voulez-vous vraiment supprimer ce dépôt ?"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:205
+#: rhodecode/templates/admin/repos/repo_edit.html:214
 msgid ""
 "This repository will be renamed in a special way in order to be "
 "unaccesible for RhodeCode and VCS systems.\n"
@@ -1757,12 +1998,16 b' msgstr ""'
 "Si vous voulez le supprimer complètement, effectuez la suppression "
 "manuellement."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:213
-msgid "Set as fork"
+#: rhodecode/templates/admin/repos/repo_edit.html:222
+#, fuzzy
+#| msgid "Set as fork"
+msgid "Set as fork of"
 msgstr "Indiquer comme fork"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:222
-msgid "Manually set this repository as a fork of another"
+#: rhodecode/templates/admin/repos/repo_edit.html:231
+#, fuzzy
+#| msgid "Manually set this repository as a fork of another"
+msgid "Manually set this repository as a fork of another from the list"
 msgstr "Permet d’indiquer manuellement que ce dépôt est un fork d’un autre dépôt."
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
@@ -1794,8 +2039,8 b' msgstr "Membre"'
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
 #: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/journal/journal.html:123
-#: rhodecode/templates/summary/summary.html:71
+#: rhodecode/templates/journal/journal.html:132
+#: rhodecode/templates/summary/summary.html:76
 msgid "private repository"
 msgstr "Dépôt privé"
 
@@ -1832,12 +2077,13 b' msgid "Repositories administration"'
 msgstr "Administration des dépôts"
 
 #: rhodecode/templates/admin/repos/repos.html:40
-#: rhodecode/templates/summary/summary.html:107
+#: rhodecode/templates/summary/summary.html:112
 msgid "Contact"
 msgstr "Contact"
 
 #: rhodecode/templates/admin/repos/repos.html:68
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+#: rhodecode/templates/admin/users/user_edit.html:222
 #: rhodecode/templates/admin/users/users.html:55
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 msgid "delete"
@@ -1895,10 +2141,12 b' msgstr "\xc3\x89dition du groupe de d\xc3\xa9p\xc3\xb4t"'
 #: rhodecode/templates/admin/settings/settings.html:177
 #: rhodecode/templates/admin/users/user_edit.html:130
 #: rhodecode/templates/admin/users/user_edit.html:155
+#: rhodecode/templates/admin/users/user_edit.html:245
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:116
 #: rhodecode/templates/files/files_add.html:82
 #: rhodecode/templates/files/files_edit.html:68
+#: rhodecode/templates/pullrequests/pullrequest.html:135
 #: rhodecode/templates/settings/repo_settings.html:85
 msgid "Reset"
 msgstr "Réinitialiser"
@@ -2156,6 +2404,36 b' msgstr "Confirmation du nouveau mot de p'
 msgid "Create repositories"
 msgstr "Création de dépôts"
 
+#: rhodecode/templates/admin/users/user_edit.html:171
+#: rhodecode/templates/admin/users/user_edit_my_account.html:100
+#: rhodecode/templates/admin/users/user_edit_my_account.html:201
+msgid "Permission"
+msgstr "Permission"
+
+#: rhodecode/templates/admin/users/user_edit.html:210
+#, fuzzy
+#| msgid "Email address"
+msgid "Email addresses"
+msgstr "Adresse e-mail"
+
+#: rhodecode/templates/admin/users/user_edit.html:223
+#, fuzzy, python-format
+#| msgid "Confirm to delete this user: %s"
+msgid "Confirm to delete this email: %s"
+msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?"
+
+#: rhodecode/templates/admin/users/user_edit.html:237
+#, fuzzy
+#| msgid "Email address"
+msgid "New email address"
+msgstr "Adresse e-mail"
+
+#: rhodecode/templates/admin/users/user_edit.html:244
+#, fuzzy
+#| msgid "add"
+msgid "Add"
+msgstr "Ajouter"
+
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
 #: rhodecode/templates/base/base.html:124
 msgid "My account"
@@ -2166,7 +2444,7 b' msgid "My Account"'
 msgstr "Mon compte"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:32
-#: rhodecode/templates/journal/journal.html:32
+#: rhodecode/templates/journal/journal.html:41
 msgid "My repos"
 msgstr "Mes dépôts"
 
@@ -2175,40 +2453,35 b' msgid "My permissions"'
 msgstr "Mes permissions"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:37
-#: rhodecode/templates/journal/journal.html:37
+#: rhodecode/templates/journal/journal.html:46
 msgid "ADD"
 msgstr "AJOUTER"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:50
 #: rhodecode/templates/bookmarks/bookmarks.html:40
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:40
-#: rhodecode/templates/journal/journal.html:51
+#: rhodecode/templates/branches/branches.html:55
+#: rhodecode/templates/journal/journal.html:60
 #: rhodecode/templates/tags/tags.html:40
 #: rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr "Révision"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:71
-#: rhodecode/templates/journal/journal.html:72
+#: rhodecode/templates/journal/journal.html:81
 msgid "private"
 msgstr "privé"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:81
-#: rhodecode/templates/journal/journal.html:85
+#: rhodecode/templates/journal/journal.html:94
 msgid "No repositories yet"
 msgstr "Aucun dépôt pour le moment"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:83
-#: rhodecode/templates/journal/journal.html:87
+#: rhodecode/templates/journal/journal.html:96
 msgid "create one now"
 msgstr "En créer un maintenant"
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:100
-#: rhodecode/templates/admin/users/user_edit_my_account.html:201
-msgid "Permission"
-msgstr "Permission"
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "Administration des utilisateurs"
@@ -2279,6 +2552,7 b' msgid "Choosen group members"'
 msgstr "Membres du groupe"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:61
+#: rhodecode/templates/pullrequests/pullrequest.html:81
 msgid "Remove all elements"
 msgstr "Tout enlever"
 
@@ -2287,6 +2561,7 b' msgid "Available members"'
 msgstr "Membres disponibles"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:79
+#: rhodecode/templates/pullrequests/pullrequest.html:99
 msgid "Add all elements"
 msgstr "Tout ajouter"
 
@@ -2337,18 +2612,37 b' msgid "Inbox"'
 msgstr "Boîte de réception"
 
 #: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:289
-#: rhodecode/templates/base/base.html:291
-#: rhodecode/templates/base/base.html:293
+#: rhodecode/templates/base/base.html:297
+#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:301
+#: rhodecode/templates/bookmarks/bookmarks.html:11
+#: rhodecode/templates/branches/branches.html:10
+#: rhodecode/templates/changelog/changelog.html:10
+#: rhodecode/templates/changeset/changeset.html:10
+#: rhodecode/templates/changeset/changeset_range.html:9
+#: rhodecode/templates/compare/compare_diff.html:9
+#: rhodecode/templates/files/file_diff.html:8
+#: rhodecode/templates/files/files.html:8
+#: rhodecode/templates/files/files_add.html:15
+#: rhodecode/templates/files/files_edit.html:15
+#: rhodecode/templates/followers/followers.html:9
+#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9
+#: rhodecode/templates/pullrequests/pullrequest.html:8
+#: rhodecode/templates/pullrequests/pullrequest_show.html:8
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
+#: rhodecode/templates/settings/repo_settings.html:9
+#: rhodecode/templates/shortlog/shortlog.html:10
+#: rhodecode/templates/summary/summary.html:8
+#: rhodecode/templates/tags/tags.html:11
 msgid "Home"
 msgstr "Accueil"
 
 #: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:298
-#: rhodecode/templates/base/base.html:300
-#: rhodecode/templates/base/base.html:302
+#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:308
+#: rhodecode/templates/base/base.html:310
 #: rhodecode/templates/journal/journal.html:4
-#: rhodecode/templates/journal/journal.html:17
+#: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr "Historique"
@@ -2426,10 +2720,6 b' msgstr "Fork"'
 msgid "search"
 msgstr "Rechercher"
 
-#: rhodecode/templates/base/base.html:217
-msgid "journal"
-msgstr "Journal"
-
 #: rhodecode/templates/base/base.html:219
 msgid "repositories groups"
 msgstr "Groupes de dépôts"
@@ -2456,12 +2746,10 b' msgstr "Followers"'
 msgid "Forks"
 msgstr "Forks"
 
-#: rhodecode/templates/base/base.html:316
-#: rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:320
-#: rhodecode/templates/search/search.html:4
-#: rhodecode/templates/search/search.html:24
-#: rhodecode/templates/search/search.html:46
+#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:328
+#: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "Rechercher"
 
@@ -2470,13 +2758,13 b' msgid "add another comment"'
 msgstr "Nouveau commentaire"
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:111
-#: rhodecode/templates/summary/summary.html:52
+#: rhodecode/templates/journal/journal.html:120
+#: 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:56
+#: rhodecode/templates/summary/summary.html:61
 msgid "Start following this repository"
 msgstr "Suivre ce dépôt"
 
@@ -2484,6 +2772,14 b' msgstr "Suivre ce d\xc3\xa9p\xc3\xb4t"'
 msgid "Group"
 msgstr "Groupe"
 
+#: rhodecode/templates/base/root.html:47
+msgid "search truncated"
+msgstr "Résultats tronqués"
+
+#: rhodecode/templates/base/root.html:48
+msgid "no matching files"
+msgstr "Aucun fichier ne correspond"
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
@@ -2491,7 +2787,7 b' msgstr "Signets de %s"'
 
 #: rhodecode/templates/bookmarks/bookmarks.html:39
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:39
+#: rhodecode/templates/branches/branches.html:54
 #: rhodecode/templates/tags/tags.html:39
 #: rhodecode/templates/tags/tags_data.html:8
 msgid "Author"
@@ -2502,6 +2798,20 b' msgstr "Auteur"'
 msgid "%s Branches"
 msgstr "Branches de %s"
 
+#: rhodecode/templates/branches/branches.html:29
+#, fuzzy
+#| msgid "branches"
+msgid "Compare branches"
+msgstr "Branches"
+
+#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/compare/compare_diff.html:5
+#: rhodecode/templates/compare/compare_diff.html:13
+#, fuzzy
+#| msgid "compare view"
+msgid "Compare"
+msgstr "vue de comparaison"
+
 #: rhodecode/templates/branches/branches_data.html:7
 msgid "date"
 msgstr "Date"
@@ -2516,6 +2826,12 b' msgstr "Auteur"'
 msgid "revision"
 msgstr "Révision"
 
+#: rhodecode/templates/branches/branches_data.html:10
+#, fuzzy
+#| msgid "compare view"
+msgid "compare"
+msgstr "vue de comparaison"
+
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
@@ -2528,36 +2844,64 b' msgid_plural "showing %d out of %d revis'
 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
+#, python-format
+msgid "compare fork with %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:37
+#, fuzzy
+#| msgid "compare view"
+msgid "Compare fork"
+msgstr "vue de comparaison"
+
+#: rhodecode/templates/changelog/changelog.html:39
+msgid "Open new pull request"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:44
 msgid "Show"
 msgstr "Afficher"
 
-#: rhodecode/templates/changelog/changelog.html:64
-#: rhodecode/templates/summary/summary.html:352
+#: rhodecode/templates/changelog/changelog.html:70
+#: rhodecode/templates/summary/summary.html:357
 msgid "show more"
 msgstr "montrer plus"
 
-#: rhodecode/templates/changelog/changelog.html:68
+#: rhodecode/templates/changelog/changelog.html:74
 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:82
-#: rhodecode/templates/changeset/changeset.html:72
+#: rhodecode/templates/changelog/changelog.html:87
+#: rhodecode/templates/changeset/changeset.html:38
+#: rhodecode/templates/changeset/changeset_file_comment.html:20
+#: rhodecode/templates/changeset/changeset_range.html:46
+#, fuzzy
+#| msgid "Changesets"
+msgid "Changeset status"
+msgstr "Changesets"
+
+#: rhodecode/templates/changelog/changelog.html:90
+msgid "Click to open associated pull request"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:100
+#: rhodecode/templates/changeset/changeset.html:78
 msgid "Parent"
 msgstr "Parent"
 
-#: rhodecode/templates/changelog/changelog.html:88
-#: rhodecode/templates/changeset/changeset.html:78
+#: rhodecode/templates/changelog/changelog.html:106
+#: rhodecode/templates/changeset/changeset.html:84
 msgid "No parents"
 msgstr "Aucun parent"
 
-#: rhodecode/templates/changelog/changelog.html:93
-#: rhodecode/templates/changeset/changeset.html:82
+#: rhodecode/templates/changelog/changelog.html:111
+#: rhodecode/templates/changeset/changeset.html:88
 msgid "merge"
 msgstr "Fusion"
 
-#: rhodecode/templates/changelog/changelog.html:96
-#: rhodecode/templates/changeset/changeset.html:85
+#: rhodecode/templates/changelog/changelog.html:114
+#: rhodecode/templates/changeset/changeset.html:91
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_add.html:33
 #: rhodecode/templates/files/files_edit.html:33
@@ -2565,44 +2909,44 b' msgstr "Fusion"'
 msgid "branch"
 msgstr "Branche"
 
-#: rhodecode/templates/changelog/changelog.html:102
+#: rhodecode/templates/changelog/changelog.html:120
 msgid "bookmark"
 msgstr "Signet"
 
-#: rhodecode/templates/changelog/changelog.html:108
-#: rhodecode/templates/changeset/changeset.html:90
+#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changeset/changeset.html:96
 msgid "tag"
 msgstr "Tag"
 
-#: rhodecode/templates/changelog/changelog.html:144
+#: rhodecode/templates/changelog/changelog.html:162
 msgid "Show selected changes __S -> __E"
 msgstr "Afficher les changements sélections de __S à __E"
 
-#: rhodecode/templates/changelog/changelog.html:235
+#: rhodecode/templates/changelog/changelog.html:253
 msgid "There are no changes yet"
 msgstr "Il n’y a aucun changement pour le moment"
 
-#: rhodecode/templates/changelog/changelog_details.html:2
-#: rhodecode/templates/changeset/changeset.html:60
+#: rhodecode/templates/changelog/changelog_details.html:4
+#: rhodecode/templates/changeset/changeset.html:66
 msgid "removed"
 msgstr "Supprimés"
 
-#: rhodecode/templates/changelog/changelog_details.html:3
-#: rhodecode/templates/changeset/changeset.html:61
+#: rhodecode/templates/changelog/changelog_details.html:5
+#: rhodecode/templates/changeset/changeset.html:67
 msgid "changed"
 msgstr "Modifiés"
 
-#: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:62
+#: rhodecode/templates/changelog/changelog_details.html:6
+#: rhodecode/templates/changeset/changeset.html:68
 msgid "added"
 msgstr "Ajoutés"
 
-#: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changelog/changelog_details.html:7
 #: rhodecode/templates/changelog/changelog_details.html:8
-#: rhodecode/templates/changeset/changeset.html:64
-#: rhodecode/templates/changeset/changeset.html:65
-#: rhodecode/templates/changeset/changeset.html:66
+#: 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
 #, python-format
 msgid "affected %s files"
 msgstr "%s fichiers affectés"
@@ -2616,96 +2960,109 b' msgstr "Changeset de %s"'
 msgid "Changeset"
 msgstr "Changements"
 
-#: rhodecode/templates/changeset/changeset.html:37
+#: rhodecode/templates/changeset/changeset.html:43
 #: rhodecode/templates/changeset/diff_block.html:20
 msgid "raw diff"
 msgstr "Diff brut"
 
-#: rhodecode/templates/changeset/changeset.html:38
+#: rhodecode/templates/changeset/changeset.html:44
 #: rhodecode/templates/changeset/diff_block.html:21
 msgid "download diff"
 msgstr "Télécharger le diff"
 
-#: rhodecode/templates/changeset/changeset.html:42
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+#: rhodecode/templates/changeset/changeset.html:48
+#: 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:42
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+#: rhodecode/templates/changeset/changeset.html:48
+#: 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:97
+#: 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:113
+#: rhodecode/templates/changeset/changeset.html:119
 msgid "Changeset was too big and was cut off..."
 msgstr "Cet ensemble de changements était trop important et a été découpé…"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:35
+#: rhodecode/templates/changeset/changeset_file_comment.html:42
 msgid "Submitting..."
 msgstr "Envoi…"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:38
+#: 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:39
-#: rhodecode/templates/changeset/changeset_file_comment.html:102
+#: rhodecode/templates/changeset/changeset_file_comment.html:46
+#: rhodecode/templates/changeset/changeset_file_comment.html:115
 #, 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."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:41
-#: rhodecode/templates/changeset/changeset_file_comment.html:104
+#: rhodecode/templates/changeset/changeset_file_comment.html:48
+#: rhodecode/templates/changeset/changeset_file_comment.html:117
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 "Utilisez @nomutilisateur dans ce texte pour envoyer une notification à "
 "l’utilisateur RhodeCode en question."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:49
-#: rhodecode/templates/changeset/changeset_file_comment.html:110
+#: rhodecode/templates/changeset/changeset_file_comment.html:59
+#: rhodecode/templates/changeset/changeset_file_comment.html:132
 msgid "Comment"
 msgstr "Commentaire"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:50
-#: rhodecode/templates/changeset/changeset_file_comment.html:61
+#: 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:57
+#: 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:57
+#: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "Login now"
 msgstr "Se connecter maintenant"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:99
+#: rhodecode/templates/changeset/changeset_file_comment.html:112
 msgid "Leave a comment"
 msgstr "Laisser un commentaire"
 
+#: rhodecode/templates/changeset/changeset_file_comment.html:118
+msgid "Check this to change current status of code-review for this changeset"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:118
+#, fuzzy
+#| msgid "Changesets"
+msgid "change status"
+msgstr "Changesets"
+
 #: 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:49
+#: rhodecode/templates/changeset/changeset_range.html:54
+#: rhodecode/templates/compare/compare_diff.html:41
+#: rhodecode/templates/pullrequests/pullrequest_show.html:71
 msgid "Files affected"
 msgstr "Fichiers affectés"
 
@@ -2717,6 +3074,18 b' msgstr "Diff"'
 msgid "show inline comments"
 msgstr "Afficher les commentaires"
 
+#: rhodecode/templates/compare/compare_cs.html:5
+#, fuzzy
+#| msgid "No changesets yet"
+msgid "No changesets"
+msgstr "Dépôt vide"
+
+#: rhodecode/templates/compare/compare_diff.html:37
+#, fuzzy
+#| msgid "No changesets yet"
+msgid "Outgoing changesets"
+msgstr "Dépôt vide"
+
 #: rhodecode/templates/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 #: rhodecode/templates/data_table/_dt_elements.html:37
@@ -2724,26 +3093,26 b' msgid "Fork"'
 msgstr "Fork"
 
 #: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/journal/journal.html:117
-#: rhodecode/templates/summary/summary.html:63
+#: rhodecode/templates/journal/journal.html:126
+#: rhodecode/templates/summary/summary.html:68
 msgid "Mercurial repository"
 msgstr "Dépôt Mercurial"
 
 #: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/journal/journal.html:119
-#: rhodecode/templates/summary/summary.html:66
+#: rhodecode/templates/journal/journal.html:128
+#: rhodecode/templates/summary/summary.html:71
 msgid "Git repository"
 msgstr "Dépôt Git"
 
 #: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/journal/journal.html:125
-#: rhodecode/templates/summary/summary.html:73
+#: rhodecode/templates/journal/journal.html:134
+#: rhodecode/templates/summary/summary.html:78
 msgid "public repository"
 msgstr "Dépôt public"
 
 #: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/summary/summary.html:82
-#: rhodecode/templates/summary/summary.html:83
+#: rhodecode/templates/summary/summary.html:87
+#: rhodecode/templates/summary/summary.html:88
 msgid "Fork of"
 msgstr "Fork de"
 
@@ -2755,7 +3124,7 b' msgstr "D\xc3\xa9p\xc3\xb4t vide"'
 msgid "This is an notification from RhodeCode."
 msgstr "Ceci est une notification de RhodeCode."
 
-#: rhodecode/templates/errors/error_document.html:44
+#: 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."
@@ -2775,18 +3144,10 b' msgid "%s Files"'
 msgstr "Fichiers de %s"
 
 #: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:328
+#: rhodecode/templates/summary/summary.html:333
 msgid "files"
 msgstr "Fichiers"
 
-#: rhodecode/templates/files/files.html:44
-msgid "search truncated"
-msgstr "Résultats tronqués"
-
-#: rhodecode/templates/files/files.html:45
-msgid "no matching files"
-msgstr "Aucun fichier ne correspond"
-
 #: rhodecode/templates/files/files_add.html:4
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
@@ -2894,18 +3255,18 b' msgid "edit file"'
 msgstr "Éditer le fichier"
 
 #: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:26
+#: rhodecode/templates/files/files_source.html:38
 msgid "show annotation"
 msgstr "Afficher les annotations"
 
 #: rhodecode/templates/files/files_edit.html:50
-#: rhodecode/templates/files/files_source.html:28
-#: rhodecode/templates/files/files_source.html:56
+#: rhodecode/templates/files/files_source.html:40
+#: rhodecode/templates/files/files_source.html:68
 msgid "show as raw"
 msgstr "montrer le fichier brut"
 
 #: rhodecode/templates/files/files_edit.html:51
-#: rhodecode/templates/files/files_source.html:29
+#: rhodecode/templates/files/files_source.html:41
 msgid "download as raw"
 msgstr "télécharger le fichier brut"
 
@@ -2921,20 +3282,40 b' msgstr "\xc3\x89dition du fichier"'
 msgid "History"
 msgstr "Historique"
 
-#: rhodecode/templates/files/files_source.html:24
+#: rhodecode/templates/files/files_source.html:9
+#, fuzzy
+#| msgid "next revision"
+msgid "diff to revision"
+msgstr "révision suivante"
+
+#: rhodecode/templates/files/files_source.html:10
+#, fuzzy
+#| msgid "next revision"
+msgid "show at revision"
+msgstr "révision suivante"
+
+#: rhodecode/templates/files/files_source.html:14
+#, fuzzy, python-format
+#| msgid "author"
+msgid "%s author"
+msgid_plural "%s authors"
+msgstr[0] "Auteur"
+msgstr[1] ""
+
+#: rhodecode/templates/files/files_source.html:36
 msgid "show source"
 msgstr "montrer les sources"
 
-#: rhodecode/templates/files/files_source.html:47
+#: rhodecode/templates/files/files_source.html:59
 #, python-format
 msgid "Binary file (%s)"
 msgstr "Fichier binaire (%s)"
 
-#: rhodecode/templates/files/files_source.html:56
+#: rhodecode/templates/files/files_source.html:68
 msgid "File is too big to display"
 msgstr "Ce fichier est trop gros pour être affiché."
 
-#: rhodecode/templates/files/files_source.html:112
+#: rhodecode/templates/files/files_source.html:124
 msgid "Selection link"
 msgstr "Lien vers la sélection"
 
@@ -2972,19 +3353,27 b' msgstr "Fork de %s"'
 msgid "Fork name"
 msgstr "Nom du fork"
 
-#: rhodecode/templates/forks/fork.html:57
+#: rhodecode/templates/forks/fork.html:68
 msgid "Private"
 msgstr "Privé"
 
-#: rhodecode/templates/forks/fork.html:65
+#: rhodecode/templates/forks/fork.html:77
 msgid "Copy permissions"
 msgstr "Copier les permissions"
 
-#: rhodecode/templates/forks/fork.html:73
+#: rhodecode/templates/forks/fork.html:81
+msgid "Copy permissions from forked repository"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:86
 msgid "Update after clone"
 msgstr "MÀJ après le clonage"
 
-#: rhodecode/templates/forks/fork.html:80
+#: 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 "Forker ce dépôt"
 
@@ -3005,23 +3394,48 b' msgstr "fork\xc3\xa9"'
 msgid "There are no forks yet"
 msgstr "Il n’y a pas encore de forks."
 
-#: rhodecode/templates/journal/journal.html:20
+#: rhodecode/templates/journal/journal.html:13
+#, fuzzy, python-format
+#| msgid "%s public journal %s feed"
+msgid "ATOM journal feed"
+msgstr "%s — Flux %s du journal public"
+
+#: rhodecode/templates/journal/journal.html:14
+#, fuzzy, python-format
+#| msgid "%s public journal %s feed"
+msgid "RSS journal feed"
+msgstr "%s — Flux %s du journal public"
+
+#: rhodecode/templates/journal/journal.html:24
+#: rhodecode/templates/pullrequests/pullrequest.html:27
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: rhodecode/templates/journal/journal.html:32
+#: rhodecode/templates/journal/journal.html:27
+#: rhodecode/templates/journal/public_journal.html:24
+#, fuzzy, python-format
+#| msgid "%s %s feed"
+msgid "RSS feed"
+msgstr "Flux %s de %s"
+
+#: 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 "Surveillé"
 
-#: rhodecode/templates/journal/journal.html:105
+#: rhodecode/templates/journal/journal.html:114
 msgid "following user"
 msgstr "utilisateur suivant"
 
-#: rhodecode/templates/journal/journal.html:105
+#: rhodecode/templates/journal/journal.html:114
 msgid "user"
 msgstr "utilisateur"
 
-#: rhodecode/templates/journal/journal.html:138
+#: rhodecode/templates/journal/journal.html:147
 msgid "You are not following any users or repositories"
 msgstr "Vous ne suivez aucun utilisateur ou dépôt"
 
@@ -3029,33 +3443,147 b' msgstr "Vous ne suivez aucun utilisateur ou d\xc3\xa9p\xc3\xb4t"'
 msgid "No entries yet"
 msgstr "Aucune entrée pour le moment"
 
-#: rhodecode/templates/journal/public_journal.html:17
+#: rhodecode/templates/journal/public_journal.html:13
+#, fuzzy, python-format
+#| msgid "%s public journal %s feed"
+msgid "ATOM public journal feed"
+msgstr "%s — Flux %s du journal public"
+
+#: rhodecode/templates/journal/public_journal.html:14
+#, fuzzy, python-format
+#| msgid "%s public journal %s feed"
+msgid "RSS public journal feed"
+msgstr "%s — Flux %s du journal public"
+
+#: rhodecode/templates/journal/public_journal.html:21
 msgid "Public Journal"
 msgstr "Journal public"
 
-#: rhodecode/templates/search/search.html:7
-#: rhodecode/templates/search/search.html:26
-msgid "in repository: "
+#: rhodecode/templates/pullrequests/pullrequest.html:4
+#: rhodecode/templates/pullrequests/pullrequest.html:12
+msgid "New pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:28
+msgid "refresh overview"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:66
+#, fuzzy
+#| msgid "compare view"
+msgid "Detailed compare view"
+msgstr "vue de comparaison"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:70
+#: rhodecode/templates/pullrequests/pullrequest_show.html:40
+msgid "Pull request reviewers"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:78
+msgid "Chosen reviewers"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:95
+#, fuzzy
+#| msgid "Available members"
+msgid "Available reviewers"
+msgstr "Membres disponibles"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:108
+#, fuzzy
+#| msgid "Create new file"
+msgid "Create new pull request"
+msgstr "Créer un nouveau fichier"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:117
+#: rhodecode/templates/pullrequests/pullrequest_show.html:23
+#, fuzzy
+#| msgid "write"
+msgid "Title"
+msgstr "Écriture"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:126
+#, fuzzy
+#| msgid "Description"
+msgid "description"
+msgstr "Description"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:134
+msgid "Send pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:4
+#: rhodecode/templates/pullrequests/pullrequest_show.html:12
+#, python-format
+msgid "Pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:26
+msgid "Pull request status"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:33
+#, fuzzy
+#| msgid "create one now"
+msgid "Created on"
+msgstr "En créer un maintenant"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:63
+#, fuzzy
+#| msgid "compare view"
+msgid "Compare view"
+msgstr "vue de comparaison"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:67
+#, fuzzy
+#| msgid "No changesets yet"
+msgid "Incoming changesets"
+msgstr "Dépôt vide"
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
+msgid "All pull requests"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:6
+#, fuzzy, python-format
+#| msgid "in repository: "
+msgid "Search \"%s\" in repository: %s"
 msgstr "dans le dépôt :"
 
-#: rhodecode/templates/search/search.html:9
-#: rhodecode/templates/search/search.html:28
-msgid "in all repositories"
+#: rhodecode/templates/search/search.html:8
+#, fuzzy, python-format
+#| msgid "in all repositories"
+msgid "Search \"%s\" in all repositories"
 msgstr "dans tous les dépôts"
 
-#: rhodecode/templates/search/search.html:42
+#: rhodecode/templates/search/search.html:12
+#: rhodecode/templates/search/search.html:32
+#, fuzzy, python-format
+#| msgid "in repository: "
+msgid "Search in repository: %s"
+msgstr "dans le dépôt :"
+
+#: rhodecode/templates/search/search.html:14
+#: rhodecode/templates/search/search.html:34
+#, fuzzy
+#| msgid "in all repositories"
+msgid "Search in all repositories"
+msgstr "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:54
+#: rhodecode/templates/search/search.html:60
 msgid "Search in"
 msgstr "Rechercher dans"
 
-#: rhodecode/templates/search/search.html:57
+#: rhodecode/templates/search/search.html:63
 msgid "File contents"
 msgstr "Le contenu des fichiers"
 
-#: rhodecode/templates/search/search.html:59
+#: rhodecode/templates/search/search.html:65
 msgid "File names"
 msgstr "Les noms de fichiers"
 
@@ -3107,120 +3635,132 b' msgstr "R\xc3\xa9sum\xc3\xa9 de %s"'
 msgid "summary"
 msgstr "résumé"
 
-#: rhodecode/templates/summary/summary.html:44
-#: rhodecode/templates/summary/summary.html:47
+#: rhodecode/templates/summary/summary.html:20
+#, fuzzy, python-format
+#| msgid "Subscribe to %s atom feed"
+msgid "repo %s ATOM feed"
+msgstr "S’abonner au flux ATOM de %s"
+
+#: rhodecode/templates/summary/summary.html:21
+#, fuzzy, python-format
+#| msgid "Subscribe to %s rss feed"
+msgid "repo %s RSS feed"
+msgstr "S’abonner au flux RSS de %s"
+
+#: rhodecode/templates/summary/summary.html:49
+#: rhodecode/templates/summary/summary.html:52
 msgid "ATOM"
 msgstr "ATOM"
 
-#: rhodecode/templates/summary/summary.html:77
+#: rhodecode/templates/summary/summary.html:82
 #, python-format
 msgid "Non changable ID %s"
 msgstr "Identifiant permanent : %s"
 
-#: rhodecode/templates/summary/summary.html:82
+#: rhodecode/templates/summary/summary.html:87
 msgid "public"
 msgstr "publique"
 
-#: rhodecode/templates/summary/summary.html:90
+#: rhodecode/templates/summary/summary.html:95
 msgid "remote clone"
 msgstr "Clone distant"
 
-#: rhodecode/templates/summary/summary.html:121
+#: rhodecode/templates/summary/summary.html:126
 msgid "Clone url"
 msgstr "URL de clone"
 
-#: rhodecode/templates/summary/summary.html:124
+#: rhodecode/templates/summary/summary.html:129
 msgid "Show by Name"
 msgstr "Afficher par nom"
 
-#: rhodecode/templates/summary/summary.html:125
+#: rhodecode/templates/summary/summary.html:130
 msgid "Show by ID"
 msgstr "Afficher par ID"
 
-#: rhodecode/templates/summary/summary.html:133
+#: rhodecode/templates/summary/summary.html:138
 msgid "Trending files"
 msgstr "Populaires"
 
-#: rhodecode/templates/summary/summary.html:141
-#: rhodecode/templates/summary/summary.html:157
-#: rhodecode/templates/summary/summary.html:185
+#: rhodecode/templates/summary/summary.html:146
+#: rhodecode/templates/summary/summary.html:162
+#: rhodecode/templates/summary/summary.html:190
 msgid "enable"
 msgstr "Activer"
 
-#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/templates/summary/summary.html:154
 msgid "Download"
 msgstr "Téléchargements"
 
-#: rhodecode/templates/summary/summary.html:153
+#: rhodecode/templates/summary/summary.html:158
 msgid "There are no downloads yet"
 msgstr "Il n’y a pas encore de téléchargements proposés."
 
-#: rhodecode/templates/summary/summary.html:155
+#: rhodecode/templates/summary/summary.html:160
 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:161
+#: rhodecode/templates/summary/summary.html:166
 msgid "Download as zip"
 msgstr "Télécharger en ZIP"
 
-#: rhodecode/templates/summary/summary.html:164
+#: rhodecode/templates/summary/summary.html:169
 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:164
+#: rhodecode/templates/summary/summary.html:169
 msgid "with subrepos"
 msgstr "avec les sous-dépôts"
 
-#: rhodecode/templates/summary/summary.html:177
+#: rhodecode/templates/summary/summary.html:182
 msgid "Commit activity by day / author"
 msgstr "Activité de commit par jour et par auteur"
 
-#: rhodecode/templates/summary/summary.html:188
+#: rhodecode/templates/summary/summary.html:193
 msgid "Stats gathered: "
 msgstr "Statistiques obtenues :"
 
-#: rhodecode/templates/summary/summary.html:209
+#: rhodecode/templates/summary/summary.html:214
 msgid "Shortlog"
 msgstr "Résumé des changements"
 
-#: rhodecode/templates/summary/summary.html:211
+#: rhodecode/templates/summary/summary.html:216
 msgid "Quick start"
 msgstr "Démarrage rapide"
 
-#: rhodecode/templates/summary/summary.html:281
+#: rhodecode/templates/summary/summary.html:286
 #, python-format
 msgid "Download %s as %s"
 msgstr "Télécharger %s comme archive %s"
 
-#: rhodecode/templates/summary/summary.html:638
+#: rhodecode/templates/summary/summary.html:643
 msgid "commits"
 msgstr "commits"
 
-#: rhodecode/templates/summary/summary.html:639
+#: rhodecode/templates/summary/summary.html:644
 msgid "files added"
 msgstr "fichiers ajoutés"
 
-#: rhodecode/templates/summary/summary.html:640
+#: rhodecode/templates/summary/summary.html:645
 msgid "files changed"
 msgstr "fichiers modifiés"
 
-#: rhodecode/templates/summary/summary.html:641
+#: rhodecode/templates/summary/summary.html:646
 msgid "files removed"
 msgstr "fichiers supprimés"
 
-#: rhodecode/templates/summary/summary.html:644
+#: rhodecode/templates/summary/summary.html:649
 msgid "commit"
 msgstr "commit"
 
-#: rhodecode/templates/summary/summary.html:645
+#: rhodecode/templates/summary/summary.html:650
 msgid "file added"
 msgstr "fichier ajouté"
 
-#: rhodecode/templates/summary/summary.html:646
+#: rhodecode/templates/summary/summary.html:651
 msgid "file changed"
 msgstr "fichié modifié"
 
-#: rhodecode/templates/summary/summary.html:647
+#: rhodecode/templates/summary/summary.html:652
 msgid "file removed"
 msgstr "fichier supprimé"
 
@@ -3229,3 +3769,18 b' msgstr "fichier supprim\xc3\xa9"'
 msgid "%s Tags"
 msgstr "Tags de %s"
 
+#~ msgid "Invalid username"
+#~ msgstr "Nom d’utilisateur invalide"
+
+#~ msgid "Invalid group name"
+#~ msgstr "Nom de groupe invalide"
+
+#~ msgid "This group already exists"
+#~ msgstr "Ce groupe existe déjà."
+
+#~ msgid "This username is not valid"
+#~ msgstr "Ce nom d’utilisateur n’est plus valide"
+
+#~ msgid "There is a group with this name already \"%s\""
+#~ msgstr "Un groupe portant le nom « %s » existe déjà."
+

rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode 1.2.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-06-03 01:06+0200\n"
+"POT-Creation-Date: 2012-07-02 11:58+0200\n"
 "PO-Revision-Date: 2012-05-22 16:47-0300\n"
 "Last-Translator: Augusto Herrmann <[e-mail]>\n"
 "Language-Team: pt_BR <[e-mail]>\n"
@@ -17,25 +17,25 b' msgstr ""'
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: rhodecode/controllers/changelog.py:95
+#: rhodecode/controllers/changelog.py:94
 msgid "All Branches"
 msgstr "Todos os Ramos"
 
-#: rhodecode/controllers/changeset.py:80
+#: rhodecode/controllers/changeset.py:81
 msgid "show white space"
 msgstr "mostrar espaços em branco"
 
-#: rhodecode/controllers/changeset.py:87 rhodecode/controllers/changeset.py:94
+#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95
 msgid "ignore white space"
 msgstr "ignorar espaços em branco"
 
-#: rhodecode/controllers/changeset.py:154
+#: rhodecode/controllers/changeset.py:155
 #, python-format
 msgid "%s line context"
 msgstr "contexto de %s linhas"
 
-#: rhodecode/controllers/changeset.py:324
-#: rhodecode/controllers/changeset.py:339 rhodecode/lib/diffs.py:62
+#: rhodecode/controllers/changeset.py:331
+#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69
 msgid "binary file"
 msgstr "arquivo binário"
 
@@ -69,16 +69,22 b' msgstr ""'
 "O servidor encontrou uma condição inesperada que o impediu de satisfazer "
 "a requisição"
 
-#: rhodecode/controllers/feed.py:48
+#: rhodecode/controllers/feed.py:49
 #, python-format
 msgid "Changes on %s repository"
 msgstr "Alterações no repositório %s"
 
-#: rhodecode/controllers/feed.py:49
+#: rhodecode/controllers/feed.py:50
 #, python-format
 msgid "%s %s feed"
 msgstr "%s - feed %s"
 
+#: rhodecode/controllers/feed.py:75
+#, fuzzy
+#| msgid "commit"
+msgid "commited on"
+msgstr "commit"
+
 #: rhodecode/controllers/files.py:86
 #: rhodecode/templates/admin/repos/repo_add.html:13
 msgid "add new"
@@ -89,72 +95,71 b' msgstr "adicionar novo"'
 msgid "There are no files yet %s"
 msgstr "Ainda não há arquivos %s"
 
-#: rhodecode/controllers/files.py:247
+#: rhodecode/controllers/files.py:256
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr "Editado %s via RhodeCode"
 
-#: rhodecode/controllers/files.py:252
+#: rhodecode/controllers/files.py:261
 msgid "No changes"
 msgstr "Sem alterações"
 
-#: rhodecode/controllers/files.py:263 rhodecode/controllers/files.py:316
+#: rhodecode/controllers/files.py:272 rhodecode/controllers/files.py:326
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Commit realizado com sucesso para %s"
 
-#: rhodecode/controllers/files.py:268 rhodecode/controllers/files.py:322
+#: rhodecode/controllers/files.py:277 rhodecode/controllers/files.py:332
 msgid "Error occurred during commit"
 msgstr "Ocorreu um erro ao realizar commit"
 
-#: rhodecode/controllers/files.py:288
+#: rhodecode/controllers/files.py:298
 #, python-format
 msgid "Added %s via RhodeCode"
 msgstr "Adicionado %s via RhodeCode"
 
-#: rhodecode/controllers/files.py:302
+#: rhodecode/controllers/files.py:312
 msgid "No content"
 msgstr "Nenhum conteúdo"
 
-#: rhodecode/controllers/files.py:306
+#: rhodecode/controllers/files.py:316
 msgid "No filename"
 msgstr "Nenhum nomes de arquivo"
 
-#: rhodecode/controllers/files.py:347
+#: rhodecode/controllers/files.py:358
 msgid "downloads disabled"
 msgstr "downloads desabilitados"
 
-#: rhodecode/controllers/files.py:358
+#: rhodecode/controllers/files.py:369
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Revisão desconhecida %s"
 
-#: rhodecode/controllers/files.py:360
+#: rhodecode/controllers/files.py:371
 msgid "Empty repository"
 msgstr "Repositório vazio"
 
-#: rhodecode/controllers/files.py:362
+#: rhodecode/controllers/files.py:373
 msgid "Unknown archive type"
 msgstr "Arquivo de tipo desconhecido"
 
-#: rhodecode/controllers/files.py:461
-#: rhodecode/templates/changeset/changeset_range.html:5
+#: rhodecode/controllers/files.py:474
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "Conjuntos de mudanças"
 
-#: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:230
-#: rhodecode/templates/branches/branches.html:5
+#: rhodecode/controllers/files.py:475 rhodecode/controllers/pullrequests.py:65
+#: rhodecode/controllers/summary.py:230 rhodecode/model/scm.py:497
 msgid "Branches"
 msgstr "Ramos"
 
-#: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:231
-#: rhodecode/templates/tags/tags.html:5
+#: rhodecode/controllers/files.py:476 rhodecode/controllers/pullrequests.py:69
+#: rhodecode/controllers/summary.py:231 rhodecode/model/scm.py:508
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: rhodecode/controllers/forks.py:69 rhodecode/controllers/admin/repos.py:86
+#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:88
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -165,7 +170,7 b' msgstr ""'
 "renomeado a partir do sistema de arquivos. Por favor execute a aplicação "
 "outra vez para varrer novamente por repositórios"
 
-#: rhodecode/controllers/forks.py:128 rhodecode/controllers/settings.py:69
+#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -176,29 +181,27 b' msgstr ""'
 "renomeado a partir do sistema de arquivos. Por favor execute a aplicação "
 "outra vez para varrer novamente por repositórios"
 
-#: rhodecode/controllers/forks.py:163
+#: rhodecode/controllers/forks.py:166
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "bifurcado repositório %s como %s"
 
-#: rhodecode/controllers/forks.py:177
+#: rhodecode/controllers/forks.py:180
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "Ocorreu um erro ao bifurcar o repositório %s"
 
-#: rhodecode/controllers/journal.py:53
-#, python-format
-msgid "%s public journal %s feed"
-msgstr "diário público de %s - feed %s"
-
-#: rhodecode/controllers/journal.py:190 rhodecode/controllers/journal.py:223
-#: rhodecode/templates/admin/repos/repo_edit.html:177
-#: rhodecode/templates/base/base.html:307
-#: rhodecode/templates/base/base.html:309
-#: rhodecode/templates/base/base.html:311
-msgid "Public journal"
+#: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239
+#, fuzzy
+#| msgid "Public journal"
+msgid "public journal"
 msgstr "Diário público"
 
+#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243
+#: rhodecode/templates/base/base.html:217
+msgid "journal"
+msgstr "diário"
+
 #: rhodecode/controllers/login.py:116
 msgid "You have successfully registered into rhodecode"
 msgstr "Você se registrou com sucesso no rhodecode"
@@ -215,6 +218,27 b' msgstr ""'
 "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao "
 "seu e-mail"
 
+#: rhodecode/controllers/pullrequests.py:67 rhodecode/model/scm.py:503
+msgid "Bookmarks"
+msgstr "Marcadores"
+
+#: rhodecode/controllers/pullrequests.py:117
+#, python-format
+msgid "%s (owner)"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:142
+#, fuzzy
+#| msgid "successfully deleted user"
+msgid "Successfully opened new pull request"
+msgstr "usuário excluído com sucesso"
+
+#: rhodecode/controllers/pullrequests.py:145
+#, fuzzy, python-format
+#| msgid "error occurred during creation of repository %s"
+msgid "Error occurred during sending pull request"
+msgstr "ocorreu um erro ao criar o repositório %s"
+
 #: rhodecode/controllers/search.py:114
 msgid "Invalid search query. Try quoting it."
 msgstr "Consulta de busca inválida. Tente usar aspas."
@@ -227,20 +251,20 b' msgstr "N\xc3\xa3o h\xc3\xa1 \xc3\xadndice onde pesquisa. Por favor execute o indexador whoosh"'
 msgid "An error occurred during this search operation"
 msgstr "Ocorreu um erro durante essa operação de busca"
 
-#: rhodecode/controllers/settings.py:103
-#: rhodecode/controllers/admin/repos.py:213
+#: rhodecode/controllers/settings.py:107
+#: rhodecode/controllers/admin/repos.py:221
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Repositório %s atualizado com sucesso"
 
-#: rhodecode/controllers/settings.py:121
-#: rhodecode/controllers/admin/repos.py:231
+#: rhodecode/controllers/settings.py:125
+#: rhodecode/controllers/admin/repos.py:239
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr "ocorreu um erro ao atualizar o repositório %s"
 
-#: rhodecode/controllers/settings.py:139
-#: rhodecode/controllers/admin/repos.py:249
+#: rhodecode/controllers/settings.py:143
+#: rhodecode/controllers/admin/repos.py:257
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from "
@@ -251,15 +275,15 b' msgstr ""'
 "renomeado a partir do sistema de arquivos. Por favor execute a aplicação "
 "outra vez para varrer novamente por repositórios"
 
-#: rhodecode/controllers/settings.py:151
-#: rhodecode/controllers/admin/repos.py:261
+#: rhodecode/controllers/settings.py:155
+#: rhodecode/controllers/admin/repos.py:269
 #, python-format
 msgid "deleted repository %s"
 msgstr "excluído o repositório %s"
 
-#: rhodecode/controllers/settings.py:155
-#: rhodecode/controllers/admin/repos.py:271
-#: rhodecode/controllers/admin/repos.py:277
+#: rhodecode/controllers/settings.py:159
+#: rhodecode/controllers/admin/repos.py:279
+#: rhodecode/controllers/admin/repos.py:285
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Ocorreu um erro durante a exclusão de %s"
@@ -269,7 +293,7 b' msgid "No data loaded yet"'
 msgstr "Ainda não há dados carregados"
 
 #: rhodecode/controllers/summary.py:142
-#: rhodecode/templates/summary/summary.html:139
+#: rhodecode/templates/summary/summary.html:144
 msgid "Statistics are disabled for this repository"
 msgstr "As estatísticas estão desabillitadas para este repositório"
 
@@ -360,9 +384,9 b' msgstr "Gravar"'
 #: 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:326
-#: rhodecode/templates/base/base.html:328
-#: rhodecode/templates/base/base.html:330
+#: rhodecode/templates/base/base.html:334
+#: rhodecode/templates/base/base.html:336
+#: rhodecode/templates/base/base.html:338
 msgid "Admin"
 msgstr "Administrador"
 
@@ -394,76 +418,76 b' msgstr "Permiss\xc3\xb5es padr\xc3\xb5es atualizadas com sucesso"'
 msgid "error occurred during update of permissions"
 msgstr "ocorreu um erro ao atualizar as permissões"
 
-#: rhodecode/controllers/admin/repos.py:116
+#: rhodecode/controllers/admin/repos.py:121
 msgid "--REMOVE FORK--"
 msgstr "--REMOVER BIFURCAÇÂO--"
 
-#: rhodecode/controllers/admin/repos.py:144
+#: rhodecode/controllers/admin/repos.py:151
 #, python-format
 msgid "created repository %s from %s"
 msgstr "repositório %s criado a partir de %s"
 
-#: rhodecode/controllers/admin/repos.py:148
+#: rhodecode/controllers/admin/repos.py:155
 #, python-format
 msgid "created repository %s"
 msgstr "repositório %s criado"
 
-#: rhodecode/controllers/admin/repos.py:179
+#: rhodecode/controllers/admin/repos.py:186
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr "ocorreu um erro ao criar o repositório %s"
 
-#: rhodecode/controllers/admin/repos.py:266
+#: rhodecode/controllers/admin/repos.py:274
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr "Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas"
 
-#: rhodecode/controllers/admin/repos.py:295
+#: rhodecode/controllers/admin/repos.py:303
 msgid "An error occurred during deletion of repository user"
 msgstr "Ocorreu um erro ao excluir usuário de repositório"
 
-#: rhodecode/controllers/admin/repos.py:314
+#: rhodecode/controllers/admin/repos.py:322
 msgid "An error occurred during deletion of repository users groups"
 msgstr "Ocorreu um erro ao excluir grupo de usuário de repositório"
 
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/admin/repos.py:339
 msgid "An error occurred during deletion of repository stats"
 msgstr "Ocorreu um erro ao excluir estatísticas de repositório"
 
-#: rhodecode/controllers/admin/repos.py:347
+#: rhodecode/controllers/admin/repos.py:355
 msgid "An error occurred during cache invalidation"
 msgstr "Ocorreu um erro ao invalidar o cache"
 
-#: rhodecode/controllers/admin/repos.py:367
+#: rhodecode/controllers/admin/repos.py:375
 msgid "Updated repository visibility in public journal"
 msgstr "Atualizada a visibilidade do repositório no diário público"
 
-#: rhodecode/controllers/admin/repos.py:371
+#: rhodecode/controllers/admin/repos.py:379
 msgid "An error occurred during setting this repository in public journal"
 msgstr "Ocorreu um erro ao ajustar esse repositório no diário público"
 
-#: rhodecode/controllers/admin/repos.py:376 rhodecode/model/forms.py:54
+#: rhodecode/controllers/admin/repos.py:384 rhodecode/model/validators.py:269
 msgid "Token mismatch"
 msgstr "Descompasso de Token"
 
-#: rhodecode/controllers/admin/repos.py:389
+#: rhodecode/controllers/admin/repos.py:397
 msgid "Pulled from remote location"
 msgstr "Realizado pull de localização remota"
 
-#: rhodecode/controllers/admin/repos.py:391
+#: rhodecode/controllers/admin/repos.py:399
 msgid "An error occurred during pull from remote location"
 msgstr "Ocorreu um erro ao realizar pull de localização remota"
 
-#: rhodecode/controllers/admin/repos.py:407
+#: rhodecode/controllers/admin/repos.py:415
 msgid "Nothing"
 msgstr "Nada"
 
-#: rhodecode/controllers/admin/repos.py:409
+#: rhodecode/controllers/admin/repos.py:417
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "Marcado repositório %s como bifurcação de %s"
 
-#: rhodecode/controllers/admin/repos.py:413
+#: rhodecode/controllers/admin/repos.py:421
 msgid "An error occurred during this operation"
 msgstr "Ocorreu um erro durante essa operação"
 
@@ -529,80 +553,97 b' msgid "Updated application settings"'
 msgstr "Configurações da aplicação atualizadas"
 
 #: rhodecode/controllers/admin/settings.py:159
-#: rhodecode/controllers/admin/settings.py:226
+#: rhodecode/controllers/admin/settings.py:227
 msgid "error occurred during updating application settings"
 msgstr "ocorreu um erro ao atualizar as configurações da aplicação"
 
-#: rhodecode/controllers/admin/settings.py:221
+#: rhodecode/controllers/admin/settings.py:222
 msgid "Updated mercurial settings"
 msgstr "Atualizadas as configurações do mercurial"
 
-#: rhodecode/controllers/admin/settings.py:246
+#: rhodecode/controllers/admin/settings.py:247
 msgid "Added new hook"
 msgstr "Adicionado novo gancho"
 
-#: rhodecode/controllers/admin/settings.py:258
+#: rhodecode/controllers/admin/settings.py:259
 msgid "Updated hooks"
 msgstr "Atualizados os ganchos"
 
-#: rhodecode/controllers/admin/settings.py:262
+#: rhodecode/controllers/admin/settings.py:263
 msgid "error occurred during hook creation"
 msgstr "ocorreu um erro ao criar gancho"
 
-#: rhodecode/controllers/admin/settings.py:281
+#: rhodecode/controllers/admin/settings.py:282
 msgid "Email task created"
 msgstr "Tarefa de e-mail criada"
 
-#: rhodecode/controllers/admin/settings.py:336
+#: rhodecode/controllers/admin/settings.py:337
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr "Você não pode editar esse usuário pois ele é crucial para toda a aplicação"
 
-#: rhodecode/controllers/admin/settings.py:367
+#: rhodecode/controllers/admin/settings.py:368
 msgid "Your account was updated successfully"
 msgstr "Sua conta foi atualizada com sucesso"
 
-#: rhodecode/controllers/admin/settings.py:387
-#: rhodecode/controllers/admin/users.py:138
+#: rhodecode/controllers/admin/settings.py:388
+#: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr "ocorreu um erro ao atualizar o usuário %s"
 
-#: rhodecode/controllers/admin/users.py:83
+#: rhodecode/controllers/admin/users.py:84
 #, python-format
 msgid "created user %s"
 msgstr "usuário %s criado"
 
-#: rhodecode/controllers/admin/users.py:95
+#: rhodecode/controllers/admin/users.py:96
 #, python-format
 msgid "error occurred during creation of user %s"
 msgstr "ocorreu um erro ao criar o usuário %s"
 
-#: rhodecode/controllers/admin/users.py:124
+#: rhodecode/controllers/admin/users.py:125
 msgid "User updated successfully"
 msgstr "Usuário atualizado com sucesso"
 
-#: rhodecode/controllers/admin/users.py:155
+#: rhodecode/controllers/admin/users.py:159
 msgid "successfully deleted user"
 msgstr "usuário excluído com sucesso"
 
-#: rhodecode/controllers/admin/users.py:160
+#: rhodecode/controllers/admin/users.py:164
 msgid "An error occurred during deletion of user"
 msgstr "Ocorreu um erro ao excluir o usuário"
 
-#: rhodecode/controllers/admin/users.py:175
+#: rhodecode/controllers/admin/users.py:178
 msgid "You can't edit this user"
 msgstr "Você não pode editar esse usuário"
 
-#: rhodecode/controllers/admin/users.py:205
+#: rhodecode/controllers/admin/users.py:210
 #: rhodecode/controllers/admin/users_groups.py:219
 msgid "Granted 'repository create' permission to user"
 msgstr "Concedida permissão de 'criar repositório' ao usuário"
 
-#: rhodecode/controllers/admin/users.py:214
+#: rhodecode/controllers/admin/users.py:219
 #: rhodecode/controllers/admin/users_groups.py:229
 msgid "Revoked 'repository create' permission to user"
 msgstr "Revogada permissão de 'criar repositório' ao usuário"
 
+#: rhodecode/controllers/admin/users.py:235
+#, python-format
+msgid "Added email %s to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:241
+#, fuzzy
+#| msgid "An error occurred during this operation"
+msgid "An error occurred during email saving"
+msgstr "Ocorreu um erro durante essa operação"
+
+#: rhodecode/controllers/admin/users.py:251
+#, fuzzy, python-format
+#| msgid "removed repos group %s"
+msgid "Removed email from user"
+msgstr "removido grupo de repositórios %s"
+
 #: rhodecode/controllers/admin/users_groups.py:84
 #, python-format
 msgid "created users group %s"
@@ -639,142 +680,146 b' msgstr "Voc\xc3\xaa precisa ser um usu\xc3\xa1rio registrado para realizar essa a\xc3\xa7\xc3\xa3o"'
 msgid "You need to be a signed in to view this page"
 msgstr "Você precisa estar logado para ver essa página"
 
-#: rhodecode/lib/diffs.py:78
+#: rhodecode/lib/diffs.py:85
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 "Conjunto de mudanças é grande demais e foi cortado, use o menu de "
 "diferenças para ver as diferenças"
 
-#: rhodecode/lib/diffs.py:88
+#: rhodecode/lib/diffs.py:95
 msgid "No changes detected"
 msgstr "Nenhuma alteração detectada"
 
-#: rhodecode/lib/helpers.py:415
+#: rhodecode/lib/helpers.py:369
+#, python-format
+msgid "%a, %d %b %Y %H:%M:%S"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:442
 msgid "True"
 msgstr "Verdadeiro"
 
-#: rhodecode/lib/helpers.py:419
+#: rhodecode/lib/helpers.py:446
 msgid "False"
 msgstr "Falso"
 
-#: rhodecode/lib/helpers.py:463
+#: rhodecode/lib/helpers.py:490
 msgid "Changeset not found"
 msgstr "Conjunto de alterações não encontrado"
 
-#: rhodecode/lib/helpers.py:486
+#: rhodecode/lib/helpers.py:513
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "Ver todos os conjuntos de mudanças combinados %s->%s"
 
-#: rhodecode/lib/helpers.py:492
+#: rhodecode/lib/helpers.py:519
 msgid "compare view"
 msgstr "comparar exibir"
 
-#: rhodecode/lib/helpers.py:512
+#: rhodecode/lib/helpers.py:539
 msgid "and"
 msgstr "e"
 
-#: rhodecode/lib/helpers.py:513
+#: rhodecode/lib/helpers.py:540
 #, python-format
 msgid "%s more"
 msgstr "%s mais"
 
-#: rhodecode/lib/helpers.py:514 rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46
 msgid "revisions"
 msgstr "revisões"
 
-#: rhodecode/lib/helpers.py:537
+#: rhodecode/lib/helpers.py:564
 msgid "fork name "
 msgstr "nome da bifurcação"
 
-#: rhodecode/lib/helpers.py:550
+#: rhodecode/lib/helpers.py:577
 msgid "[deleted] repository"
 msgstr "repositório [excluído]"
 
-#: rhodecode/lib/helpers.py:552 rhodecode/lib/helpers.py:562
+#: rhodecode/lib/helpers.py:579 rhodecode/lib/helpers.py:589
 msgid "[created] repository"
 msgstr "repositório [criado]"
 
-#: rhodecode/lib/helpers.py:554
+#: rhodecode/lib/helpers.py:581
 msgid "[created] repository as fork"
 msgstr "repositório [criado] como uma bifurcação"
 
-#: rhodecode/lib/helpers.py:556 rhodecode/lib/helpers.py:564
+#: rhodecode/lib/helpers.py:583 rhodecode/lib/helpers.py:591
 msgid "[forked] repository"
 msgstr "repositório [bifurcado]"
 
-#: rhodecode/lib/helpers.py:558 rhodecode/lib/helpers.py:566
+#: rhodecode/lib/helpers.py:585 rhodecode/lib/helpers.py:593
 msgid "[updated] repository"
 msgstr "repositório [atualizado]"
 
-#: rhodecode/lib/helpers.py:560
+#: rhodecode/lib/helpers.py:587
 msgid "[delete] repository"
 msgstr "[excluir] repositório"
 
-#: rhodecode/lib/helpers.py:568
-#, fuzzy, python-format
-#| msgid "created user %s"
+#: rhodecode/lib/helpers.py:595
+#, fuzzy
 msgid "[created] user"
 msgstr "usuário %s criado"
 
-#: rhodecode/lib/helpers.py:570
-#, fuzzy, python-format
-#| msgid "updated users group %s"
+#: rhodecode/lib/helpers.py:597
+#, fuzzy
 msgid "[updated] user"
 msgstr "grupo de usuários %s atualizado"
 
-#: rhodecode/lib/helpers.py:572
-#, fuzzy, python-format
-#| msgid "created users group %s"
+#: rhodecode/lib/helpers.py:599
+#, fuzzy
 msgid "[created] users group"
 msgstr "criado grupo de usuários %s"
 
-#: rhodecode/lib/helpers.py:574
-#, fuzzy, python-format
-#| msgid "updated users group %s"
+#: rhodecode/lib/helpers.py:601
+#, fuzzy
 msgid "[updated] users group"
 msgstr "grupo de usuários %s atualizado"
 
-#: rhodecode/lib/helpers.py:576
+#: rhodecode/lib/helpers.py:603
 #, fuzzy
-#| msgid "[created] repository"
 msgid "[commented] on revision in repository"
 msgstr "repositório [criado]"
 
-#: rhodecode/lib/helpers.py:578
+#: rhodecode/lib/helpers.py:605
+#, fuzzy
+#| msgid "[commented] on revision in repository"
+msgid "[commented] on pull request"
+msgstr "repositório [criado]"
+
+#: rhodecode/lib/helpers.py:607
 msgid "[pushed] into"
 msgstr "[realizado push] para"
 
-#: rhodecode/lib/helpers.py:580
+#: rhodecode/lib/helpers.py:609
 #, fuzzy
-#| msgid "[committed via RhodeCode] into"
 msgid "[committed via RhodeCode] into repository"
 msgstr "[realizado commit via RhodeCode] para"
 
-#: rhodecode/lib/helpers.py:582
+#: rhodecode/lib/helpers.py:611
 #, fuzzy
-#| msgid "[pulled from remote] into"
 msgid "[pulled from remote] into repository"
 msgstr "[realizado pull remoto] para"
 
-#: rhodecode/lib/helpers.py:584
+#: rhodecode/lib/helpers.py:613
 msgid "[pulled] from"
 msgstr "[realizado pull] a partir de"
 
-#: rhodecode/lib/helpers.py:586
+#: rhodecode/lib/helpers.py:615
 msgid "[started following] repository"
 msgstr "[passou a seguir] o repositório"
 
-#: rhodecode/lib/helpers.py:588
+#: rhodecode/lib/helpers.py:617
 msgid "[stopped following] repository"
 msgstr "[parou de seguir] o repositório"
 
-#: rhodecode/lib/helpers.py:752
+#: rhodecode/lib/helpers.py:781
 #, python-format
 msgid " and %s more"
 msgstr " e mais %s"
 
-#: rhodecode/lib/helpers.py:756
+#: rhodecode/lib/helpers.py:785
 msgid "No Files"
 msgstr "Nenhum Arquivo"
 
@@ -838,190 +883,185 b' msgstr "agora h\xc3\xa1 pouco"'
 msgid "password reset link"
 msgstr "link de reinicialização de senha"
 
-#: rhodecode/model/comment.py:85
+#: rhodecode/model/comment.py:109
 #, python-format
 msgid "on line %s"
 msgstr "na linha %s"
 
-#: rhodecode/model/comment.py:113
+#: rhodecode/model/comment.py:146
 msgid "[Mention]"
 msgstr "[Menção]"
 
-#: rhodecode/model/forms.py:72
-msgid "Invalid username"
-msgstr "Nome de usuário inválido"
-
-#: rhodecode/model/forms.py:80
-msgid "This username already exists"
-msgstr "Esse nome de usuário já existe"
-
-#: rhodecode/model/forms.py:85
-msgid ""
-"Username may only contain alphanumeric characters underscores, periods or"
-" dashes and must begin with alphanumeric character"
-msgstr ""
-"Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, "
-"pontos e hífens e deve iniciar com caractere alfanumérico"
-
-#: rhodecode/model/forms.py:101
-msgid "Invalid group name"
-msgstr "Nome de grupo inválido"
-
-#: rhodecode/model/forms.py:111
-msgid "This users group already exists"
-msgstr "Esse grupo de usuários já existe"
-
-#: rhodecode/model/forms.py:117
-msgid ""
-"RepoGroup name may only contain  alphanumeric characters underscores, "
-"periods or dashes and must begin with alphanumeric character"
+#: rhodecode/model/db.py:1062
+#, fuzzy
+#| msgid "repositories"
+msgid "Repository no access"
+msgstr "repositórios"
+
+#: rhodecode/model/db.py:1063
+#, fuzzy
+#| msgid "This repository already exists"
+msgid "Repository read access"
+msgstr "Esse repositório já existe"
+
+#: rhodecode/model/db.py:1064
+#, fuzzy
+#| msgid "repositories"
+msgid "Repository write access"
+msgstr "repositórios"
+
+#: rhodecode/model/db.py:1065
+#, fuzzy
+#| msgid "repositories"
+msgid "Repository admin access"
+msgstr "repositórios"
+
+#: rhodecode/model/db.py:1067
+#, fuzzy
+#| msgid "repositories groups"
+msgid "Repositories Group no access"
+msgstr "grupos de repositórios"
+
+#: rhodecode/model/db.py:1068
+#, fuzzy
+#| msgid "repositories groups"
+msgid "Repositories Group read access"
+msgstr "grupos de repositórios"
+
+#: rhodecode/model/db.py:1069
+#, fuzzy
+#| msgid "repositories groups"
+msgid "Repositories Group write access"
+msgstr "grupos de repositórios"
+
+#: rhodecode/model/db.py:1070
+#, fuzzy
+#| msgid "repositories groups"
+msgid "Repositories Group admin access"
+msgstr "grupos de repositórios"
+
+#: rhodecode/model/db.py:1072
+#, fuzzy
+#| msgid "Users administration"
+msgid "RhodeCode Administrator"
+msgstr "Administração de usuários"
+
+#: rhodecode/model/db.py:1073
+#, fuzzy
+#| msgid "Repository creation"
+msgid "Repository creation disabled"
+msgstr "Criação de repositório"
+
+#: rhodecode/model/db.py:1074
+#, fuzzy
+#| msgid "Repository creation"
+msgid "Repository creation enabled"
+msgstr "Criação de repositório"
+
+#: rhodecode/model/db.py:1075
+#, fuzzy
+#| msgid "disabled"
+msgid "Register disabled"
+msgstr "desabilitado"
+
+#: rhodecode/model/db.py:1076
+msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
-"Nome de grupo de repositório pode conter somente caracteres "
-"alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere "
-"alfanumérico"
-
-#: rhodecode/model/forms.py:145
-msgid "Cannot assign this group as parent"
-msgstr "Não é possível associar esse grupo como progenitor"
-
-#: rhodecode/model/forms.py:164
-msgid "This group already exists"
-msgstr "Esse grupo já existe"
-
-#: rhodecode/model/forms.py:176
-msgid "Repository with this name already exists"
-msgstr "Já existe um repositório com esse nome"
-
-#: rhodecode/model/forms.py:195 rhodecode/model/forms.py:204
-#: rhodecode/model/forms.py:213
-msgid "Invalid characters in password"
-msgstr "Caracteres inválidos na senha"
-
-#: rhodecode/model/forms.py:226
-msgid "Passwords do not match"
-msgstr "Senhas não conferem"
-
-#: rhodecode/model/forms.py:232
-msgid "invalid password"
-msgstr "senha inválida"
-
-#: rhodecode/model/forms.py:233
-msgid "invalid user name"
-msgstr "nome de usuário inválido"
-
-#: rhodecode/model/forms.py:234
-msgid "Your account is disabled"
-msgstr "Sua conta está desabilitada"
-
-#: rhodecode/model/forms.py:274
-msgid "This username is not valid"
-msgstr "Esse nome de usuário não é válido"
-
-#: rhodecode/model/forms.py:287
-msgid "This repository name is disallowed"
-msgstr "Esse nome de repositório não é permitido"
-
-#: rhodecode/model/forms.py:310
-#, python-format
-msgid "This repository already exists in a group \"%s\""
-msgstr "Esse repositório já existe em um grupo \"%s\""
-
-#: rhodecode/model/forms.py:317
-#, python-format
-msgid "There is a group with this name already \"%s\""
-msgstr "Já existe um grupo com esse nome \"%s\""
-
-#: rhodecode/model/forms.py:324
-msgid "This repository already exists"
-msgstr "Esse repositório já existe"
-
-#: rhodecode/model/forms.py:367
-msgid "invalid clone url"
-msgstr "URL de clonagem inválida"
-
-#: rhodecode/model/forms.py:384
-msgid "Invalid clone url, provide a valid clone http\\s url"
-msgstr "URL de clonagem inválida, forneça uma URL válida de clonagem http\\s"
-
-#: rhodecode/model/forms.py:398
-msgid "Fork have to be the same type as original"
-msgstr "Bifurcação precisa ser do mesmo tipo que o original"
-
-#: rhodecode/model/forms.py:414
-msgid "This username or users group name is not valid"
-msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido"
-
-#: rhodecode/model/forms.py:480
-msgid "This is not a valid path"
-msgstr "Esse não é um caminho válido"
-
-#: rhodecode/model/forms.py:494
-msgid "This e-mail address is already taken"
-msgstr "Esse endereço de e-mail já está tomado"
-
-#: rhodecode/model/forms.py:507
-msgid "This e-mail address doesn't exist."
-msgstr "Esse endereço de e-mail não existe."
-
-#: rhodecode/model/forms.py:530
-msgid ""
-"The LDAP Login attribute of the CN must be specified - this is the name "
-"of the attribute that is equivalent to 'username'"
+
+#: rhodecode/model/db.py:1079
+msgid "Register new user with RhodeCode with auto activation"
+msgstr ""
+
+#: rhodecode/model/db.py:1479
+msgid "Not Reviewed"
 msgstr ""
-"O atributo de login LDAP do CN deve ser especificado - isto é o nome do "
-"atributo que é equivalente ao 'nome de usuário'"
-
-#: rhodecode/model/forms.py:549
+
+#: rhodecode/model/db.py:1480
+#, fuzzy
+#| msgid "removed"
+msgid "Approved"
+msgstr "removidos"
+
+#: rhodecode/model/db.py:1481
+msgid "Rejected"
+msgstr ""
+
+#: rhodecode/model/db.py:1482
+msgid "Under Review"
+msgstr ""
+
+#: rhodecode/model/forms.py:43
 msgid "Please enter a login"
 msgstr "Por favor entre um login"
 
-#: rhodecode/model/forms.py:550
+#: rhodecode/model/forms.py:44
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr "Entre um valor com %(min)i caracteres ou mais"
 
-#: rhodecode/model/forms.py:558
+#: rhodecode/model/forms.py:52
 msgid "Please enter a password"
 msgstr "Por favor entre com uma senha"
 
-#: rhodecode/model/forms.py:559
+#: rhodecode/model/forms.py:53
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr "Entre com %(min)i caracteres ou mais"
 
-#: rhodecode/model/notification.py:175
+#: rhodecode/model/notification.py:203
 msgid "commented on commit"
 msgstr "comentado no commit"
 
-#: rhodecode/model/notification.py:176
+#: rhodecode/model/notification.py:204
 msgid "sent message"
 msgstr "mensagem enviada"
 
-#: rhodecode/model/notification.py:177
+#: rhodecode/model/notification.py:205
 msgid "mentioned you"
 msgstr "mencionou você"
 
-#: rhodecode/model/notification.py:178
+#: rhodecode/model/notification.py:206
 msgid "registered in RhodeCode"
 msgstr "registrado no RhodeCode"
 
-#: rhodecode/model/user.py:235
+#: rhodecode/model/notification.py:207
+msgid "opened new pull request"
+msgstr ""
+
+#: rhodecode/model/notification.py:208
+#, fuzzy
+#| msgid "commented on commit"
+msgid "commented on pull request"
+msgstr "comentado no commit"
+
+#: rhodecode/model/pull_request.py:75
+#, python-format
+msgid "%(user)s wants you to review pull request #%(pr_id)s"
+msgstr ""
+
+#: rhodecode/model/scm.py:489
+#, fuzzy
+#| msgid "last login"
+msgid "latest tip"
+msgstr "último login"
+
+#: rhodecode/model/user.py:238
 msgid "new user registration"
 msgstr "registro de novo usuário"
 
-#: rhodecode/model/user.py:259 rhodecode/model/user.py:279
+#: rhodecode/model/user.py:263 rhodecode/model/user.py:284
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 "Você não pode Editar esse usuário, pois ele é crucial para toda a "
 "aplicação"
 
-#: rhodecode/model/user.py:300
+#: rhodecode/model/user.py:306
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 "Você não pode remover esse usuário, pois ele é crucial para toda a "
 "aplicação"
 
-#: rhodecode/model/user.py:306
+#: rhodecode/model/user.py:312
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch "
@@ -1030,15 +1070,171 b' msgstr ""'
 "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. "
 "Troque os donos ou remova esses repositórios. %s"
 
+#: rhodecode/model/validators.py:52
+#, fuzzy, python-format
+#| msgid "This username already exists"
+msgid "Username \"%(username)s\" already exists"
+msgstr "Esse nome de usuário já existe"
+
+#: rhodecode/model/validators.py:54
+#, python-format
+msgid "Username \"%(username)s\" is forbidden"
+msgstr ""
+
+#: rhodecode/model/validators.py:56
+msgid ""
+"Username may only contain alphanumeric characters underscores, periods or"
+" dashes and must begin with alphanumeric character"
+msgstr ""
+"Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, "
+"pontos e hífens e deve iniciar com caractere alfanumérico"
+
+#: rhodecode/model/validators.py:84
+#, fuzzy, python-format
+#| msgid "This username or users group name is not valid"
+msgid "Username %(username)s is not valid"
+msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido"
+
+#: rhodecode/model/validators.py:103
+#, fuzzy
+#| msgid "invalid user name"
+msgid "Invalid users group name"
+msgstr "nome de usuário inválido"
+
+#: rhodecode/model/validators.py:104
+#, fuzzy, python-format
+#| msgid "This users group already exists"
+msgid "Users group \"%(usersgroup)s\" already exists"
+msgstr "Esse grupo de usuários já existe"
+
+#: rhodecode/model/validators.py:106
+#, fuzzy
+#| msgid "" "RepoGroup name may only contain  alphanumeric characters
+#| underscores, " "periods or dashes and must begin with alphanumeric
+#| character"
+msgid ""
+"users group name may only contain  alphanumeric characters underscores, "
+"periods or dashes and must begin with alphanumeric character"
+msgstr ""
+"Nome de grupo de repositório pode conter somente caracteres "
+"alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere "
+"alfanumérico"
+
+#: rhodecode/model/validators.py:144
+msgid "Cannot assign this group as parent"
+msgstr "Não é possível associar esse grupo como progenitor"
+
+#: rhodecode/model/validators.py:145
+#, fuzzy, python-format
+#| msgid "This username already exists"
+msgid "Group \"%(group_name)s\" already exists"
+msgstr "Esse nome de usuário já existe"
+
+#: rhodecode/model/validators.py:147
+#, fuzzy, python-format
+#| msgid "Repository with this name already exists"
+msgid "Repository with name \"%(group_name)s\" already exists"
+msgstr "Já existe um repositório com esse nome"
+
+#: rhodecode/model/validators.py:205
+#, fuzzy
+#| msgid "Invalid characters in password"
+msgid "Invalid characters (non-ascii) in password"
+msgstr "Caracteres inválidos na senha"
+
+#: rhodecode/model/validators.py:220
+msgid "Passwords do not match"
+msgstr "Senhas não conferem"
+
+#: rhodecode/model/validators.py:237
+msgid "invalid password"
+msgstr "senha inválida"
+
+#: rhodecode/model/validators.py:238
+msgid "invalid user name"
+msgstr "nome de usuário inválido"
+
+#: rhodecode/model/validators.py:239
+msgid "Your account is disabled"
+msgstr "Sua conta está desabilitada"
+
+#: rhodecode/model/validators.py:283
+#, fuzzy, python-format
+#| msgid "This repository name is disallowed"
+msgid "Repository name %(repo)s is disallowed"
+msgstr "Esse nome de repositório não é permitido"
+
+#: rhodecode/model/validators.py:285
+#, fuzzy, python-format
+#| msgid "Repository with this name already exists"
+msgid "Repository named %(repo)s already exists"
+msgstr "Já existe um repositório com esse nome"
+
+#: rhodecode/model/validators.py:286
+#, fuzzy, python-format
+#| msgid "This repository already exists in a group \"%s\""
+msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
+msgstr "Esse repositório já existe em um grupo \"%s\""
+
+#: rhodecode/model/validators.py:288
+#, fuzzy, python-format
+#| msgid "Repository with this name already exists"
+msgid "Repositories group with name \"%(repo)s\" already exists"
+msgstr "Já existe um repositório com esse nome"
+
+#: rhodecode/model/validators.py:386
+msgid "invalid clone url"
+msgstr "URL de clonagem inválida"
+
+#: rhodecode/model/validators.py:387
+msgid "Invalid clone url, provide a valid clone http\\s url"
+msgstr "URL de clonagem inválida, forneça uma URL válida de clonagem http\\s"
+
+#: rhodecode/model/validators.py:418
+#, fuzzy
+#| msgid "Fork have to be the same type as original"
+msgid "Fork have to be the same type as parent"
+msgstr "Bifurcação precisa ser do mesmo tipo que o original"
+
+#: rhodecode/model/validators.py:439
+msgid "This username or users group name is not valid"
+msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido"
+
+#: rhodecode/model/validators.py:509
+msgid "This is not a valid path"
+msgstr "Esse não é um caminho válido"
+
+#: rhodecode/model/validators.py:524
+msgid "This e-mail address is already taken"
+msgstr "Esse endereço de e-mail já está tomado"
+
+#: rhodecode/model/validators.py:544
+#, fuzzy, python-format
+#| msgid "This e-mail address doesn't exist."
+msgid "e-mail \"%(email)s\" does not exist."
+msgstr "Esse endereço de e-mail não existe."
+
+#: rhodecode/model/validators.py:581
+#, fuzzy
+#| msgid "" "The LDAP Login attribute of the CN must be specified - this is the
+#| name " "of the attribute that is equivalent to 'username'"
+msgid ""
+"The LDAP Login attribute of the CN must be specified - this is the name "
+"of the attribute that is equivalent to \"username\""
+msgstr ""
+"O atributo de login LDAP do CN deve ser especificado - isto é o nome do "
+"atributo que é equivalente ao 'nome de usuário'"
+
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr "Painel de Controle"
 
 #: rhodecode/templates/index_base.html:6
+#: rhodecode/templates/repo_switcher_list.html:4
 #: rhodecode/templates/admin/users/user_edit_my_account.html:31
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 #: rhodecode/templates/branches/branches.html:9
-#: rhodecode/templates/journal/journal.html:31
+#: rhodecode/templates/journal/journal.html:40
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
 msgstr "filtro rápido..."
@@ -1066,16 +1262,16 b' msgstr "Nome do grupo"'
 #: rhodecode/templates/index_base.html:67
 #: rhodecode/templates/index_base.html:132
 #: rhodecode/templates/index_base.html:158
-#: rhodecode/templates/admin/repos/repo_add_base.html:47
-#: rhodecode/templates/admin/repos/repo_edit.html:66
+#: rhodecode/templates/admin/repos/repo_add_base.html:56
+#: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:37
 #: rhodecode/templates/admin/repos/repos.html:84
 #: 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:49
+#: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:57
-#: rhodecode/templates/summary/summary.html:100
+#: rhodecode/templates/summary/summary.html:105
 msgid "Description"
 msgstr "Descrição"
 
@@ -1090,20 +1286,21 b' msgstr "Grupo de reposit\xc3\xb3rios"'
 #: rhodecode/templates/admin/repos/repo_edit.html:32
 #: rhodecode/templates/admin/repos/repos.html:36
 #: rhodecode/templates/admin/repos/repos.html:82
+#: rhodecode/templates/admin/users/user_edit.html:170
 #: rhodecode/templates/admin/users/user_edit_my_account.html:49
 #: rhodecode/templates/admin/users/user_edit_my_account.html:99
 #: rhodecode/templates/admin/users/user_edit_my_account.html:165
 #: rhodecode/templates/admin/users/user_edit_my_account.html:200
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:36
+#: rhodecode/templates/branches/branches.html:51
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:50
-#: rhodecode/templates/journal/journal.html:98
-#: rhodecode/templates/journal/journal.html:177
+#: rhodecode/templates/journal/journal.html:59
+#: rhodecode/templates/journal/journal.html:107
+#: rhodecode/templates/journal/journal.html:186
 #: rhodecode/templates/settings/repo_settings.html:31
-#: rhodecode/templates/summary/summary.html:38
-#: rhodecode/templates/summary/summary.html:114
+#: rhodecode/templates/summary/summary.html:43
+#: rhodecode/templates/summary/summary.html:119
 #: rhodecode/templates/tags/tags.html:36
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
@@ -1119,26 +1316,24 b' msgstr "\xc3\x9altima altera\xc3\xa7\xc3\xa3o"'
 #: rhodecode/templates/admin/repos/repos.html:39
 #: rhodecode/templates/admin/repos/repos.html:87
 #: rhodecode/templates/admin/users/user_edit_my_account.html:167
-#: rhodecode/templates/journal/journal.html:179
+#: rhodecode/templates/journal/journal.html:188
 msgid "Tip"
 msgstr "Ponta"
 
 #: rhodecode/templates/index_base.html:70
 #: rhodecode/templates/index_base.html:163
-#: rhodecode/templates/admin/repos/repo_edit.html:103
+#: rhodecode/templates/admin/repos/repo_edit.html:112
 #: rhodecode/templates/admin/repos/repos.html:89
 msgid "Owner"
 msgstr "Dono"
 
 #: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/journal/public_journal.html:20
-#: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:46
+#: rhodecode/templates/summary/summary.html:48
+#: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr "RSS"
 
 #: rhodecode/templates/index_base.html:72
-#: rhodecode/templates/journal/public_journal.html:23
 msgid "Atom"
 msgstr "Atom"
 
@@ -1163,8 +1358,8 b' msgstr "Nome do Grupo"'
 #: rhodecode/templates/admin/repos/repos.html:112
 #: rhodecode/templates/admin/users/user_edit_my_account.html:186
 #: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:60
-#: rhodecode/templates/journal/journal.html:202
+#: rhodecode/templates/branches/branches.html:77
+#: rhodecode/templates/journal/journal.html:211
 #: rhodecode/templates/tags/tags.html:60
 msgid "Click to sort ascending"
 msgstr "Clique para ordenar em ordem crescente"
@@ -1174,8 +1369,8 b' msgstr "Clique para ordenar em ordem cre'
 #: rhodecode/templates/admin/repos/repos.html:113
 #: rhodecode/templates/admin/users/user_edit_my_account.html:187
 #: rhodecode/templates/bookmarks/bookmarks.html:61
-#: rhodecode/templates/branches/branches.html:61
-#: rhodecode/templates/journal/journal.html:203
+#: rhodecode/templates/branches/branches.html:78
+#: rhodecode/templates/journal/journal.html:212
 #: rhodecode/templates/tags/tags.html:61
 msgid "Click to sort descending"
 msgstr "Clique para ordenar em ordem descrescente"
@@ -1189,8 +1384,8 b' msgstr "\xc3\x9altima Altera\xc3\xa7\xc3\xa3o"'
 #: rhodecode/templates/admin/repos/repos.html:114
 #: rhodecode/templates/admin/users/user_edit_my_account.html:188
 #: rhodecode/templates/bookmarks/bookmarks.html:62
-#: rhodecode/templates/branches/branches.html:62
-#: rhodecode/templates/journal/journal.html:204
+#: rhodecode/templates/branches/branches.html:79
+#: rhodecode/templates/journal/journal.html:213
 #: rhodecode/templates/tags/tags.html:62
 msgid "No records found."
 msgstr "Nenhum registro encontrado."
@@ -1199,8 +1394,8 b' msgstr "Nenhum registro encontrado."'
 #: rhodecode/templates/admin/repos/repos.html:115
 #: rhodecode/templates/admin/users/user_edit_my_account.html:189
 #: rhodecode/templates/bookmarks/bookmarks.html:63
-#: rhodecode/templates/branches/branches.html:63
-#: rhodecode/templates/journal/journal.html:205
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:214
 #: rhodecode/templates/tags/tags.html:63
 msgid "Data error."
 msgstr "Erro de dados."
@@ -1209,8 +1404,8 b' msgstr "Erro de dados."'
 #: rhodecode/templates/admin/repos/repos.html:116
 #: rhodecode/templates/admin/users/user_edit_my_account.html:190
 #: rhodecode/templates/bookmarks/bookmarks.html:64
-#: rhodecode/templates/branches/branches.html:64
-#: rhodecode/templates/journal/journal.html:206
+#: rhodecode/templates/branches/branches.html:81
+#: rhodecode/templates/journal/journal.html:215
 #: rhodecode/templates/tags/tags.html:64
 msgid "Loading..."
 msgstr "Carregando..."
@@ -1229,7 +1424,7 b' msgstr "Entrar em"'
 #: 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:113
+#: rhodecode/templates/summary/summary.html:118
 msgid "Username"
 msgstr "Nome de usuário"
 
@@ -1304,7 +1499,7 b' msgstr "\xc3\x9altimo Nome"'
 #: rhodecode/templates/admin/users/user_add.html:77
 #: rhodecode/templates/admin/users/user_edit.html:104
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:115
+#: rhodecode/templates/summary/summary.html:120
 msgid "Email"
 msgstr "E-mail"
 
@@ -1317,8 +1512,8 b' msgid "Your account must wait for activa'
 msgstr "Sua conta precisa esperar ativação por um administrador"
 
 #: rhodecode/templates/repo_switcher_list.html:11
-#: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:76
+#: rhodecode/templates/admin/repos/repo_add_base.html:65
+#: rhodecode/templates/admin/repos/repo_edit.html:85
 #: rhodecode/templates/settings/repo_settings.html:67
 msgid "Private repository"
 msgstr "Repositório privado"
@@ -1333,7 +1528,7 b' msgid "branches"'
 msgstr "ramos"
 
 #: rhodecode/templates/switch_to_list.html:10
-#: rhodecode/templates/branches/branches_data.html:51
+#: rhodecode/templates/branches/branches_data.html:57
 msgid "There are no branches yet"
 msgstr "Ainda não há ramos"
 
@@ -1368,8 +1563,8 b' msgstr "Di\xc3\xa1rio do administrador"'
 #: rhodecode/templates/admin/repos/repos.html:90
 #: rhodecode/templates/admin/users/user_edit_my_account.html:51
 #: rhodecode/templates/admin/users/user_edit_my_account.html:52
-#: rhodecode/templates/journal/journal.html:52
-#: rhodecode/templates/journal/journal.html:53
+#: rhodecode/templates/journal/journal.html:61
+#: rhodecode/templates/journal/journal.html:62
 msgid "Action"
 msgstr "Ação"
 
@@ -1380,7 +1575,7 b' msgstr "Reposit\xc3\xb3rio"'
 #: 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:37
+#: rhodecode/templates/branches/branches.html:52
 #: rhodecode/templates/tags/tags.html:37
 #: rhodecode/templates/tags/tags_data.html:7
 msgid "Date"
@@ -1483,10 +1678,26 b' msgid "My Notifications"'
 msgstr "Minhas Notificações"
 
 #: rhodecode/templates/admin/notifications/notifications.html:29
+msgid "All"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:30
+#, fuzzy
+#| msgid "commits"
+msgid "Comments"
+msgstr "commits"
+
+#: rhodecode/templates/admin/notifications/notifications.html:31
+#: rhodecode/templates/base/base.html:251
+#: rhodecode/templates/base/base.html:253
+msgid "Pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:35
 msgid "Mark all read"
 msgstr "Marcar tudo como lido"
 
-#: rhodecode/templates/admin/notifications/notifications_data.html:38
+#: rhodecode/templates/admin/notifications/notifications_data.html:34
 msgid "No notifications here yet"
 msgstr "Ainda não há notificações aqui"
 
@@ -1504,7 +1715,7 b' msgid "Permissions administration"'
 msgstr "Administração de permissões"
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:116
+#: rhodecode/templates/admin/repos/repo_edit.html:125
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
 #: rhodecode/templates/admin/users/user_edit.html:139
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
@@ -1547,7 +1758,7 b' msgid "Repository creation"'
 msgstr "Criação de repositório"
 
 #: rhodecode/templates/admin/permissions/permissions.html:71
-#: rhodecode/templates/admin/repos/repo_edit.html:218
+#: rhodecode/templates/admin/repos/repo_edit.html:227
 msgid "set"
 msgstr "ajustar"
 
@@ -1564,8 +1775,8 b' msgid "Repositories"'
 msgstr "Repositórios"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:90
-#: rhodecode/templates/summary/summary.html:91
+#: rhodecode/templates/summary/summary.html:95
+#: rhodecode/templates/summary/summary.html:96
 msgid "Clone from"
 msgstr "Clonar de"
 
@@ -1578,15 +1789,16 b' msgstr "URL opcional http[s] da qual o reposit\xc3\xb3rio deve ser clonado."'
 #: 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:41
+#: rhodecode/templates/forks/fork.html:50
 #: rhodecode/templates/settings/repo_settings.html:48
 msgid "Repository group"
 msgstr "Grupo de repositórios"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:33
-#: 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."
+#: rhodecode/templates/forks/fork.html:54
+#, fuzzy
+#| msgid "Optional select a group to put this repository into."
+msgid "Optionaly select a group to put this repository into."
 msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório."
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:38
@@ -1598,16 +1810,32 b' msgstr "Tipo"'
 msgid "Type of repository to create."
 msgstr "Tipo de repositório a criar."
 
+#: rhodecode/templates/admin/repos/repo_add_base.html:47
+#: rhodecode/templates/admin/repos/repo_edit.html:66
+#: rhodecode/templates/forks/fork.html:41
+#, fuzzy
+#| msgid "next revision"
+msgid "Landing revision"
+msgstr "próxima revisão"
+
 #: rhodecode/templates/admin/repos/repo_add_base.html:51
 #: rhodecode/templates/admin/repos/repo_edit.html:70
+#: rhodecode/templates/forks/fork.html:45
+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:61
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 "Seja sucinto e objetivo. Use um arquivo README para descrições mais "
 "longas."
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:80
+#: 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:71
 msgid ""
 "Private repositories are only visible to people explicitly added as "
@@ -1616,7 +1844,7 b' msgstr ""'
 "Repositórios privados são visíveis somente por pessoas explicitamente "
 "adicionadas como colaboradores."
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:64
+#: rhodecode/templates/admin/repos/repo_add_base.html:73
 msgid "add"
 msgstr "adicionar"
 
@@ -1632,8 +1860,8 b' msgstr "Editar reposit\xc3\xb3rio"'
 #: rhodecode/templates/admin/users/user_edit.html:13
 #: rhodecode/templates/admin/users/user_edit_my_account.html:71
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/files/files_source.html:32
-#: rhodecode/templates/journal/journal.html:72
+#: rhodecode/templates/files/files_source.html:44
+#: rhodecode/templates/journal/journal.html:81
 msgid "edit"
 msgstr "editar"
 
@@ -1642,83 +1870,95 b' msgstr "editar"'
 msgid "Clone uri"
 msgstr "URI de clonagem"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:85
-msgid "Enable statistics"
-msgstr "Habilitar estatísticas"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:89
-msgid "Enable statistics window on summary page."
-msgstr "Habilitar janela de estatísticas na página de sumário."
+#: 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 "Opcionalmente selecione um grupo no qual colocar esse repositório."
 
 #: rhodecode/templates/admin/repos/repo_edit.html:94
-msgid "Enable downloads"
-msgstr "Habilitar downloads"
+msgid "Enable statistics"
+msgstr "Habilitar estatísticas"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:98
+msgid "Enable statistics window on summary page."
+msgstr "Habilitar janela de estatísticas na página de sumário."
+
+#: rhodecode/templates/admin/repos/repo_edit.html:103
+msgid "Enable downloads"
+msgstr "Habilitar downloads"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:107
 msgid "Enable download menu on summary page."
 msgstr "Habilitar menu de descarregar na página de sumário."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:108
+#: rhodecode/templates/admin/repos/repo_edit.html:117
 msgid "Change owner of this repository."
 msgstr "Mudar o dono desse repositório."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:134
+#: rhodecode/templates/admin/repos/repo_edit.html:143
 msgid "Administration"
 msgstr "Administração"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:137
+#: rhodecode/templates/admin/repos/repo_edit.html:146
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos/repo_edit.html:150
 msgid "Reset current statistics"
 msgstr "Reinicializar estatísticas atuais"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos/repo_edit.html:150
 msgid "Confirm to remove current statistics"
 msgstr "Confirma remover atuais estatísticas"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:144
+#: rhodecode/templates/admin/repos/repo_edit.html:153
 msgid "Fetched to rev"
 msgstr "Trazida à rev"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:145
+#: rhodecode/templates/admin/repos/repo_edit.html:154
 msgid "Stats gathered"
 msgstr "Estatísticas coletadas"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:153
+#: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Remote"
 msgstr "Remoto"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:157
+#: rhodecode/templates/admin/repos/repo_edit.html:166
 msgid "Pull changes from remote location"
 msgstr "Realizar pull de alterações a partir de localização remota"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:157
+#: rhodecode/templates/admin/repos/repo_edit.html:166
 msgid "Confirm to pull changes from remote side"
 msgstr "Confirma realizar pull de alterações a partir de lado remoto"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:168
+#: rhodecode/templates/admin/repos/repo_edit.html:177
 msgid "Cache"
 msgstr "Cache"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:172
+#: rhodecode/templates/admin/repos/repo_edit.html:181
 msgid "Invalidate repository cache"
 msgstr "Invalidar cache do repositório"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:172
+#: rhodecode/templates/admin/repos/repo_edit.html:181
 msgid "Confirm to invalidate repository cache"
 msgstr "Confirma invalidar cache do repositório"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:183
+#: rhodecode/templates/admin/repos/repo_edit.html:186
+#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:319
+msgid "Public journal"
+msgstr "Diário público"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:192
 msgid "Remove from public journal"
 msgstr "Remover do diário público"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:185
+#: rhodecode/templates/admin/repos/repo_edit.html:194
 msgid "Add to public journal"
 msgstr "Adicionar ao diário público"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:190
+#: rhodecode/templates/admin/repos/repo_edit.html:199
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
@@ -1726,20 +1966,20 b' msgstr ""'
 "Todas as ações feitas nesse repositório serão acessíveis a todos no "
 "diário público"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:197
-#: rhodecode/templates/changeset/changeset_file_comment.html:19
+#: rhodecode/templates/admin/repos/repo_edit.html:206
+#: rhodecode/templates/changeset/changeset_file_comment.html:26
 msgid "Delete"
 msgstr "Excluir"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:201
+#: rhodecode/templates/admin/repos/repo_edit.html:210
 msgid "Remove this repository"
 msgstr "Remover deste repositório"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:201
+#: rhodecode/templates/admin/repos/repo_edit.html:210
 msgid "Confirm to delete this repository"
 msgstr "Confirma excluir este repositório"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:205
+#: rhodecode/templates/admin/repos/repo_edit.html:214
 msgid ""
 "This repository will be renamed in a special way in order to be "
 "unaccesible for RhodeCode and VCS systems.\n"
@@ -1751,12 +1991,16 b' msgstr ""'
 "                         Se você precisa exclui-lo completamente do "
 "sistema de arquivos, por favor faça-o manualmente"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:213
-msgid "Set as fork"
+#: rhodecode/templates/admin/repos/repo_edit.html:222
+#, fuzzy
+#| msgid "Set as fork"
+msgid "Set as fork of"
 msgstr "Marcar como bifurcação"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:222
-msgid "Manually set this repository as a fork of another"
+#: rhodecode/templates/admin/repos/repo_edit.html:231
+#, fuzzy
+#| msgid "Manually set this repository as a fork of another"
+msgid "Manually set this repository as a fork of another from the list"
 msgstr "Marcar manualmente este repositório como sendo uma bifurcação de outro"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
@@ -1788,11 +2032,19 b' msgstr "membro"'
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
 #: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/journal/journal.html:123
-#: rhodecode/templates/summary/summary.html:71
+#: rhodecode/templates/journal/journal.html:132
+#: rhodecode/templates/summary/summary.html:76
 msgid "private repository"
 msgstr "repositório privado"
 
+#: 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
+#, fuzzy
+#| msgid "delete"
+msgid "default"
+msgstr "excluir"
+
 #: 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
@@ -1820,12 +2072,13 b' msgid "Repositories administration"'
 msgstr "Administração de repositórios"
 
 #: rhodecode/templates/admin/repos/repos.html:40
-#: rhodecode/templates/summary/summary.html:107
+#: rhodecode/templates/summary/summary.html:112
 msgid "Contact"
 msgstr "Contato"
 
 #: rhodecode/templates/admin/repos/repos.html:68
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+#: rhodecode/templates/admin/users/user_edit.html:222
 #: rhodecode/templates/admin/users/users.html:55
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 msgid "delete"
@@ -1883,10 +2136,12 b' msgstr "editar grupo de reposit\xc3\xb3rios"'
 #: rhodecode/templates/admin/settings/settings.html:177
 #: rhodecode/templates/admin/users/user_edit.html:130
 #: rhodecode/templates/admin/users/user_edit.html:155
+#: rhodecode/templates/admin/users/user_edit.html:245
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:116
 #: rhodecode/templates/files/files_add.html:82
 #: rhodecode/templates/files/files_edit.html:68
+#: rhodecode/templates/pullrequests/pullrequest.html:135
 #: rhodecode/templates/settings/repo_settings.html:85
 msgid "Reset"
 msgstr "Limpar"
@@ -1925,7 +2180,6 b' msgstr "Administra\xc3\xa7\xc3\xa3o de configura\xc3\xa7\xc3\xb5es"'
 
 #: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:9
-#: rhodecode/templates/settings/repo_settings.html:5
 #: rhodecode/templates/settings/repo_settings.html:13
 msgid "Settings"
 msgstr "Configurações"
@@ -2146,6 +2400,36 b' msgstr "Confirma\xc3\xa7\xc3\xa3o de nova senha"'
 msgid "Create repositories"
 msgstr "Criar repositórios"
 
+#: rhodecode/templates/admin/users/user_edit.html:171
+#: rhodecode/templates/admin/users/user_edit_my_account.html:100
+#: rhodecode/templates/admin/users/user_edit_my_account.html:201
+msgid "Permission"
+msgstr "Permissão"
+
+#: rhodecode/templates/admin/users/user_edit.html:210
+#, fuzzy
+#| msgid "Email address"
+msgid "Email addresses"
+msgstr "Endereço de e-mail"
+
+#: rhodecode/templates/admin/users/user_edit.html:223
+#, fuzzy, python-format
+#| msgid "Confirm to delete this user: %s"
+msgid "Confirm to delete this email: %s"
+msgstr "Confirma excluir este usuário: %s"
+
+#: rhodecode/templates/admin/users/user_edit.html:237
+#, fuzzy
+#| msgid "Email address"
+msgid "New email address"
+msgstr "Endereço de e-mail"
+
+#: rhodecode/templates/admin/users/user_edit.html:244
+#, fuzzy
+#| msgid "add"
+msgid "Add"
+msgstr "adicionar"
+
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
 #: rhodecode/templates/base/base.html:124
 msgid "My account"
@@ -2156,7 +2440,7 b' msgid "My Account"'
 msgstr "Minha Conta"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:32
-#: rhodecode/templates/journal/journal.html:32
+#: rhodecode/templates/journal/journal.html:41
 msgid "My repos"
 msgstr "Meus repositórios"
 
@@ -2165,40 +2449,35 b' msgid "My permissions"'
 msgstr "Minhas permissões"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:37
-#: rhodecode/templates/journal/journal.html:37
+#: rhodecode/templates/journal/journal.html:46
 msgid "ADD"
 msgstr "ADICIONAR"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:50
 #: rhodecode/templates/bookmarks/bookmarks.html:40
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:40
-#: rhodecode/templates/journal/journal.html:51
+#: rhodecode/templates/branches/branches.html:55
+#: rhodecode/templates/journal/journal.html:60
 #: rhodecode/templates/tags/tags.html:40
 #: rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr "Revisão"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:71
-#: rhodecode/templates/journal/journal.html:72
+#: rhodecode/templates/journal/journal.html:81
 msgid "private"
 msgstr "privado"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:81
-#: rhodecode/templates/journal/journal.html:85
+#: rhodecode/templates/journal/journal.html:94
 msgid "No repositories yet"
 msgstr "Ainda não há repositórios"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:83
-#: rhodecode/templates/journal/journal.html:87
+#: rhodecode/templates/journal/journal.html:96
 msgid "create one now"
 msgstr "criar um agora"
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:100
-#: rhodecode/templates/admin/users/user_edit_my_account.html:201
-msgid "Permission"
-msgstr "Permissão"
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "Administração de usuários"
@@ -2269,6 +2548,7 b' msgid "Choosen group members"'
 msgstr "Membros escolhidos do grupo"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:61
+#: rhodecode/templates/pullrequests/pullrequest.html:81
 msgid "Remove all elements"
 msgstr "Remover todos os elementos"
 
@@ -2277,6 +2557,7 b' msgid "Available members"'
 msgstr "Membros disponíveis"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:79
+#: rhodecode/templates/pullrequests/pullrequest.html:99
 msgid "Add all elements"
 msgstr "Adicionar todos os elementos"
 
@@ -2327,18 +2608,37 b' msgid "Inbox"'
 msgstr "Caixa de Entrada"
 
 #: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:289
-#: rhodecode/templates/base/base.html:291
-#: rhodecode/templates/base/base.html:293
+#: rhodecode/templates/base/base.html:297
+#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:301
+#: 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 "Início"
 
 #: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:298
-#: rhodecode/templates/base/base.html:300
-#: rhodecode/templates/base/base.html:302
+#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:308
+#: rhodecode/templates/base/base.html:310
 #: rhodecode/templates/journal/journal.html:4
-#: rhodecode/templates/journal/journal.html:17
+#: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr "Diário"
@@ -2366,14 +2666,12 b' msgstr "carregando..."'
 #: rhodecode/templates/data_table/_dt_elements.html:9
 #: rhodecode/templates/data_table/_dt_elements.html:11
 #: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/summary/summary.html:4
 msgid "Summary"
 msgstr "Sumário"
 
 #: rhodecode/templates/base/base.html:166
 #: rhodecode/templates/base/base.html:168
 #: rhodecode/templates/base/base.html:170
-#: rhodecode/templates/changelog/changelog.html:6
 #: rhodecode/templates/changelog/changelog.html:15
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
@@ -2393,7 +2691,6 b' msgstr "Trocar para"'
 #: rhodecode/templates/data_table/_dt_elements.html:25
 #: rhodecode/templates/data_table/_dt_elements.html:27
 #: rhodecode/templates/data_table/_dt_elements.html:29
-#: rhodecode/templates/files/files.html:4
 #: rhodecode/templates/files/files.html:40
 msgid "Files"
 msgstr "Arquivos"
@@ -2419,10 +2716,6 b' msgstr "bifurca\xc3\xa7\xc3\xa3o"'
 msgid "search"
 msgstr "pesquisar"
 
-#: rhodecode/templates/base/base.html:217
-msgid "journal"
-msgstr "diário"
-
 #: rhodecode/templates/base/base.html:219
 msgid "repositories groups"
 msgstr "grupos de repositórios"
@@ -2441,22 +2734,18 b' msgstr "permiss\xc3\xb5es"'
 
 #: rhodecode/templates/base/base.html:235
 #: rhodecode/templates/base/base.html:237
-#: rhodecode/templates/followers/followers.html:5
 msgid "Followers"
 msgstr "Seguidores"
 
 #: rhodecode/templates/base/base.html:243
 #: rhodecode/templates/base/base.html:245
-#: rhodecode/templates/forks/forks.html:5
 msgid "Forks"
 msgstr "Bifurcações"
 
-#: rhodecode/templates/base/base.html:316
-#: rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:320
-#: rhodecode/templates/search/search.html:4
-#: rhodecode/templates/search/search.html:24
-#: rhodecode/templates/search/search.html:46
+#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:328
+#: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "Pesquisar"
 
@@ -2465,13 +2754,13 b' msgid "add another comment"'
 msgstr "adicionar outro comentário"
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:111
-#: rhodecode/templates/summary/summary.html:52
+#: rhodecode/templates/journal/journal.html:120
+#: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr "Parar de seguir este repositório"
 
 #: rhodecode/templates/base/root.html:44
-#: rhodecode/templates/summary/summary.html:56
+#: rhodecode/templates/summary/summary.html:61
 msgid "Start following this repository"
 msgstr "Passar a seguir este repositório"
 
@@ -2479,18 +2768,48 b' msgstr "Passar a seguir este reposit\xc3\xb3rio"'
 msgid "Group"
 msgstr "Grupo"
 
+#: rhodecode/templates/base/root.html:47
+msgid "search truncated"
+msgstr "pesquisa truncada"
+
+#: rhodecode/templates/base/root.html:48
+msgid "no matching files"
+msgstr "nenhum arquivo corresponde"
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
-msgid "Bookmarks"
-msgstr "Marcadores"
+#, fuzzy, python-format
+#| msgid "bookmarks"
+msgid "%s Bookmarks"
+msgstr "marcadores"
 
 #: rhodecode/templates/bookmarks/bookmarks.html:39
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:39
+#: rhodecode/templates/branches/branches.html:54
 #: rhodecode/templates/tags/tags.html:39
 #: rhodecode/templates/tags/tags_data.html:8
 msgid "Author"
 msgstr "Autor"
 
+#: rhodecode/templates/branches/branches.html:5
+#, fuzzy, python-format
+#| msgid "branches"
+msgid "%s Branches"
+msgstr "ramos"
+
+#: rhodecode/templates/branches/branches.html:29
+#, fuzzy
+#| msgid "branches"
+msgid "Compare branches"
+msgstr "ramos"
+
+#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/compare/compare_diff.html:5
+#: rhodecode/templates/compare/compare_diff.html:13
+#, fuzzy
+#| msgid "compare view"
+msgid "Compare"
+msgstr "comparar exibir"
+
 #: rhodecode/templates/branches/branches_data.html:7
 msgid "date"
 msgstr "data"
@@ -2505,6 +2824,18 b' msgstr "autor"'
 msgid "revision"
 msgstr "revisão"
 
+#: rhodecode/templates/branches/branches_data.html:10
+#, fuzzy
+#| msgid "compare view"
+msgid "compare"
+msgstr "comparar exibir"
+
+#: rhodecode/templates/changelog/changelog.html:6
+#, fuzzy, python-format
+#| msgid "Changelog"
+msgid "%s Changelog"
+msgstr "Registro de alterações"
+
 #: rhodecode/templates/changelog/changelog.html:15
 #, python-format
 msgid "showing %d out of %d revision"
@@ -2512,36 +2843,64 b' msgid_plural "showing %d out of %d revis'
 msgstr[0] "mostrando %d de % revisão"
 msgstr[1] "mostrando %d de % revisões"
 
-#: rhodecode/templates/changelog/changelog.html:38
+#: rhodecode/templates/changelog/changelog.html:37
+#, python-format
+msgid "compare fork with %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:37
+#, fuzzy
+#| msgid "compare view"
+msgid "Compare fork"
+msgstr "comparar exibir"
+
+#: rhodecode/templates/changelog/changelog.html:39
+msgid "Open new pull request"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:44
 msgid "Show"
 msgstr "Mostrar"
 
-#: rhodecode/templates/changelog/changelog.html:64
-#: rhodecode/templates/summary/summary.html:352
+#: rhodecode/templates/changelog/changelog.html:70
+#: rhodecode/templates/summary/summary.html:357
 msgid "show more"
 msgstr "mostrar mais"
 
-#: rhodecode/templates/changelog/changelog.html:68
+#: rhodecode/templates/changelog/changelog.html:74
 msgid "Affected number of files, click to show more details"
 msgstr "Número de arquivos afetados, clique para mostrar mais detalhes"
 
-#: rhodecode/templates/changelog/changelog.html:82
-#: rhodecode/templates/changeset/changeset.html:72
+#: rhodecode/templates/changelog/changelog.html:87
+#: rhodecode/templates/changeset/changeset.html:38
+#: rhodecode/templates/changeset/changeset_file_comment.html:20
+#: rhodecode/templates/changeset/changeset_range.html:46
+#, fuzzy
+#| msgid "Changesets"
+msgid "Changeset status"
+msgstr "Conjuntos de mudanças"
+
+#: rhodecode/templates/changelog/changelog.html:90
+msgid "Click to open associated pull request"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:100
+#: rhodecode/templates/changeset/changeset.html:78
 msgid "Parent"
 msgstr "Progenitor"
 
-#: rhodecode/templates/changelog/changelog.html:88
-#: rhodecode/templates/changeset/changeset.html:78
+#: rhodecode/templates/changelog/changelog.html:106
+#: rhodecode/templates/changeset/changeset.html:84
 msgid "No parents"
 msgstr "Sem progenitores"
 
-#: rhodecode/templates/changelog/changelog.html:93
-#: rhodecode/templates/changeset/changeset.html:82
+#: rhodecode/templates/changelog/changelog.html:111
+#: rhodecode/templates/changeset/changeset.html:88
 msgid "merge"
 msgstr "mesclar"
 
-#: rhodecode/templates/changelog/changelog.html:96
-#: rhodecode/templates/changeset/changeset.html:85
+#: rhodecode/templates/changelog/changelog.html:114
+#: rhodecode/templates/changeset/changeset.html:91
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_add.html:33
 #: rhodecode/templates/files/files_edit.html:33
@@ -2549,136 +2908,160 b' msgstr "mesclar"'
 msgid "branch"
 msgstr "ramo"
 
-#: rhodecode/templates/changelog/changelog.html:102
+#: rhodecode/templates/changelog/changelog.html:120
 msgid "bookmark"
 msgstr "marcador"
 
-#: rhodecode/templates/changelog/changelog.html:108
-#: rhodecode/templates/changeset/changeset.html:90
+#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changeset/changeset.html:96
 msgid "tag"
 msgstr "etiqueta"
 
-#: rhodecode/templates/changelog/changelog.html:144
+#: rhodecode/templates/changelog/changelog.html:162
 msgid "Show selected changes __S -> __E"
 msgstr "Mostrar alterações selecionadas __S -> __E"
 
-#: rhodecode/templates/changelog/changelog.html:235
+#: rhodecode/templates/changelog/changelog.html:253
 msgid "There are no changes yet"
 msgstr "Ainda não há alteações"
 
-#: rhodecode/templates/changelog/changelog_details.html:2
-#: rhodecode/templates/changeset/changeset.html:60
+#: rhodecode/templates/changelog/changelog_details.html:4
+#: rhodecode/templates/changeset/changeset.html:66
 msgid "removed"
 msgstr "removidos"
 
-#: rhodecode/templates/changelog/changelog_details.html:3
-#: rhodecode/templates/changeset/changeset.html:61
+#: rhodecode/templates/changelog/changelog_details.html:5
+#: rhodecode/templates/changeset/changeset.html:67
 msgid "changed"
 msgstr "alterados"
 
-#: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:62
+#: rhodecode/templates/changelog/changelog_details.html:6
+#: rhodecode/templates/changeset/changeset.html:68
 msgid "added"
 msgstr "adicionados"
 
-#: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changelog/changelog_details.html:7
 #: rhodecode/templates/changelog/changelog_details.html:8
-#: rhodecode/templates/changeset/changeset.html:64
-#: rhodecode/templates/changeset/changeset.html:65
-#: rhodecode/templates/changeset/changeset.html:66
+#: 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
 #, python-format
 msgid "affected %s files"
 msgstr "%s arquivos afetados"
 
 #: rhodecode/templates/changeset/changeset.html:6
+#, fuzzy, python-format
+#| msgid "Changeset"
+msgid "%s Changeset"
+msgstr "Conjunto de Mudanças"
+
 #: rhodecode/templates/changeset/changeset.html:14
 msgid "Changeset"
 msgstr "Conjunto de Mudanças"
 
-#: rhodecode/templates/changeset/changeset.html:37
+#: rhodecode/templates/changeset/changeset.html:43
 #: rhodecode/templates/changeset/diff_block.html:20
 msgid "raw diff"
 msgstr "diff bruto"
 
-#: rhodecode/templates/changeset/changeset.html:38
+#: rhodecode/templates/changeset/changeset.html:44
 #: rhodecode/templates/changeset/diff_block.html:21
 msgid "download diff"
 msgstr "descarregar diff"
 
-#: rhodecode/templates/changeset/changeset.html:42
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+#: rhodecode/templates/changeset/changeset.html:48
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d comentário"
 msgstr[1] "%d comentários"
 
-#: rhodecode/templates/changeset/changeset.html:42
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+#: rhodecode/templates/changeset/changeset.html:48
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
 msgstr[0] "(%d em linha)"
 msgstr[1] "(%d em linha)"
 
-#: rhodecode/templates/changeset/changeset.html:97
+#: rhodecode/templates/changeset/changeset.html:103
 #, python-format
 msgid "%s files affected with %s insertions and %s deletions:"
 msgstr "%s arquivos afetados com %s inserções e %s exclusões"
 
-#: rhodecode/templates/changeset/changeset.html:113
+#: rhodecode/templates/changeset/changeset.html:119
 msgid "Changeset was too big and was cut off..."
 msgstr "Conjunto de mudanças era grande demais e foi cortado..."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:35
+#: rhodecode/templates/changeset/changeset_file_comment.html:42
 msgid "Submitting..."
 msgstr "Enviando..."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:38
+#: rhodecode/templates/changeset/changeset_file_comment.html:45
 msgid "Commenting on line {1}."
 msgstr "Comentando a linha {1}."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:39
-#: rhodecode/templates/changeset/changeset_file_comment.html:102
+#: rhodecode/templates/changeset/changeset_file_comment.html:46
+#: rhodecode/templates/changeset/changeset_file_comment.html:115
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr "Comentários interpretados usando a sintaxe %s com suporte a %s."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:41
-#: rhodecode/templates/changeset/changeset_file_comment.html:104
+#: rhodecode/templates/changeset/changeset_file_comment.html:48
+#: rhodecode/templates/changeset/changeset_file_comment.html:117
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 "Use @nomedeusuário dentro desse texto para enviar notificação a este "
 "usuário do RhodeCode"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:49
-#: rhodecode/templates/changeset/changeset_file_comment.html:110
+#: rhodecode/templates/changeset/changeset_file_comment.html:59
+#: rhodecode/templates/changeset/changeset_file_comment.html:132
 msgid "Comment"
 msgstr "Comentário"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:50
-#: rhodecode/templates/changeset/changeset_file_comment.html:61
+#: rhodecode/templates/changeset/changeset_file_comment.html:60
+#: rhodecode/templates/changeset/changeset_file_comment.html:71
 msgid "Hide"
 msgstr "Ocultar"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:57
+#: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "You need to be logged in to comment."
 msgstr "Você precisa estar logado para comentar."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:57
+#: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "Login now"
 msgstr "Entrar agora"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:99
+#: rhodecode/templates/changeset/changeset_file_comment.html:112
 msgid "Leave a comment"
 msgstr "Deixar um comentário"
 
+#: rhodecode/templates/changeset/changeset_file_comment.html:118
+msgid "Check this to change current status of code-review for this changeset"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:118
+#, fuzzy
+#| msgid "Changesets"
+msgid "change status"
+msgstr "Conjuntos de mudanças"
+
+#: rhodecode/templates/changeset/changeset_range.html:5
+#, fuzzy, python-format
+#| msgid "Changesets"
+msgid "%s Changesets"
+msgstr "Conjuntos de mudanças"
+
 #: rhodecode/templates/changeset/changeset_range.html:29
+#: rhodecode/templates/compare/compare_diff.html:29
 msgid "Compare View"
 msgstr "Exibir Comparação"
 
-#: rhodecode/templates/changeset/changeset_range.html:49
+#: rhodecode/templates/changeset/changeset_range.html:54
+#: rhodecode/templates/compare/compare_diff.html:41
+#: rhodecode/templates/pullrequests/pullrequest_show.html:71
 msgid "Files affected"
 msgstr "Arquivos afetados"
 
@@ -2690,34 +3073,45 b' msgstr "diff"'
 msgid "show inline comments"
 msgstr "mostrar comentários em linha"
 
+#: rhodecode/templates/compare/compare_cs.html:5
+#, fuzzy
+#| msgid "No changesets yet"
+msgid "No changesets"
+msgstr "Nenhum conjunto de alterações ainda."
+
+#: rhodecode/templates/compare/compare_diff.html:37
+#, fuzzy
+#| msgid "No changesets yet"
+msgid "Outgoing changesets"
+msgstr "Nenhum conjunto de alterações ainda."
+
 #: rhodecode/templates/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 #: rhodecode/templates/data_table/_dt_elements.html:37
-#: rhodecode/templates/forks/fork.html:5
 msgid "Fork"
 msgstr "Bifurcação"
 
 #: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/journal/journal.html:117
-#: rhodecode/templates/summary/summary.html:63
+#: rhodecode/templates/journal/journal.html:126
+#: rhodecode/templates/summary/summary.html:68
 msgid "Mercurial repository"
 msgstr "Repositório Mercurial"
 
 #: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/journal/journal.html:119
-#: rhodecode/templates/summary/summary.html:66
+#: rhodecode/templates/journal/journal.html:128
+#: rhodecode/templates/summary/summary.html:71
 msgid "Git repository"
 msgstr "Repositório Git"
 
 #: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/journal/journal.html:125
-#: rhodecode/templates/summary/summary.html:73
+#: rhodecode/templates/journal/journal.html:134
+#: rhodecode/templates/summary/summary.html:78
 msgid "public repository"
 msgstr "repositório público"
 
 #: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/summary/summary.html:82
-#: rhodecode/templates/summary/summary.html:83
+#: rhodecode/templates/summary/summary.html:87
+#: rhodecode/templates/summary/summary.html:88
 msgid "Fork of"
 msgstr "Bifurcação de"
 
@@ -2729,33 +3123,38 b' msgstr "Nenhum conjunto de altera\xc3\xa7\xc3\xb5es ainda."'
 msgid "This is an notification from RhodeCode."
 msgstr "Esta é uma notificação do RhodeCode."
 
-#: rhodecode/templates/errors/error_document.html:44
+#: rhodecode/templates/errors/error_document.html:46
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr "Você será redirecionado para %s em %s segundos"
 
 #: rhodecode/templates/files/file_diff.html:4
+#, fuzzy, python-format
+#| msgid "File diff"
+msgid "%s File diff"
+msgstr "Diff do arquivo"
+
 #: rhodecode/templates/files/file_diff.html:12
 msgid "File diff"
 msgstr "Diff do arquivo"
 
+#: rhodecode/templates/files/files.html:4
+#, fuzzy, python-format
+#| msgid "files"
+msgid "%s Files"
+msgstr "arquivos"
+
 #: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:328
+#: rhodecode/templates/summary/summary.html:333
 msgid "files"
 msgstr "arquivos"
 
-#: rhodecode/templates/files/files.html:44
-msgid "search truncated"
-msgstr "pesquisa truncada"
-
-#: rhodecode/templates/files/files.html:45
-msgid "no matching files"
-msgstr "nenhum arquivo corresponde"
-
 #: rhodecode/templates/files/files_add.html:4
 #: rhodecode/templates/files/files_edit.html:4
-msgid "Edit file"
-msgstr "Editar arquivo"
+#, fuzzy, python-format
+#| msgid "edit file"
+msgid "%s Edit file"
+msgstr "editar arquivo"
 
 #: rhodecode/templates/files/files_add.html:19
 msgid "add file"
@@ -2858,18 +3257,18 b' msgid "edit file"'
 msgstr "editar arquivo"
 
 #: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:26
+#: rhodecode/templates/files/files_source.html:38
 msgid "show annotation"
 msgstr "mostrar anotação"
 
 #: rhodecode/templates/files/files_edit.html:50
-#: rhodecode/templates/files/files_source.html:28
-#: rhodecode/templates/files/files_source.html:56
+#: rhodecode/templates/files/files_source.html:40
+#: rhodecode/templates/files/files_source.html:68
 msgid "show as raw"
 msgstr "mostrar como bruto"
 
 #: rhodecode/templates/files/files_edit.html:51
-#: rhodecode/templates/files/files_source.html:29
+#: rhodecode/templates/files/files_source.html:41
 msgid "download as raw"
 msgstr "descarregar como bruto"
 
@@ -2885,20 +3284,40 b' msgstr "Editando arquivo"'
 msgid "History"
 msgstr "Histórico"
 
-#: rhodecode/templates/files/files_source.html:24
+#: rhodecode/templates/files/files_source.html:9
+#, fuzzy
+#| msgid "next revision"
+msgid "diff to revision"
+msgstr "próxima revisão"
+
+#: rhodecode/templates/files/files_source.html:10
+#, fuzzy
+#| msgid "next revision"
+msgid "show at revision"
+msgstr "próxima revisão"
+
+#: rhodecode/templates/files/files_source.html:14
+#, fuzzy, python-format
+#| msgid "author"
+msgid "%s author"
+msgid_plural "%s authors"
+msgstr[0] "autor"
+msgstr[1] ""
+
+#: rhodecode/templates/files/files_source.html:36
 msgid "show source"
 msgstr "mostrar fonte"
 
-#: rhodecode/templates/files/files_source.html:47
+#: rhodecode/templates/files/files_source.html:59
 #, python-format
 msgid "Binary file (%s)"
 msgstr "Arquivo binário (%s)"
 
-#: rhodecode/templates/files/files_source.html:56
+#: rhodecode/templates/files/files_source.html:68
 msgid "File is too big to display"
 msgstr "Arquivo é grande demais para exibir"
 
-#: rhodecode/templates/files/files_source.html:112
+#: rhodecode/templates/files/files_source.html:124
 msgid "Selection link"
 msgstr "Link da seleção"
 
@@ -2914,34 +3333,62 b' msgstr "Voltar"'
 msgid "No files at given path"
 msgstr "Nenhum arquivo no caminho especificado"
 
+#: rhodecode/templates/followers/followers.html:5
+#, fuzzy, python-format
+#| msgid "followers"
+msgid "%s Followers"
+msgstr "seguidores"
+
 #: rhodecode/templates/followers/followers.html:13
 msgid "followers"
 msgstr "seguidores"
 
 #: rhodecode/templates/followers/followers_data.html:12
-msgid "Started following"
+#, fuzzy
+#| msgid "Started following"
+msgid "Started following -"
 msgstr "Passou a seguir"
 
+#: rhodecode/templates/forks/fork.html:5
+#, fuzzy, python-format
+#| msgid "fork"
+msgid "%s Fork"
+msgstr "bifurcação"
+
 #: rhodecode/templates/forks/fork.html:31
 msgid "Fork name"
 msgstr "Nome da bifurcação"
 
-#: rhodecode/templates/forks/fork.html:57
+#: rhodecode/templates/forks/fork.html:68
 msgid "Private"
 msgstr "Privado"
 
-#: rhodecode/templates/forks/fork.html:65
+#: rhodecode/templates/forks/fork.html:77
 msgid "Copy permissions"
 msgstr "Copiar permissões"
 
-#: rhodecode/templates/forks/fork.html:73
+#: rhodecode/templates/forks/fork.html:81
+msgid "Copy permissions from forked repository"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:86
 msgid "Update after clone"
 msgstr "Atualizar após clonar"
 
-#: rhodecode/templates/forks/fork.html:80
+#: 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 "bifurcar este repositório"
 
+#: rhodecode/templates/forks/forks.html:5
+#, fuzzy, python-format
+#| msgid "forks"
+msgid "%s Forks"
+msgstr "bifurcações"
+
 #: rhodecode/templates/forks/forks.html:13
 msgid "forks"
 msgstr "bifurcações"
@@ -2954,23 +3401,48 b' msgstr "bifurcado"'
 msgid "There are no forks yet"
 msgstr "Ainda não há bifurcações"
 
-#: rhodecode/templates/journal/journal.html:20
+#: rhodecode/templates/journal/journal.html:13
+#, fuzzy, python-format
+#| msgid "%s public journal %s feed"
+msgid "ATOM journal feed"
+msgstr "diário público de %s - feed %s"
+
+#: rhodecode/templates/journal/journal.html:14
+#, fuzzy, python-format
+#| msgid "%s public journal %s feed"
+msgid "RSS journal feed"
+msgstr "diário público de %s - feed %s"
+
+#: rhodecode/templates/journal/journal.html:24
+#: rhodecode/templates/pullrequests/pullrequest.html:27
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: rhodecode/templates/journal/journal.html:32
+#: rhodecode/templates/journal/journal.html:27
+#: rhodecode/templates/journal/public_journal.html:24
+#, fuzzy, python-format
+#| msgid "%s %s feed"
+msgid "RSS feed"
+msgstr "%s - feed %s"
+
+#: 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 "Seguindo"
 
-#: rhodecode/templates/journal/journal.html:105
+#: rhodecode/templates/journal/journal.html:114
 msgid "following user"
 msgstr "seguindo usuário"
 
-#: rhodecode/templates/journal/journal.html:105
+#: rhodecode/templates/journal/journal.html:114
 msgid "user"
 msgstr "usuário"
 
-#: rhodecode/templates/journal/journal.html:138
+#: rhodecode/templates/journal/journal.html:147
 msgid "You are not following any users or repositories"
 msgstr "Você não está seguindo quaisquer usuários ou repositórios"
 
@@ -2978,33 +3450,147 b' msgstr "Voc\xc3\xaa n\xc3\xa3o est\xc3\xa1 seguindo quaisquer usu\xc3\xa1rios ou reposit\xc3\xb3rios"'
 msgid "No entries yet"
 msgstr "Ainda não há entradas"
 
-#: rhodecode/templates/journal/public_journal.html:17
+#: rhodecode/templates/journal/public_journal.html:13
+#, fuzzy, python-format
+#| msgid "%s public journal %s feed"
+msgid "ATOM public journal feed"
+msgstr "diário público de %s - feed %s"
+
+#: rhodecode/templates/journal/public_journal.html:14
+#, fuzzy, python-format
+#| msgid "%s public journal %s feed"
+msgid "RSS public journal feed"
+msgstr "diário público de %s - feed %s"
+
+#: rhodecode/templates/journal/public_journal.html:21
 msgid "Public Journal"
 msgstr "Diário Público"
 
-#: rhodecode/templates/search/search.html:7
-#: rhodecode/templates/search/search.html:26
-msgid "in repository: "
+#: rhodecode/templates/pullrequests/pullrequest.html:4
+#: rhodecode/templates/pullrequests/pullrequest.html:12
+msgid "New pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:28
+msgid "refresh overview"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:66
+#, fuzzy
+#| msgid "compare view"
+msgid "Detailed compare view"
+msgstr "comparar exibir"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:70
+#: rhodecode/templates/pullrequests/pullrequest_show.html:40
+msgid "Pull request reviewers"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:78
+msgid "Chosen reviewers"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:95
+#, fuzzy
+#| msgid "Available members"
+msgid "Available reviewers"
+msgstr "Membros disponíveis"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:108
+#, fuzzy
+#| msgid "Create new file"
+msgid "Create new pull request"
+msgstr "Criar novo arquivo"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:117
+#: rhodecode/templates/pullrequests/pullrequest_show.html:23
+#, fuzzy
+#| msgid "write"
+msgid "Title"
+msgstr "escrever"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:126
+#, fuzzy
+#| msgid "Description"
+msgid "description"
+msgstr "Descrição"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:134
+msgid "Send pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:4
+#: rhodecode/templates/pullrequests/pullrequest_show.html:12
+#, python-format
+msgid "Pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:26
+msgid "Pull request status"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:33
+#, fuzzy
+#| msgid "create one now"
+msgid "Created on"
+msgstr "criar um agora"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:63
+#, fuzzy
+#| msgid "compare view"
+msgid "Compare view"
+msgstr "comparar exibir"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:67
+#, fuzzy
+#| msgid "No changesets yet"
+msgid "Incoming changesets"
+msgstr "Nenhum conjunto de alterações ainda."
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
+msgid "All pull requests"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:6
+#, fuzzy, python-format
+#| msgid "in repository: "
+msgid "Search \"%s\" in repository: %s"
 msgstr "no repositório"
 
-#: rhodecode/templates/search/search.html:9
-#: rhodecode/templates/search/search.html:28
-msgid "in all repositories"
+#: rhodecode/templates/search/search.html:8
+#, fuzzy, python-format
+#| msgid "in all repositories"
+msgid "Search \"%s\" in all repositories"
 msgstr "em todos os repositórios"
 
-#: rhodecode/templates/search/search.html:42
+#: rhodecode/templates/search/search.html:12
+#: rhodecode/templates/search/search.html:32
+#, fuzzy, python-format
+#| msgid "in repository: "
+msgid "Search in repository: %s"
+msgstr "no repositório"
+
+#: rhodecode/templates/search/search.html:14
+#: rhodecode/templates/search/search.html:34
+#, fuzzy
+#| msgid "in all repositories"
+msgid "Search in all repositories"
+msgstr "em todos os repositórios"
+
+#: rhodecode/templates/search/search.html:48
 msgid "Search term"
 msgstr "Termo de pesquisa"
 
-#: rhodecode/templates/search/search.html:54
+#: rhodecode/templates/search/search.html:60
 msgid "Search in"
 msgstr "Pesquisando em"
 
-#: rhodecode/templates/search/search.html:57
+#: rhodecode/templates/search/search.html:63
 msgid "File contents"
 msgstr "Conteúdo dos arquivos"
 
-#: rhodecode/templates/search/search.html:59
+#: rhodecode/templates/search/search.html:65
 msgid "File names"
 msgstr "Nomes dos arquivos"
 
@@ -3013,10 +3599,17 b' msgstr "Nomes dos arquivos"'
 msgid "Permission denied"
 msgstr "Permissão negada"
 
+#: rhodecode/templates/settings/repo_settings.html:5
+#, fuzzy, python-format
+#| msgid "settings"
+msgid "%s Settings"
+msgstr "configurações"
+
 #: rhodecode/templates/shortlog/shortlog.html:5
-#: rhodecode/templates/summary/summary.html:209
-msgid "Shortlog"
-msgstr "Log resumido"
+#, fuzzy, python-format
+#| msgid "shortlog"
+msgid "%s Shortlog"
+msgstr "log resumido"
 
 #: rhodecode/templates/shortlog/shortlog.html:14
 msgid "shortlog"
@@ -3042,116 +3635,168 b' msgstr "Fazer push de novo reposit\xc3\xb3rio"'
 msgid "Existing repository?"
 msgstr "Repositório existente?"
 
+#: rhodecode/templates/summary/summary.html:4
+#, fuzzy, python-format
+#| msgid "summary"
+msgid "%s Summary"
+msgstr "sumário"
+
 #: rhodecode/templates/summary/summary.html:12
 msgid "summary"
 msgstr "sumário"
 
-#: rhodecode/templates/summary/summary.html:44
-#: rhodecode/templates/summary/summary.html:47
+#: rhodecode/templates/summary/summary.html:20
+#, fuzzy, python-format
+#| msgid "Subscribe to %s atom feed"
+msgid "repo %s ATOM feed"
+msgstr "Assinar o feed atom de %s"
+
+#: rhodecode/templates/summary/summary.html:21
+#, fuzzy, python-format
+#| msgid "Subscribe to %s rss feed"
+msgid "repo %s RSS feed"
+msgstr "Assinar o feed rss de %s"
+
+#: rhodecode/templates/summary/summary.html:49
+#: rhodecode/templates/summary/summary.html:52
 msgid "ATOM"
 msgstr "ATOM"
 
-#: rhodecode/templates/summary/summary.html:77
+#: rhodecode/templates/summary/summary.html:82
 #, python-format
 msgid "Non changable ID %s"
 msgstr "ID não alterável %s"
 
-#: rhodecode/templates/summary/summary.html:82
+#: rhodecode/templates/summary/summary.html:87
 msgid "public"
 msgstr "público"
 
-#: rhodecode/templates/summary/summary.html:90
+#: rhodecode/templates/summary/summary.html:95
 msgid "remote clone"
 msgstr "clone remoto"
 
-#: rhodecode/templates/summary/summary.html:121
+#: rhodecode/templates/summary/summary.html:126
 msgid "Clone url"
 msgstr "URL de clonagem"
 
-#: rhodecode/templates/summary/summary.html:124
+#: rhodecode/templates/summary/summary.html:129
 msgid "Show by Name"
 msgstr "Mostrar por Nome"
 
-#: rhodecode/templates/summary/summary.html:125
+#: rhodecode/templates/summary/summary.html:130
 msgid "Show by ID"
 msgstr "Mostrar por ID"
 
-#: rhodecode/templates/summary/summary.html:133
+#: rhodecode/templates/summary/summary.html:138
 msgid "Trending files"
 msgstr "Tendências em arquivos"
 
-#: rhodecode/templates/summary/summary.html:141
-#: rhodecode/templates/summary/summary.html:157
-#: rhodecode/templates/summary/summary.html:185
+#: rhodecode/templates/summary/summary.html:146
+#: rhodecode/templates/summary/summary.html:162
+#: rhodecode/templates/summary/summary.html:190
 msgid "enable"
 msgstr "habilitar"
 
-#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/templates/summary/summary.html:154
 msgid "Download"
 msgstr "Download"
 
-#: rhodecode/templates/summary/summary.html:153
+#: rhodecode/templates/summary/summary.html:158
 msgid "There are no downloads yet"
 msgstr "Ainda não há downloads"
 
-#: rhodecode/templates/summary/summary.html:155
+#: rhodecode/templates/summary/summary.html:160
 msgid "Downloads are disabled for this repository"
 msgstr "Downloads estão desabilitados para este repositório"
 
-#: rhodecode/templates/summary/summary.html:164
+#: rhodecode/templates/summary/summary.html:166
+#, fuzzy
+#| msgid "download as raw"
+msgid "Download as zip"
+msgstr "descarregar como bruto"
+
+#: rhodecode/templates/summary/summary.html:169
 msgid "Check this to download archive with subrepos"
 msgstr "Marque isto para descarregar arquivo com subrepositórios"
 
-#: rhodecode/templates/summary/summary.html:164
+#: rhodecode/templates/summary/summary.html:169
 msgid "with subrepos"
 msgstr "com subrepositórios"
 
-#: rhodecode/templates/summary/summary.html:177
+#: rhodecode/templates/summary/summary.html:182
 msgid "Commit activity by day / author"
 msgstr "Atividade de commit por dia / autor"
 
-#: rhodecode/templates/summary/summary.html:188
+#: rhodecode/templates/summary/summary.html:193
 msgid "Stats gathered: "
 msgstr "Estatísticas coletadas:"
 
-#: rhodecode/templates/summary/summary.html:211
+#: rhodecode/templates/summary/summary.html:214
+msgid "Shortlog"
+msgstr "Log resumido"
+
+#: rhodecode/templates/summary/summary.html:216
 msgid "Quick start"
 msgstr "Início rápido"
 
-#: rhodecode/templates/summary/summary.html:281
+#: rhodecode/templates/summary/summary.html:286
 #, python-format
 msgid "Download %s as %s"
 msgstr "Descarregar %s como %s"
 
-#: rhodecode/templates/summary/summary.html:638
+#: rhodecode/templates/summary/summary.html:643
 msgid "commits"
 msgstr "commits"
 
-#: rhodecode/templates/summary/summary.html:639
+#: rhodecode/templates/summary/summary.html:644
 msgid "files added"
 msgstr "arquivos adicionados"
 
-#: rhodecode/templates/summary/summary.html:640
+#: rhodecode/templates/summary/summary.html:645
 msgid "files changed"
 msgstr "arquivos alterados"
 
-#: rhodecode/templates/summary/summary.html:641
+#: rhodecode/templates/summary/summary.html:646
 msgid "files removed"
 msgstr "arquivos removidos"
 
-#: rhodecode/templates/summary/summary.html:644
+#: rhodecode/templates/summary/summary.html:649
 msgid "commit"
 msgstr "commit"
 
-#: rhodecode/templates/summary/summary.html:645
+#: rhodecode/templates/summary/summary.html:650
 msgid "file added"
 msgstr "arquivo adicionado"
 
-#: rhodecode/templates/summary/summary.html:646
+#: rhodecode/templates/summary/summary.html:651
 msgid "file changed"
 msgstr "arquivo alterado"
 
-#: rhodecode/templates/summary/summary.html:647
+#: rhodecode/templates/summary/summary.html:652
 msgid "file removed"
 msgstr "arquivo removido"
 
+#: rhodecode/templates/tags/tags.html:5
+#, fuzzy, python-format
+#| msgid "%s ago"
+msgid "%s Tags"
+msgstr "%s atrás"
+
+#~ msgid "Invalid username"
+#~ msgstr "Nome de usuário inválido"
+
+#~ msgid "Invalid group name"
+#~ msgstr "Nome de grupo inválido"
+
+#~ msgid "This group already exists"
+#~ msgstr "Esse grupo já existe"
+
+#~ msgid "This username is not valid"
+#~ msgstr "Esse nome de usuário não é válido"
+
+#~ msgid "There is a group with this name already \"%s\""
+#~ msgstr "Já existe um grupo com esse nome \"%s\""
+
+#~ msgid "Edit file"
+#~ msgstr "Editar arquivo"
+

rhodecode/i18n/rhodecode.pot

@@ -8,7 +8,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode 1.4.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-06-05 20:42+0200\n"
+"POT-Creation-Date: 2012-07-02 11:58+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -21,21 +21,21 b' msgstr ""'
 msgid "All Branches"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:80
+#: rhodecode/controllers/changeset.py:81
 msgid "show white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:87 rhodecode/controllers/changeset.py:94
+#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95
 msgid "ignore white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:154
+#: rhodecode/controllers/changeset.py:155
 #, python-format
 msgid "%s line context"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:324 rhodecode/controllers/changeset.py:339
-#: rhodecode/lib/diffs.py:62
+#: rhodecode/controllers/changeset.py:331 rhodecode/controllers/changeset.py:346
+#: rhodecode/lib/diffs.py:69
 msgid "binary file"
 msgstr ""
 
@@ -89,102 +89,101 b' msgstr ""'
 msgid "There are no files yet %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:247
+#: rhodecode/controllers/files.py:256
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:252
+#: rhodecode/controllers/files.py:261
 msgid "No changes"
 msgstr ""
 
-#: rhodecode/controllers/files.py:263 rhodecode/controllers/files.py:316
+#: rhodecode/controllers/files.py:272 rhodecode/controllers/files.py:326
 #, python-format
 msgid "Successfully committed to %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:268 rhodecode/controllers/files.py:322
+#: rhodecode/controllers/files.py:277 rhodecode/controllers/files.py:332
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/controllers/files.py:288
+#: rhodecode/controllers/files.py:298
 #, python-format
 msgid "Added %s via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:302
+#: rhodecode/controllers/files.py:312
 msgid "No content"
 msgstr ""
 
-#: rhodecode/controllers/files.py:306
+#: rhodecode/controllers/files.py:316
 msgid "No filename"
 msgstr ""
 
-#: rhodecode/controllers/files.py:347
-msgid "downloads disabled"
-msgstr ""
-
 #: rhodecode/controllers/files.py:358
+msgid "downloads disabled"
+msgstr ""
+
+#: rhodecode/controllers/files.py:369
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:360
+#: rhodecode/controllers/files.py:371
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/controllers/files.py:362
+#: rhodecode/controllers/files.py:373
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/controllers/files.py:461
+#: rhodecode/controllers/files.py:474
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:230
+#: rhodecode/controllers/files.py:475 rhodecode/controllers/pullrequests.py:65
+#: rhodecode/controllers/summary.py:230 rhodecode/model/scm.py:497
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:231
+#: rhodecode/controllers/files.py:476 rhodecode/controllers/pullrequests.py:69
+#: rhodecode/controllers/summary.py:231 rhodecode/model/scm.py:508
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:69 rhodecode/controllers/admin/repos.py:86
+#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:88
 #, 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:128 rhodecode/controllers/settings.py:69
+#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72
 #, 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:163
+#: rhodecode/controllers/forks.py:166
 #, python-format
 msgid "forked %s repository as %s"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:177
+#: rhodecode/controllers/forks.py:180
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:53
-#, python-format
-msgid "%s public journal %s feed"
-msgstr ""
-
-#: rhodecode/controllers/journal.py:190 rhodecode/controllers/journal.py:223
-#: rhodecode/templates/admin/repos/repo_edit.html:177
-#: rhodecode/templates/base/base.html:307 rhodecode/templates/base/base.html:309
-#: rhodecode/templates/base/base.html:311
-msgid "Public journal"
+#: 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:217
+msgid "journal"
 msgstr ""
 
 #: rhodecode/controllers/login.py:116
@@ -199,6 +198,23 b' msgstr ""'
 msgid "Your password reset was successful, new password has been sent to your email"
 msgstr ""
 
+#: rhodecode/controllers/pullrequests.py:67 rhodecode/model/scm.py:503
+msgid "Bookmarks"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:117
+#, python-format
+msgid "%s (owner)"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:142
+msgid "Successfully opened new pull request"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:145
+msgid "Error occurred during sending pull request"
+msgstr ""
+
 #: rhodecode/controllers/search.py:114
 msgid "Invalid search query. Try quoting it."
 msgstr ""
@@ -211,30 +227,30 b' msgstr ""'
 msgid "An error occurred during this search operation"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:103 rhodecode/controllers/admin/repos.py:213
+#: rhodecode/controllers/settings.py:107 rhodecode/controllers/admin/repos.py:221
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:121 rhodecode/controllers/admin/repos.py:231
+#: rhodecode/controllers/settings.py:125 rhodecode/controllers/admin/repos.py:239
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:139 rhodecode/controllers/admin/repos.py:249
+#: rhodecode/controllers/settings.py:143 rhodecode/controllers/admin/repos.py:257
 #, 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:151 rhodecode/controllers/admin/repos.py:261
+#: rhodecode/controllers/settings.py:155 rhodecode/controllers/admin/repos.py:269
 #, python-format
 msgid "deleted repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:155 rhodecode/controllers/admin/repos.py:271
-#: rhodecode/controllers/admin/repos.py:277
+#: rhodecode/controllers/settings.py:159 rhodecode/controllers/admin/repos.py:279
+#: rhodecode/controllers/admin/repos.py:285
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
@@ -244,7 +260,7 b' msgid "No data loaded yet"'
 msgstr ""
 
 #: rhodecode/controllers/summary.py:142
-#: rhodecode/templates/summary/summary.html:139
+#: rhodecode/templates/summary/summary.html:144
 msgid "Statistics are disabled for this repository"
 msgstr ""
 
@@ -334,8 +350,8 b' msgstr ""'
 #: rhodecode/templates/admin/users_groups/users_group_add.html:8
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:197 rhodecode/templates/base/base.html:326
-#: rhodecode/templates/base/base.html:328 rhodecode/templates/base/base.html:330
+#: rhodecode/templates/base/base.html:197 rhodecode/templates/base/base.html:334
+#: rhodecode/templates/base/base.html:336 rhodecode/templates/base/base.html:338
 msgid "Admin"
 msgstr ""
 
@@ -367,76 +383,76 b' msgstr ""'
 msgid "error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:116
+#: rhodecode/controllers/admin/repos.py:121
 msgid "--REMOVE FORK--"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:144
+#: rhodecode/controllers/admin/repos.py:151
 #, python-format
 msgid "created repository %s from %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:148
+#: rhodecode/controllers/admin/repos.py:155
 #, python-format
 msgid "created repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:179
+#: rhodecode/controllers/admin/repos.py:186
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:266
+#: rhodecode/controllers/admin/repos.py:274
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:295
+#: rhodecode/controllers/admin/repos.py:303
 msgid "An error occurred during deletion of repository user"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:314
+#: rhodecode/controllers/admin/repos.py:322
 msgid "An error occurred during deletion of repository users groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/admin/repos.py:339
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:347
+#: rhodecode/controllers/admin/repos.py:355
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:367
+#: rhodecode/controllers/admin/repos.py:375
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:371
+#: rhodecode/controllers/admin/repos.py:379
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:376 rhodecode/model/forms.py:54
+#: rhodecode/controllers/admin/repos.py:384 rhodecode/model/validators.py:269
 msgid "Token mismatch"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:389
+#: rhodecode/controllers/admin/repos.py:397
 msgid "Pulled from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:391
+#: rhodecode/controllers/admin/repos.py:399
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:407
+#: rhodecode/controllers/admin/repos.py:415
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:409
+#: rhodecode/controllers/admin/repos.py:417
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:413
+#: rhodecode/controllers/admin/repos.py:421
 msgid "An error occurred during this operation"
 msgstr ""
 
@@ -502,80 +518,93 b' msgid "Updated application settings"'
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:159
-#: rhodecode/controllers/admin/settings.py:226
+#: rhodecode/controllers/admin/settings.py:227
 msgid "error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:221
+#: rhodecode/controllers/admin/settings.py:222
 msgid "Updated mercurial settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:246
+#: rhodecode/controllers/admin/settings.py:247
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:258
+#: rhodecode/controllers/admin/settings.py:259
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:262
+#: rhodecode/controllers/admin/settings.py:263
 msgid "error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:281
+#: rhodecode/controllers/admin/settings.py:282
 msgid "Email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:336
+#: rhodecode/controllers/admin/settings.py:337
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:367
+#: rhodecode/controllers/admin/settings.py:368
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:387
-#: rhodecode/controllers/admin/users.py:138
+#: rhodecode/controllers/admin/settings.py:388
+#: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:83
+#: rhodecode/controllers/admin/users.py:84
 #, python-format
 msgid "created user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:95
+#: rhodecode/controllers/admin/users.py:96
 #, python-format
 msgid "error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:124
+#: rhodecode/controllers/admin/users.py:125
 msgid "User updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:155
+#: rhodecode/controllers/admin/users.py:159
 msgid "successfully deleted user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:160
+#: rhodecode/controllers/admin/users.py:164
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:175
+#: rhodecode/controllers/admin/users.py:178
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:205
+#: rhodecode/controllers/admin/users.py:210
 #: rhodecode/controllers/admin/users_groups.py:219
 msgid "Granted 'repository create' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:214
+#: rhodecode/controllers/admin/users.py:219
 #: rhodecode/controllers/admin/users_groups.py:229
 msgid "Revoked 'repository create' permission to user"
 msgstr ""
 
+#: rhodecode/controllers/admin/users.py:235
+#, python-format
+msgid "Added email %s to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:241
+msgid "An error occurred during email saving"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:251
+msgid "Removed email from user"
+msgstr ""
+
 #: rhodecode/controllers/admin/users_groups.py:84
 #, python-format
 msgid "created users group %s"
@@ -612,131 +641,135 b' msgstr ""'
 msgid "You need to be a signed in to view this page"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:78
+#: rhodecode/lib/diffs.py:85
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:88
+#: rhodecode/lib/diffs.py:95
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:350
+#: rhodecode/lib/helpers.py:369
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:423
+#: rhodecode/lib/helpers.py:442
 msgid "True"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:427
+#: rhodecode/lib/helpers.py:446
 msgid "False"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:471
+#: rhodecode/lib/helpers.py:490
 msgid "Changeset not found"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:494
+#: rhodecode/lib/helpers.py:513
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:500
+#: rhodecode/lib/helpers.py:519
 msgid "compare view"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:520
+#: rhodecode/lib/helpers.py:539
 msgid "and"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:521
+#: rhodecode/lib/helpers.py:540
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:522 rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46
 msgid "revisions"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:545
+#: rhodecode/lib/helpers.py:564
 msgid "fork name "
 msgstr ""
 
-#: rhodecode/lib/helpers.py:558
+#: rhodecode/lib/helpers.py:577
 msgid "[deleted] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:560 rhodecode/lib/helpers.py:570
+#: rhodecode/lib/helpers.py:579 rhodecode/lib/helpers.py:589
 msgid "[created] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:562
+#: rhodecode/lib/helpers.py:581
 msgid "[created] repository as fork"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:564 rhodecode/lib/helpers.py:572
+#: rhodecode/lib/helpers.py:583 rhodecode/lib/helpers.py:591
 msgid "[forked] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:566 rhodecode/lib/helpers.py:574
+#: rhodecode/lib/helpers.py:585 rhodecode/lib/helpers.py:593
 msgid "[updated] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:568
+#: rhodecode/lib/helpers.py:587
 msgid "[delete] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:576
+#: rhodecode/lib/helpers.py:595
 msgid "[created] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:578
+#: rhodecode/lib/helpers.py:597
 msgid "[updated] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:580
+#: rhodecode/lib/helpers.py:599
 msgid "[created] users group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:582
+#: rhodecode/lib/helpers.py:601
 msgid "[updated] users group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:584
+#: rhodecode/lib/helpers.py:603
 msgid "[commented] on revision in repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:586
+#: rhodecode/lib/helpers.py:605
+msgid "[commented] on pull request"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:607
 msgid "[pushed] into"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:588
+#: rhodecode/lib/helpers.py:609
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:590
+#: rhodecode/lib/helpers.py:611
 msgid "[pulled from remote] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:592
+#: rhodecode/lib/helpers.py:613
 msgid "[pulled] from"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:594
+#: rhodecode/lib/helpers.py:615
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:596
+#: rhodecode/lib/helpers.py:617
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:760
+#: rhodecode/lib/helpers.py:781
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:764
+#: rhodecode/lib/helpers.py:785
 msgid "No Files"
 msgstr ""
 
@@ -800,185 +833,282 b' msgstr ""'
 msgid "password reset link"
 msgstr ""
 
-#: rhodecode/model/comment.py:85
+#: rhodecode/model/comment.py:109
 #, python-format
 msgid "on line %s"
 msgstr ""
 
-#: rhodecode/model/comment.py:114
+#: rhodecode/model/comment.py:146
 msgid "[Mention]"
 msgstr ""
 
-#: rhodecode/model/forms.py:72
-msgid "Invalid username"
-msgstr ""
-
-#: rhodecode/model/forms.py:80
-msgid "This username already exists"
-msgstr ""
-
-#: rhodecode/model/forms.py:85
-msgid ""
-"Username may only contain alphanumeric characters underscores, periods or "
-"dashes and must begin with alphanumeric character"
-msgstr ""
-
-#: rhodecode/model/forms.py:101
-msgid "Invalid group name"
-msgstr ""
-
-#: rhodecode/model/forms.py:111
-msgid "This users group already exists"
-msgstr ""
-
-#: rhodecode/model/forms.py:117
-msgid ""
-"RepoGroup name may only contain  alphanumeric characters underscores, periods"
-" or dashes and must begin with alphanumeric character"
-msgstr ""
-
-#: rhodecode/model/forms.py:145
-msgid "Cannot assign this group as parent"
-msgstr ""
-
-#: rhodecode/model/forms.py:164
-msgid "This group already exists"
-msgstr ""
-
-#: rhodecode/model/forms.py:176
-msgid "Repository with this name already exists"
-msgstr ""
-
-#: rhodecode/model/forms.py:195 rhodecode/model/forms.py:204
-#: rhodecode/model/forms.py:213
-msgid "Invalid characters in password"
-msgstr ""
-
-#: rhodecode/model/forms.py:226
-msgid "Passwords do not match"
-msgstr ""
-
-#: rhodecode/model/forms.py:232
-msgid "invalid password"
-msgstr ""
-
-#: rhodecode/model/forms.py:233
-msgid "invalid user name"
-msgstr ""
-
-#: rhodecode/model/forms.py:234
-msgid "Your account is disabled"
-msgstr ""
-
-#: rhodecode/model/forms.py:274
-msgid "This username is not valid"
-msgstr ""
-
-#: rhodecode/model/forms.py:287
-msgid "This repository name is disallowed"
-msgstr ""
-
-#: rhodecode/model/forms.py:310
-#, python-format
-msgid "This repository already exists in a group \"%s\""
-msgstr ""
-
-#: rhodecode/model/forms.py:317
-#, python-format
-msgid "There is a group with this name already \"%s\""
-msgstr ""
-
-#: rhodecode/model/forms.py:324
-msgid "This repository already exists"
-msgstr ""
-
-#: rhodecode/model/forms.py:367
-msgid "invalid clone url"
-msgstr ""
-
-#: rhodecode/model/forms.py:384
-msgid "Invalid clone url, provide a valid clone http\\s url"
-msgstr ""
-
-#: rhodecode/model/forms.py:398
-msgid "Fork have to be the same type as original"
-msgstr ""
-
-#: rhodecode/model/forms.py:414
-msgid "This username or users group name is not valid"
-msgstr ""
-
-#: rhodecode/model/forms.py:480
-msgid "This is not a valid path"
-msgstr ""
-
-#: rhodecode/model/forms.py:494
-msgid "This e-mail address is already taken"
-msgstr ""
-
-#: rhodecode/model/forms.py:507
-msgid "This e-mail address doesn't exist."
-msgstr ""
-
-#: rhodecode/model/forms.py:530
-msgid ""
-"The LDAP Login attribute of the CN must be specified - this is the name of "
-"the attribute that is equivalent to 'username'"
-msgstr ""
-
-#: rhodecode/model/forms.py:549
+#: rhodecode/model/db.py:1062
+msgid "Repository no access"
+msgstr ""
+
+#: rhodecode/model/db.py:1063
+msgid "Repository read access"
+msgstr ""
+
+#: rhodecode/model/db.py:1064
+msgid "Repository write access"
+msgstr ""
+
+#: rhodecode/model/db.py:1065
+msgid "Repository admin access"
+msgstr ""
+
+#: rhodecode/model/db.py:1067
+msgid "Repositories Group no access"
+msgstr ""
+
+#: rhodecode/model/db.py:1068
+msgid "Repositories Group read access"
+msgstr ""
+
+#: rhodecode/model/db.py:1069
+msgid "Repositories Group write access"
+msgstr ""
+
+#: rhodecode/model/db.py:1070
+msgid "Repositories Group admin access"
+msgstr ""
+
+#: rhodecode/model/db.py:1072
+msgid "RhodeCode Administrator"
+msgstr ""
+
+#: rhodecode/model/db.py:1073
+msgid "Repository creation disabled"
+msgstr ""
+
+#: rhodecode/model/db.py:1074
+msgid "Repository creation enabled"
+msgstr ""
+
+#: rhodecode/model/db.py:1075
+msgid "Register disabled"
+msgstr ""
+
+#: rhodecode/model/db.py:1076
+msgid "Register new user with RhodeCode with manual activation"
+msgstr ""
+
+#: rhodecode/model/db.py:1079
+msgid "Register new user with RhodeCode with auto activation"
+msgstr ""
+
+#: rhodecode/model/db.py:1479
+msgid "Not Reviewed"
+msgstr ""
+
+#: rhodecode/model/db.py:1480
+msgid "Approved"
+msgstr ""
+
+#: rhodecode/model/db.py:1481
+msgid "Rejected"
+msgstr ""
+
+#: rhodecode/model/db.py:1482
+msgid "Under Review"
+msgstr ""
+
+#: rhodecode/model/forms.py:43
 msgid "Please enter a login"
 msgstr ""
 
-#: rhodecode/model/forms.py:550
+#: rhodecode/model/forms.py:44
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
-#: rhodecode/model/forms.py:558
+#: rhodecode/model/forms.py:52
 msgid "Please enter a password"
 msgstr ""
 
-#: rhodecode/model/forms.py:559
+#: rhodecode/model/forms.py:53
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
-#: rhodecode/model/notification.py:178
+#: rhodecode/model/notification.py:203
 msgid "commented on commit"
 msgstr ""
 
-#: rhodecode/model/notification.py:179
+#: rhodecode/model/notification.py:204
 msgid "sent message"
 msgstr ""
 
-#: rhodecode/model/notification.py:180
+#: rhodecode/model/notification.py:205
 msgid "mentioned you"
 msgstr ""
 
-#: rhodecode/model/notification.py:181
+#: rhodecode/model/notification.py:206
 msgid "registered in RhodeCode"
 msgstr ""
 
-#: rhodecode/model/user.py:235
+#: rhodecode/model/notification.py:207
+msgid "opened new pull request"
+msgstr ""
+
+#: rhodecode/model/notification.py:208
+msgid "commented on pull request"
+msgstr ""
+
+#: rhodecode/model/pull_request.py:75
+#, python-format
+msgid "%(user)s wants you to review pull request #%(pr_id)s"
+msgstr ""
+
+#: rhodecode/model/scm.py:489
+msgid "latest tip"
+msgstr ""
+
+#: rhodecode/model/user.py:238
 msgid "new user registration"
 msgstr ""
 
-#: rhodecode/model/user.py:259 rhodecode/model/user.py:279
+#: rhodecode/model/user.py:263 rhodecode/model/user.py:284
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:300
-msgid "You can't remove this user since it's crucial for entire application"
-msgstr ""
-
 #: rhodecode/model/user.py:306
+msgid "You can't remove this user since it's crucial for entire application"
+msgstr ""
+
+#: rhodecode/model/user.py:312
 #, 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:52
+#, python-format
+msgid "Username \"%(username)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:54
+#, python-format
+msgid "Username \"%(username)s\" is forbidden"
+msgstr ""
+
+#: rhodecode/model/validators.py:56
+msgid ""
+"Username may only contain alphanumeric characters underscores, periods or "
+"dashes and must begin with alphanumeric character"
+msgstr ""
+
+#: rhodecode/model/validators.py:84
+#, python-format
+msgid "Username %(username)s is not valid"
+msgstr ""
+
+#: rhodecode/model/validators.py:103
+msgid "Invalid users group name"
+msgstr ""
+
+#: rhodecode/model/validators.py:104
+#, python-format
+msgid "Users group \"%(usersgroup)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:106
+msgid ""
+"users group name may only contain  alphanumeric characters underscores, "
+"periods or dashes and must begin with alphanumeric character"
+msgstr ""
+
+#: rhodecode/model/validators.py:144
+msgid "Cannot assign this group as parent"
+msgstr ""
+
+#: rhodecode/model/validators.py:145
+#, python-format
+msgid "Group \"%(group_name)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:147
+#, python-format
+msgid "Repository with name \"%(group_name)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:205
+msgid "Invalid characters (non-ascii) in password"
+msgstr ""
+
+#: rhodecode/model/validators.py:220
+msgid "Passwords do not match"
+msgstr ""
+
+#: rhodecode/model/validators.py:237
+msgid "invalid password"
+msgstr ""
+
+#: rhodecode/model/validators.py:238
+msgid "invalid user name"
+msgstr ""
+
+#: rhodecode/model/validators.py:239
+msgid "Your account is disabled"
+msgstr ""
+
+#: rhodecode/model/validators.py:283
+#, python-format
+msgid "Repository name %(repo)s is disallowed"
+msgstr ""
+
+#: rhodecode/model/validators.py:285
+#, python-format
+msgid "Repository named %(repo)s already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:286
+#, python-format
+msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
+msgstr ""
+
+#: rhodecode/model/validators.py:288
+#, python-format
+msgid "Repositories group with name \"%(repo)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:386
+msgid "invalid clone url"
+msgstr ""
+
+#: rhodecode/model/validators.py:387
+msgid "Invalid clone url, provide a valid clone http\\s url"
+msgstr ""
+
+#: rhodecode/model/validators.py:418
+msgid "Fork have to be the same type as parent"
+msgstr ""
+
+#: rhodecode/model/validators.py:439
+msgid "This username or users group name is not valid"
+msgstr ""
+
+#: rhodecode/model/validators.py:509
+msgid "This is not a valid path"
+msgstr ""
+
+#: rhodecode/model/validators.py:524
+msgid "This e-mail address is already taken"
+msgstr ""
+
+#: rhodecode/model/validators.py:544
+#, python-format
+msgid "e-mail \"%(email)s\" does not exist."
+msgstr ""
+
+#: rhodecode/model/validators.py:581
+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/templates/index.html:3
 msgid "Dashboard"
 msgstr ""
@@ -988,7 +1118,7 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_edit_my_account.html:31
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 #: rhodecode/templates/branches/branches.html:9
-#: rhodecode/templates/journal/journal.html:31
+#: rhodecode/templates/journal/journal.html:40
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
 msgstr ""
@@ -1013,16 +1143,16 b' msgstr ""'
 
 #: rhodecode/templates/index_base.html:30 rhodecode/templates/index_base.html:67
 #: rhodecode/templates/index_base.html:132 rhodecode/templates/index_base.html:158
-#: rhodecode/templates/admin/repos/repo_add_base.html:47
-#: rhodecode/templates/admin/repos/repo_edit.html:66
+#: rhodecode/templates/admin/repos/repo_add_base.html:56
+#: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:37
 #: rhodecode/templates/admin/repos/repos.html:84
 #: 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:49
+#: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:57
-#: rhodecode/templates/summary/summary.html:100
+#: rhodecode/templates/summary/summary.html:105
 msgid "Description"
 msgstr ""
 
@@ -1036,20 +1166,21 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repo_edit.html:32
 #: rhodecode/templates/admin/repos/repos.html:36
 #: rhodecode/templates/admin/repos/repos.html:82
+#: rhodecode/templates/admin/users/user_edit.html:170
 #: rhodecode/templates/admin/users/user_edit_my_account.html:49
 #: rhodecode/templates/admin/users/user_edit_my_account.html:99
 #: rhodecode/templates/admin/users/user_edit_my_account.html:165
 #: rhodecode/templates/admin/users/user_edit_my_account.html:200
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:36
+#: rhodecode/templates/branches/branches.html:51
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:50
-#: rhodecode/templates/journal/journal.html:98
-#: rhodecode/templates/journal/journal.html:177
+#: rhodecode/templates/journal/journal.html:59
+#: rhodecode/templates/journal/journal.html:107
+#: rhodecode/templates/journal/journal.html:186
 #: rhodecode/templates/settings/repo_settings.html:31
-#: rhodecode/templates/summary/summary.html:38
-#: rhodecode/templates/summary/summary.html:114
+#: rhodecode/templates/summary/summary.html:43
+#: rhodecode/templates/summary/summary.html:119
 #: rhodecode/templates/tags/tags.html:36 rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr ""
@@ -1063,25 +1194,23 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:39
 #: rhodecode/templates/admin/repos/repos.html:87
 #: rhodecode/templates/admin/users/user_edit_my_account.html:167
-#: rhodecode/templates/journal/journal.html:179
+#: rhodecode/templates/journal/journal.html:188
 msgid "Tip"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:70 rhodecode/templates/index_base.html:163
-#: rhodecode/templates/admin/repos/repo_edit.html:103
+#: rhodecode/templates/admin/repos/repo_edit.html:112
 #: rhodecode/templates/admin/repos/repos.html:89
 msgid "Owner"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/journal/public_journal.html:20
-#: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:46
+#: rhodecode/templates/summary/summary.html:48
+#: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:72
-#: rhodecode/templates/journal/public_journal.html:23
 msgid "Atom"
 msgstr ""
 
@@ -1103,8 +1232,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:112
 #: rhodecode/templates/admin/users/user_edit_my_account.html:186
 #: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:60
-#: rhodecode/templates/journal/journal.html:202
+#: rhodecode/templates/branches/branches.html:77
+#: rhodecode/templates/journal/journal.html:211
 #: rhodecode/templates/tags/tags.html:60
 msgid "Click to sort ascending"
 msgstr ""
@@ -1113,8 +1242,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:113
 #: rhodecode/templates/admin/users/user_edit_my_account.html:187
 #: rhodecode/templates/bookmarks/bookmarks.html:61
-#: rhodecode/templates/branches/branches.html:61
-#: rhodecode/templates/journal/journal.html:203
+#: rhodecode/templates/branches/branches.html:78
+#: rhodecode/templates/journal/journal.html:212
 #: rhodecode/templates/tags/tags.html:61
 msgid "Click to sort descending"
 msgstr ""
@@ -1128,8 +1257,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:114
 #: rhodecode/templates/admin/users/user_edit_my_account.html:188
 #: rhodecode/templates/bookmarks/bookmarks.html:62
-#: rhodecode/templates/branches/branches.html:62
-#: rhodecode/templates/journal/journal.html:204
+#: rhodecode/templates/branches/branches.html:79
+#: rhodecode/templates/journal/journal.html:213
 #: rhodecode/templates/tags/tags.html:62
 msgid "No records found."
 msgstr ""
@@ -1138,8 +1267,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:115
 #: rhodecode/templates/admin/users/user_edit_my_account.html:189
 #: rhodecode/templates/bookmarks/bookmarks.html:63
-#: rhodecode/templates/branches/branches.html:63
-#: rhodecode/templates/journal/journal.html:205
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:214
 #: rhodecode/templates/tags/tags.html:63
 msgid "Data error."
 msgstr ""
@@ -1148,8 +1277,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:116
 #: rhodecode/templates/admin/users/user_edit_my_account.html:190
 #: rhodecode/templates/bookmarks/bookmarks.html:64
-#: rhodecode/templates/branches/branches.html:64
-#: rhodecode/templates/journal/journal.html:206
+#: rhodecode/templates/branches/branches.html:81
+#: rhodecode/templates/journal/journal.html:215
 #: rhodecode/templates/tags/tags.html:64
 msgid "Loading..."
 msgstr ""
@@ -1168,7 +1297,7 b' msgstr ""'
 #: 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:113
+#: rhodecode/templates/summary/summary.html:118
 msgid "Username"
 msgstr ""
 
@@ -1241,7 +1370,7 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_add.html:77
 #: rhodecode/templates/admin/users/user_edit.html:104
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:115
+#: rhodecode/templates/summary/summary.html:120
 msgid "Email"
 msgstr ""
 
@@ -1254,8 +1383,8 b' msgid "Your account must wait for activa'
 msgstr ""
 
 #: rhodecode/templates/repo_switcher_list.html:11
-#: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:76
+#: rhodecode/templates/admin/repos/repo_add_base.html:65
+#: rhodecode/templates/admin/repos/repo_edit.html:85
 #: rhodecode/templates/settings/repo_settings.html:67
 msgid "Private repository"
 msgstr ""
@@ -1270,7 +1399,7 b' msgid "branches"'
 msgstr ""
 
 #: rhodecode/templates/switch_to_list.html:10
-#: rhodecode/templates/branches/branches_data.html:51
+#: rhodecode/templates/branches/branches_data.html:57
 msgid "There are no branches yet"
 msgstr ""
 
@@ -1304,8 +1433,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:90
 #: rhodecode/templates/admin/users/user_edit_my_account.html:51
 #: rhodecode/templates/admin/users/user_edit_my_account.html:52
-#: rhodecode/templates/journal/journal.html:52
-#: rhodecode/templates/journal/journal.html:53
+#: rhodecode/templates/journal/journal.html:61
+#: rhodecode/templates/journal/journal.html:62
 msgid "Action"
 msgstr ""
 
@@ -1316,7 +1445,7 b' 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:37
+#: rhodecode/templates/branches/branches.html:52
 #: rhodecode/templates/tags/tags.html:37 rhodecode/templates/tags/tags_data.html:7
 msgid "Date"
 msgstr ""
@@ -1418,10 +1547,23 b' 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:251 rhodecode/templates/base/base.html:253
+msgid "Pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:35
 msgid "Mark all read"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/notifications_data.html:38
+#: rhodecode/templates/admin/notifications/notifications_data.html:34
 msgid "No notifications here yet"
 msgstr ""
 
@@ -1439,7 +1581,7 b' msgid "Permissions administration"'
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:116
+#: rhodecode/templates/admin/repos/repo_edit.html:125
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
 #: rhodecode/templates/admin/users/user_edit.html:139
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
@@ -1479,7 +1621,7 b' msgid "Repository creation"'
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:71
-#: rhodecode/templates/admin/repos/repo_edit.html:218
+#: rhodecode/templates/admin/repos/repo_edit.html:227
 msgid "set"
 msgstr ""
 
@@ -1496,8 +1638,8 b' msgid "Repositories"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:90
-#: rhodecode/templates/summary/summary.html:91
+#: rhodecode/templates/summary/summary.html:95
+#: rhodecode/templates/summary/summary.html:96
 msgid "Clone from"
 msgstr ""
 
@@ -1510,15 +1652,14 b' 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:41
+#: 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/admin/repos/repo_edit.html:53
-#: rhodecode/templates/settings/repo_settings.html:52
-msgid "Optional select a group to put this repository into."
+#: 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
@@ -1530,21 +1671,35 b' msgstr ""'
 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
+msgid "Landing revision"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_add_base.html:51
 #: rhodecode/templates/admin/repos/repo_edit.html:70
-#: rhodecode/templates/settings/repo_settings.html:61
-msgid "Keep it short and to the point. Use a README file for longer descriptions."
+#: rhodecode/templates/forks/fork.html:45
+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:80
+#: rhodecode/templates/admin/repos/repo_edit.html:79
+#: rhodecode/templates/forks/fork.html:63
+#: rhodecode/templates/settings/repo_settings.html:61
+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:71
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:64
+#: rhodecode/templates/admin/repos/repo_add_base.html:73
 msgid "add"
 msgstr ""
 
@@ -1560,8 +1715,8 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_edit.html:13
 #: rhodecode/templates/admin/users/user_edit_my_account.html:71
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/files/files_source.html:32
-#: rhodecode/templates/journal/journal.html:72
+#: rhodecode/templates/files/files_source.html:44
+#: rhodecode/templates/journal/journal.html:81
 msgid "edit"
 msgstr ""
 
@@ -1570,102 +1725,113 b' msgstr ""'
 msgid "Clone uri"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:85
-msgid "Enable statistics"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:89
-msgid "Enable statistics window on summary page."
+#: 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 downloads"
+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:108
+#: rhodecode/templates/admin/repos/repo_edit.html:117
 msgid "Change owner of this repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:134
+#: rhodecode/templates/admin/repos/repo_edit.html:143
 msgid "Administration"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:137
+#: rhodecode/templates/admin/repos/repo_edit.html:146
 msgid "Statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos/repo_edit.html:150
 msgid "Reset current statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos/repo_edit.html:150
 msgid "Confirm to remove current statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:144
-msgid "Fetched to rev"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:145
-msgid "Stats gathered"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:153
+msgid "Fetched to rev"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:154
+msgid "Stats gathered"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Remote"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:157
+#: rhodecode/templates/admin/repos/repo_edit.html:166
 msgid "Pull changes from remote location"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:157
+#: rhodecode/templates/admin/repos/repo_edit.html:166
 msgid "Confirm to pull changes from remote side"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:168
+#: rhodecode/templates/admin/repos/repo_edit.html:177
 msgid "Cache"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:172
+#: rhodecode/templates/admin/repos/repo_edit.html:181
 msgid "Invalidate repository cache"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:172
+#: rhodecode/templates/admin/repos/repo_edit.html:181
 msgid "Confirm to invalidate repository cache"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:183
+#: rhodecode/templates/admin/repos/repo_edit.html:186
+#: rhodecode/templates/base/base.html:315 rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:319
+msgid "Public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:192
 msgid "Remove from public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:185
+#: rhodecode/templates/admin/repos/repo_edit.html:194
 msgid "Add to public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:190
+#: rhodecode/templates/admin/repos/repo_edit.html:199
 msgid ""
 "All actions made on this repository will be accessible to everyone in public "
 "journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:197
-#: rhodecode/templates/changeset/changeset_file_comment.html:19
+#: rhodecode/templates/admin/repos/repo_edit.html:206
+#: rhodecode/templates/changeset/changeset_file_comment.html:26
 msgid "Delete"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:201
+#: rhodecode/templates/admin/repos/repo_edit.html:210
 msgid "Remove this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:201
+#: rhodecode/templates/admin/repos/repo_edit.html:210
 msgid "Confirm to delete this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:205
+#: rhodecode/templates/admin/repos/repo_edit.html:214
 msgid ""
 "This repository will be renamed in a special way in order to be unaccesible "
 "for RhodeCode and VCS systems.\n"
@@ -1673,12 +1839,12 b' msgid ""'
 "do it manually"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:213
-msgid "Set as fork"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:222
-msgid "Manually set this repository as a fork of another"
+msgid "Set as fork of"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:231
+msgid "Manually set this repository as a fork of another from the list"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
@@ -1710,8 +1876,8 b' msgstr ""'
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
 #: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/journal/journal.html:123
-#: rhodecode/templates/summary/summary.html:71
+#: rhodecode/templates/journal/journal.html:132
+#: rhodecode/templates/summary/summary.html:76
 msgid "private repository"
 msgstr ""
 
@@ -1748,12 +1914,13 b' msgid "Repositories administration"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:40
-#: rhodecode/templates/summary/summary.html:107
+#: rhodecode/templates/summary/summary.html:112
 msgid "Contact"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:68
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+#: rhodecode/templates/admin/users/user_edit.html:222
 #: rhodecode/templates/admin/users/users.html:55
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 msgid "delete"
@@ -1811,10 +1978,12 b' msgstr ""'
 #: rhodecode/templates/admin/settings/settings.html:177
 #: rhodecode/templates/admin/users/user_edit.html:130
 #: rhodecode/templates/admin/users/user_edit.html:155
+#: rhodecode/templates/admin/users/user_edit.html:245
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:116
 #: rhodecode/templates/files/files_add.html:82
 #: rhodecode/templates/files/files_edit.html:68
+#: rhodecode/templates/pullrequests/pullrequest.html:135
 #: rhodecode/templates/settings/repo_settings.html:85
 msgid "Reset"
 msgstr ""
@@ -2067,6 +2236,29 b' msgstr ""'
 msgid "Create repositories"
 msgstr ""
 
+#: rhodecode/templates/admin/users/user_edit.html:171
+#: rhodecode/templates/admin/users/user_edit_my_account.html:100
+#: rhodecode/templates/admin/users/user_edit_my_account.html:201
+msgid "Permission"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:210
+msgid "Email addresses"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:223
+#, python-format
+msgid "Confirm to delete this email: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:237
+msgid "New email address"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:244
+msgid "Add"
+msgstr ""
+
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
 #: rhodecode/templates/base/base.html:124
 msgid "My account"
@@ -2077,7 +2269,7 b' msgid "My Account"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:32
-#: rhodecode/templates/journal/journal.html:32
+#: rhodecode/templates/journal/journal.html:41
 msgid "My repos"
 msgstr ""
 
@@ -2086,39 +2278,34 b' msgid "My permissions"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:37
-#: rhodecode/templates/journal/journal.html:37
+#: rhodecode/templates/journal/journal.html:46
 msgid "ADD"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:50
 #: rhodecode/templates/bookmarks/bookmarks.html:40
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:40
-#: rhodecode/templates/journal/journal.html:51
+#: rhodecode/templates/branches/branches.html:55
+#: rhodecode/templates/journal/journal.html:60
 #: rhodecode/templates/tags/tags.html:40 rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:71
-#: rhodecode/templates/journal/journal.html:72
+#: rhodecode/templates/journal/journal.html:81
 msgid "private"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:81
-#: rhodecode/templates/journal/journal.html:85
+#: rhodecode/templates/journal/journal.html:94
 msgid "No repositories yet"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:83
-#: rhodecode/templates/journal/journal.html:87
+#: rhodecode/templates/journal/journal.html:96
 msgid "create one now"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:100
-#: rhodecode/templates/admin/users/user_edit_my_account.html:201
-msgid "Permission"
-msgstr ""
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr ""
@@ -2189,6 +2376,7 b' msgid "Choosen group members"'
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:61
+#: rhodecode/templates/pullrequests/pullrequest.html:81
 msgid "Remove all elements"
 msgstr ""
 
@@ -2197,6 +2385,7 b' msgid "Available members"'
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:79
+#: rhodecode/templates/pullrequests/pullrequest.html:99
 msgid "Add all elements"
 msgstr ""
 
@@ -2246,15 +2435,33 b' msgstr ""'
 msgid "Inbox"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:122 rhodecode/templates/base/base.html:289
-#: rhodecode/templates/base/base.html:291 rhodecode/templates/base/base.html:293
+#: rhodecode/templates/base/base.html:122 rhodecode/templates/base/base.html:297
+#: rhodecode/templates/base/base.html:299 rhodecode/templates/base/base.html:301
+#: 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:298
-#: rhodecode/templates/base/base.html:300 rhodecode/templates/base/base.html:302
+#: rhodecode/templates/base/base.html:123 rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:308 rhodecode/templates/base/base.html:310
 #: rhodecode/templates/journal/journal.html:4
-#: rhodecode/templates/journal/journal.html:17
+#: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr ""
@@ -2325,10 +2532,6 b' msgstr ""'
 msgid "search"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:217
-msgid "journal"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:219
 msgid "repositories groups"
 msgstr ""
@@ -2353,10 +2556,8 b' msgstr ""'
 msgid "Forks"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:316 rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:320 rhodecode/templates/search/search.html:4
-#: rhodecode/templates/search/search.html:24
-#: rhodecode/templates/search/search.html:46
+#: rhodecode/templates/base/base.html:324 rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:328 rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr ""
 
@@ -2365,13 +2566,13 b' msgid "add another comment"'
 msgstr ""
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:111
-#: rhodecode/templates/summary/summary.html:52
+#: rhodecode/templates/journal/journal.html:120
+#: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:44
-#: rhodecode/templates/summary/summary.html:56
+#: rhodecode/templates/summary/summary.html:61
 msgid "Start following this repository"
 msgstr ""
 
@@ -2379,6 +2580,14 b' msgstr ""'
 msgid "Group"
 msgstr ""
 
+#: rhodecode/templates/base/root.html:47
+msgid "search truncated"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:48
+msgid "no matching files"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
@@ -2386,7 +2595,7 b' msgstr ""'
 
 #: rhodecode/templates/bookmarks/bookmarks.html:39
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:39
+#: rhodecode/templates/branches/branches.html:54
 #: rhodecode/templates/tags/tags.html:39 rhodecode/templates/tags/tags_data.html:8
 msgid "Author"
 msgstr ""
@@ -2396,6 +2605,16 b' msgstr ""'
 msgid "%s Branches"
 msgstr ""
 
+#: rhodecode/templates/branches/branches.html:29
+msgid "Compare branches"
+msgstr ""
+
+#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/compare/compare_diff.html:5
+#: rhodecode/templates/compare/compare_diff.html:13
+msgid "Compare"
+msgstr ""
+
 #: rhodecode/templates/branches/branches_data.html:7
 msgid "date"
 msgstr ""
@@ -2410,6 +2629,10 b' msgstr ""'
 msgid "revision"
 msgstr ""
 
+#: rhodecode/templates/branches/branches_data.html:10
+msgid "compare"
+msgstr ""
+
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
@@ -2422,36 +2645,60 b' msgid_plural "showing %d out of %d revis'
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changelog/changelog.html:38
+#: rhodecode/templates/changelog/changelog.html:37
+#, python-format
+msgid "compare fork with %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:37
+msgid "Compare fork"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:39
+msgid "Open new pull request"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:44
 msgid "Show"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:64
-#: rhodecode/templates/summary/summary.html:352
+#: rhodecode/templates/changelog/changelog.html:70
+#: rhodecode/templates/summary/summary.html:357
 msgid "show more"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:68
+#: rhodecode/templates/changelog/changelog.html:74
 msgid "Affected number of files, click to show more details"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:82
-#: rhodecode/templates/changeset/changeset.html:72
+#: rhodecode/templates/changelog/changelog.html:87
+#: rhodecode/templates/changeset/changeset.html:38
+#: rhodecode/templates/changeset/changeset_file_comment.html:20
+#: rhodecode/templates/changeset/changeset_range.html:46
+msgid "Changeset status"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:90
+msgid "Click to open associated pull request"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:100
+#: rhodecode/templates/changeset/changeset.html:78
 msgid "Parent"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:88
-#: rhodecode/templates/changeset/changeset.html:78
+#: rhodecode/templates/changelog/changelog.html:106
+#: rhodecode/templates/changeset/changeset.html:84
 msgid "No parents"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:93
-#: rhodecode/templates/changeset/changeset.html:82
+#: rhodecode/templates/changelog/changelog.html:111
+#: rhodecode/templates/changeset/changeset.html:88
 msgid "merge"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:96
-#: rhodecode/templates/changeset/changeset.html:85
+#: rhodecode/templates/changelog/changelog.html:114
+#: rhodecode/templates/changeset/changeset.html:91
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_add.html:33
 #: rhodecode/templates/files/files_edit.html:33
@@ -2459,44 +2706,44 b' msgstr ""'
 msgid "branch"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:102
+#: rhodecode/templates/changelog/changelog.html:120
 msgid "bookmark"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:108
-#: rhodecode/templates/changeset/changeset.html:90
+#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changeset/changeset.html:96
 msgid "tag"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:144
+#: rhodecode/templates/changelog/changelog.html:162
 msgid "Show selected changes __S -> __E"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:235
+#: rhodecode/templates/changelog/changelog.html:253
 msgid "There are no changes yet"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_details.html:2
-#: rhodecode/templates/changeset/changeset.html:60
-msgid "removed"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_details.html:3
-#: rhodecode/templates/changeset/changeset.html:61
-msgid "changed"
-msgstr ""
-
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:62
-msgid "added"
+#: rhodecode/templates/changeset/changeset.html:66
+msgid "removed"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:5
+#: rhodecode/templates/changeset/changeset.html:67
+msgid "changed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changelog/changelog_details.html:7
+#: rhodecode/templates/changeset/changeset.html:68
+msgid "added"
+msgstr ""
+
 #: rhodecode/templates/changelog/changelog_details.html:8
-#: rhodecode/templates/changeset/changeset.html:64
-#: rhodecode/templates/changeset/changeset.html:65
-#: rhodecode/templates/changeset/changeset.html:66
+#: 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
 #, python-format
 msgid "affected %s files"
 msgstr ""
@@ -2510,92 +2757,103 b' msgstr ""'
 msgid "Changeset"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:37
+#: rhodecode/templates/changeset/changeset.html:43
 #: rhodecode/templates/changeset/diff_block.html:20
 msgid "raw diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:38
+#: rhodecode/templates/changeset/changeset.html:44
 #: rhodecode/templates/changeset/diff_block.html:21
 msgid "download diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:42
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+#: rhodecode/templates/changeset/changeset.html:48
+#: 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:42
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+#: rhodecode/templates/changeset/changeset.html:48
+#: 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:97
+#: rhodecode/templates/changeset/changeset.html:103
 #, python-format
 msgid "%s files affected with %s insertions and %s deletions:"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:113
+#: rhodecode/templates/changeset/changeset.html:119
 msgid "Changeset was too big and was cut off..."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:35
+#: rhodecode/templates/changeset/changeset_file_comment.html:42
 msgid "Submitting..."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:38
+#: rhodecode/templates/changeset/changeset_file_comment.html:45
 msgid "Commenting on line {1}."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:39
-#: rhodecode/templates/changeset/changeset_file_comment.html:102
+#: rhodecode/templates/changeset/changeset_file_comment.html:46
+#: rhodecode/templates/changeset/changeset_file_comment.html:115
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:41
-#: rhodecode/templates/changeset/changeset_file_comment.html:104
+#: rhodecode/templates/changeset/changeset_file_comment.html:48
+#: rhodecode/templates/changeset/changeset_file_comment.html:117
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:49
-#: rhodecode/templates/changeset/changeset_file_comment.html:110
+#: rhodecode/templates/changeset/changeset_file_comment.html:59
+#: rhodecode/templates/changeset/changeset_file_comment.html:132
 msgid "Comment"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:50
-#: rhodecode/templates/changeset/changeset_file_comment.html:61
+#: 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:57
+#: 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:57
+#: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "Login now"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:99
+#: rhodecode/templates/changeset/changeset_file_comment.html:112
 msgid "Leave a comment"
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset_file_comment.html:118
+msgid "Check this to change current status of code-review for this changeset"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:118
+msgid "change status"
+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:49
+#: rhodecode/templates/changeset/changeset_range.html:54
+#: rhodecode/templates/compare/compare_diff.html:41
+#: rhodecode/templates/pullrequests/pullrequest_show.html:71
 msgid "Files affected"
 msgstr ""
 
@@ -2607,6 +2865,14 b' msgstr ""'
 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/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 #: rhodecode/templates/data_table/_dt_elements.html:37
@@ -2614,26 +2880,26 b' msgid "Fork"'
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/journal/journal.html:117
-#: rhodecode/templates/summary/summary.html:63
+#: rhodecode/templates/journal/journal.html:126
+#: rhodecode/templates/summary/summary.html:68
 msgid "Mercurial repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/journal/journal.html:119
-#: rhodecode/templates/summary/summary.html:66
+#: rhodecode/templates/journal/journal.html:128
+#: rhodecode/templates/summary/summary.html:71
 msgid "Git repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/journal/journal.html:125
-#: rhodecode/templates/summary/summary.html:73
+#: rhodecode/templates/journal/journal.html:134
+#: rhodecode/templates/summary/summary.html:78
 msgid "public repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/summary/summary.html:82
-#: rhodecode/templates/summary/summary.html:83
+#: rhodecode/templates/summary/summary.html:87
+#: rhodecode/templates/summary/summary.html:88
 msgid "Fork of"
 msgstr ""
 
@@ -2645,7 +2911,7 b' msgstr ""'
 msgid "This is an notification from RhodeCode."
 msgstr ""
 
-#: rhodecode/templates/errors/error_document.html:44
+#: rhodecode/templates/errors/error_document.html:46
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
@@ -2665,18 +2931,10 b' msgid "%s Files"'
 msgstr ""
 
 #: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:328
+#: rhodecode/templates/summary/summary.html:333
 msgid "files"
 msgstr ""
 
-#: rhodecode/templates/files/files.html:44
-msgid "search truncated"
-msgstr ""
-
-#: rhodecode/templates/files/files.html:45
-msgid "no matching files"
-msgstr ""
-
 #: rhodecode/templates/files/files_add.html:4
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
@@ -2784,18 +3042,18 b' msgid "edit file"'
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:26
+#: rhodecode/templates/files/files_source.html:38
 msgid "show annotation"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:50
-#: rhodecode/templates/files/files_source.html:28
-#: rhodecode/templates/files/files_source.html:56
+#: rhodecode/templates/files/files_source.html:40
+#: rhodecode/templates/files/files_source.html:68
 msgid "show as raw"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:51
-#: rhodecode/templates/files/files_source.html:29
+#: rhodecode/templates/files/files_source.html:41
 msgid "download as raw"
 msgstr ""
 
@@ -2811,20 +3069,35 b' msgstr ""'
 msgid "History"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:24
+#: rhodecode/templates/files/files_source.html:9
+msgid "diff to revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:10
+msgid "show at revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:14
+#, python-format
+msgid "%s author"
+msgid_plural "%s authors"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/files/files_source.html:36
 msgid "show source"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:47
+#: rhodecode/templates/files/files_source.html:59
 #, python-format
 msgid "Binary file (%s)"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:56
+#: rhodecode/templates/files/files_source.html:68
 msgid "File is too big to display"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:112
+#: rhodecode/templates/files/files_source.html:124
 msgid "Selection link"
 msgstr ""
 
@@ -2862,19 +3135,27 b' msgstr ""'
 msgid "Fork name"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:57
+#: rhodecode/templates/forks/fork.html:68
 msgid "Private"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:65
+#: rhodecode/templates/forks/fork.html:77
 msgid "Copy permissions"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:73
+#: 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:80
+#: 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 ""
 
@@ -2895,23 +3176,42 b' msgstr ""'
 msgid "There are no forks yet"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:20
+#: 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
 msgid "Refresh"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:32
+#: 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:105
+#: rhodecode/templates/journal/journal.html:114
 msgid "following user"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:105
+#: rhodecode/templates/journal/journal.html:114
 msgid "user"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:138
+#: rhodecode/templates/journal/journal.html:147
 msgid "You are not following any users or repositories"
 msgstr ""
 
@@ -2919,33 +3219,122 b' msgstr ""'
 msgid "No entries yet"
 msgstr ""
 
-#: rhodecode/templates/journal/public_journal.html:17
+#: 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/search/search.html:7
-#: rhodecode/templates/search/search.html:26
-msgid "in repository: "
-msgstr ""
-
-#: rhodecode/templates/search/search.html:9
-#: rhodecode/templates/search/search.html:28
-msgid "in all repositories"
-msgstr ""
-
-#: rhodecode/templates/search/search.html:42
+#: rhodecode/templates/pullrequests/pullrequest.html:4
+#: rhodecode/templates/pullrequests/pullrequest.html:12
+msgid "New pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:28
+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:40
+msgid "Pull request reviewers"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:78
+msgid "Chosen reviewers"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:95
+msgid "Available reviewers"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:108
+msgid "Create new pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:117
+#: rhodecode/templates/pullrequests/pullrequest_show.html:23
+msgid "Title"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:126
+msgid "description"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:134
+msgid "Send pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:4
+#: rhodecode/templates/pullrequests/pullrequest_show.html:12
+#, python-format
+msgid "Pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:26
+msgid "Pull request status"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:33
+msgid "Created on"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:63
+msgid "Compare view"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:67
+msgid "Incoming changesets"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
+msgid "All pull requests"
+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:54
+#: rhodecode/templates/search/search.html:60
 msgid "Search in"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:57
+#: rhodecode/templates/search/search.html:63
 msgid "File contents"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:59
+#: rhodecode/templates/search/search.html:65
 msgid "File names"
 msgstr ""
 
@@ -2997,120 +3386,130 b' msgstr ""'
 msgid "summary"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:44
-#: rhodecode/templates/summary/summary.html:47
+#: 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:77
-#, python-format
-msgid "Non changable ID %s"
-msgstr ""
-
 #: rhodecode/templates/summary/summary.html:82
+#, python-format
+msgid "Non changable ID %s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:87
 msgid "public"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:90
+#: rhodecode/templates/summary/summary.html:95
 msgid "remote clone"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:121
+#: rhodecode/templates/summary/summary.html:126
 msgid "Clone url"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:124
+#: rhodecode/templates/summary/summary.html:129
 msgid "Show by Name"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:125
+#: rhodecode/templates/summary/summary.html:130
 msgid "Show by ID"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:133
+#: rhodecode/templates/summary/summary.html:138
 msgid "Trending files"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:141
-#: rhodecode/templates/summary/summary.html:157
-#: rhodecode/templates/summary/summary.html:185
+#: rhodecode/templates/summary/summary.html:146
+#: rhodecode/templates/summary/summary.html:162
+#: rhodecode/templates/summary/summary.html:190
 msgid "enable"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/templates/summary/summary.html:154
 msgid "Download"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:153
+#: rhodecode/templates/summary/summary.html:158
 msgid "There are no downloads yet"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:155
+#: rhodecode/templates/summary/summary.html:160
 msgid "Downloads are disabled for this repository"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:161
+#: rhodecode/templates/summary/summary.html:166
 msgid "Download as zip"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:164
+#: rhodecode/templates/summary/summary.html:169
 msgid "Check this to download archive with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:164
+#: rhodecode/templates/summary/summary.html:169
 msgid "with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:177
+#: rhodecode/templates/summary/summary.html:182
 msgid "Commit activity by day / author"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:188
+#: rhodecode/templates/summary/summary.html:193
 msgid "Stats gathered: "
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:209
+#: rhodecode/templates/summary/summary.html:214
 msgid "Shortlog"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:211
+#: rhodecode/templates/summary/summary.html:216
 msgid "Quick start"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:281
+#: rhodecode/templates/summary/summary.html:286
 #, python-format
 msgid "Download %s as %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:638
+#: rhodecode/templates/summary/summary.html:643
 msgid "commits"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:639
-msgid "files added"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:640
-msgid "files changed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:641
-msgid "files removed"
-msgstr ""
-
 #: rhodecode/templates/summary/summary.html:644
-msgid "commit"
+msgid "files added"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:645
-msgid "file added"
+msgid "files changed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:646
+msgid "files removed"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:649
+msgid "commit"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:650
+msgid "file added"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:651
 msgid "file changed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:647
+#: rhodecode/templates/summary/summary.html:652
 msgid "file removed"
 msgstr ""
 

rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode 1.2.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-06-03 01:06+0200\n"
+"POT-Creation-Date: 2012-07-02 11:58+0200\n"
 "PO-Revision-Date: 2012-04-05 17:37+0800\n"
 "Last-Translator: mikespook <[e-mail]>\n"
 "Language-Team: mikespook\n"
@@ -17,26 +17,26 b' msgstr ""'
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: rhodecode/controllers/changelog.py:95
+#: rhodecode/controllers/changelog.py:94
 #, fuzzy
 msgid "All Branches"
 msgstr "分支"
 
-#: rhodecode/controllers/changeset.py:80
+#: rhodecode/controllers/changeset.py:81
 msgid "show white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:87 rhodecode/controllers/changeset.py:94
+#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95
 msgid "ignore white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:154
+#: rhodecode/controllers/changeset.py:155
 #, fuzzy, python-format
 msgid "%s line context"
 msgstr "文件内容"
 
-#: rhodecode/controllers/changeset.py:324
-#: rhodecode/controllers/changeset.py:339 rhodecode/lib/diffs.py:62
+#: rhodecode/controllers/changeset.py:331
+#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69
 msgid "binary file"
 msgstr "二进制文件"
 
@@ -66,16 +66,22 b' msgid ""'
 "fulfilling the request."
 msgstr "服务进入非预期的混乱状态，这会阻止它对请求进行响应。"
 
-#: rhodecode/controllers/feed.py:48
+#: rhodecode/controllers/feed.py:49
 #, python-format
 msgid "Changes on %s repository"
 msgstr "%s 库的修改"
 
-#: rhodecode/controllers/feed.py:49
+#: rhodecode/controllers/feed.py:50
 #, python-format
 msgid "%s %s feed"
 msgstr "%s %s 订阅"
 
+#: rhodecode/controllers/feed.py:75
+#, fuzzy
+#| msgid "commit"
+msgid "commited on"
+msgstr "提交"
+
 #: rhodecode/controllers/files.py:86
 #: rhodecode/templates/admin/repos/repo_add.html:13
 msgid "add new"
@@ -86,74 +92,73 b' msgstr "\xe6\x96\xb0\xe5\xa2\x9e"'
 msgid "There are no files yet %s"
 msgstr "尚无文件"
 
-#: rhodecode/controllers/files.py:247
+#: rhodecode/controllers/files.py:256
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr "通过 RhodeCode 修改了 %s"
 
-#: rhodecode/controllers/files.py:252
+#: rhodecode/controllers/files.py:261
 msgid "No changes"
 msgstr "无变更"
 
-#: rhodecode/controllers/files.py:263 rhodecode/controllers/files.py:316
+#: rhodecode/controllers/files.py:272 rhodecode/controllers/files.py:326
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "成功提交到 %s"
 
-#: rhodecode/controllers/files.py:268 rhodecode/controllers/files.py:322
+#: rhodecode/controllers/files.py:277 rhodecode/controllers/files.py:332
 msgid "Error occurred during commit"
 msgstr "提交时发生错误"
 
-#: rhodecode/controllers/files.py:288
+#: rhodecode/controllers/files.py:298
 #, fuzzy, python-format
 msgid "Added %s via RhodeCode"
 msgstr "通过 RhodeCode 修改了 %s"
 
-#: rhodecode/controllers/files.py:302
+#: rhodecode/controllers/files.py:312
 #, fuzzy
 msgid "No content"
 msgstr "文件内容"
 
-#: rhodecode/controllers/files.py:306
+#: rhodecode/controllers/files.py:316
 #, fuzzy
 msgid "No filename"
 msgstr "文件名"
 
-#: rhodecode/controllers/files.py:347
+#: rhodecode/controllers/files.py:358
 msgid "downloads disabled"
 msgstr "禁止下载"
 
-#: rhodecode/controllers/files.py:358
+#: rhodecode/controllers/files.py:369
 #, python-format
 msgid "Unknown revision %s"
 msgstr "未知版本 %s"
 
-#: rhodecode/controllers/files.py:360
+#: rhodecode/controllers/files.py:371
 msgid "Empty repository"
 msgstr "空版本库"
 
-#: rhodecode/controllers/files.py:362
+#: rhodecode/controllers/files.py:373
 msgid "Unknown archive type"
 msgstr "未知包类型"
 
-#: rhodecode/controllers/files.py:461
-#: rhodecode/templates/changeset/changeset_range.html:5
+#: rhodecode/controllers/files.py:474
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "变更集"
 
-#: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:230
-#: rhodecode/templates/branches/branches.html:5
+#: rhodecode/controllers/files.py:475 rhodecode/controllers/pullrequests.py:65
+#: rhodecode/controllers/summary.py:230 rhodecode/model/scm.py:497
 msgid "Branches"
 msgstr "分支"
 
-#: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:231
-#: rhodecode/templates/tags/tags.html:5
+#: rhodecode/controllers/files.py:476 rhodecode/controllers/pullrequests.py:69
+#: rhodecode/controllers/summary.py:231 rhodecode/model/scm.py:508
 msgid "Tags"
 msgstr "标签"
 
-#: rhodecode/controllers/forks.py:69 rhodecode/controllers/admin/repos.py:86
+#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:88
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -161,7 +166,7 b' msgid ""'
 "repositories"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:128 rhodecode/controllers/settings.py:69
+#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -169,29 +174,27 b' msgid ""'
 "repositories"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:163
+#: rhodecode/controllers/forks.py:166
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "版本库 %s 被分支到 %s"
 
-#: rhodecode/controllers/forks.py:177
+#: rhodecode/controllers/forks.py:180
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:53
-#, python-format
-msgid "%s public journal %s feed"
-msgstr "公共日志 %s %s 订阅"
-
-#: rhodecode/controllers/journal.py:190 rhodecode/controllers/journal.py:223
-#: rhodecode/templates/admin/repos/repo_edit.html:177
-#: rhodecode/templates/base/base.html:307
-#: rhodecode/templates/base/base.html:309
-#: rhodecode/templates/base/base.html:311
-msgid "Public journal"
+#: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239
+#, fuzzy
+#| msgid "Public journal"
+msgid "public journal"
 msgstr "公共日志"
 
+#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243
+#: rhodecode/templates/base/base.html:217
+msgid "journal"
+msgstr "日志"
+
 #: rhodecode/controllers/login.py:116
 msgid "You have successfully registered into rhodecode"
 msgstr "成功注册到 rhodecode"
@@ -206,6 +209,27 b' msgid ""'
 "email"
 msgstr "密码已经成功重置，新密码已经发送到你的邮箱"
 
+#: rhodecode/controllers/pullrequests.py:67 rhodecode/model/scm.py:503
+msgid "Bookmarks"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:117
+#, python-format
+msgid "%s (owner)"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:142
+#, fuzzy
+#| msgid "successfully deleted user"
+msgid "Successfully opened new pull request"
+msgstr "用户删除成功"
+
+#: rhodecode/controllers/pullrequests.py:145
+#, fuzzy
+#| msgid "Error occurred during commit"
+msgid "Error occurred during sending pull request"
+msgstr "提交时发生错误"
+
 #: rhodecode/controllers/search.py:114
 msgid "Invalid search query. Try quoting it."
 msgstr "错误的搜索。请尝试用引号包含它。"
@@ -218,20 +242,20 b' msgstr "\xe6\xb2\xa1\xe6\x9c\x89\xe7\xb4\xa2\xe5\xbc\x95\xe7\x94\xa8\xe4\xba\x8e\xe6\x90\x9c\xe7\xb4\xa2\xe3\x80\x82\xe8\xaf\xb7\xe8\xbf\x90\xe8\xa1\x8c whoosh \xe7\xb4\xa2\xe5\xbc\x95\xe5\x99\xa8"'
 msgid "An error occurred during this search operation"
 msgstr "在搜索操作中发生异常"
 
-#: rhodecode/controllers/settings.py:103
-#: rhodecode/controllers/admin/repos.py:213
+#: rhodecode/controllers/settings.py:107
+#: rhodecode/controllers/admin/repos.py:221
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "版本库 %s 成功更新"
 
-#: rhodecode/controllers/settings.py:121
-#: rhodecode/controllers/admin/repos.py:231
+#: rhodecode/controllers/settings.py:125
+#: rhodecode/controllers/admin/repos.py:239
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:139
-#: rhodecode/controllers/admin/repos.py:249
+#: rhodecode/controllers/settings.py:143
+#: rhodecode/controllers/admin/repos.py:257
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from "
@@ -239,15 +263,15 b' msgid ""'
 "repositories"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:151
-#: rhodecode/controllers/admin/repos.py:261
+#: rhodecode/controllers/settings.py:155
+#: rhodecode/controllers/admin/repos.py:269
 #, python-format
 msgid "deleted repository %s"
 msgstr "已经删除版本库 %s"
 
-#: rhodecode/controllers/settings.py:155
-#: rhodecode/controllers/admin/repos.py:271
-#: rhodecode/controllers/admin/repos.py:277
+#: rhodecode/controllers/settings.py:159
+#: rhodecode/controllers/admin/repos.py:279
+#: rhodecode/controllers/admin/repos.py:285
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
@@ -257,7 +281,7 b' msgid "No data loaded yet"'
 msgstr ""
 
 #: rhodecode/controllers/summary.py:142
-#: rhodecode/templates/summary/summary.html:139
+#: rhodecode/templates/summary/summary.html:144
 msgid "Statistics are disabled for this repository"
 msgstr "该版本库统计功能已经禁用"
 
@@ -348,9 +372,9 b' msgstr "\xe5\x86\x99"'
 #: 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:326
-#: rhodecode/templates/base/base.html:328
-#: rhodecode/templates/base/base.html:330
+#: rhodecode/templates/base/base.html:334
+#: rhodecode/templates/base/base.html:336
+#: rhodecode/templates/base/base.html:338
 msgid "Admin"
 msgstr "管理"
 
@@ -382,76 +406,76 b' msgstr "\xe6\x88\x90\xe5\x8a\x9f\xe6\x9b\xb4\xe6\x96\xb0\xe9\xbb\x98\xe8\xae\xa4\xe6\x9d\x83\xe9\x99\x90"'
 msgid "error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:116
+#: rhodecode/controllers/admin/repos.py:121
 msgid "--REMOVE FORK--"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:144
+#: rhodecode/controllers/admin/repos.py:151
 #, python-format
 msgid "created repository %s from %s"
 msgstr "新版本库 %s 基于 %s 建立。"
 
-#: rhodecode/controllers/admin/repos.py:148
+#: rhodecode/controllers/admin/repos.py:155
 #, python-format
 msgid "created repository %s"
 msgstr "建立版本库 %s"
 
-#: rhodecode/controllers/admin/repos.py:179
+#: rhodecode/controllers/admin/repos.py:186
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:266
+#: rhodecode/controllers/admin/repos.py:274
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:295
+#: rhodecode/controllers/admin/repos.py:303
 msgid "An error occurred during deletion of repository user"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:314
+#: rhodecode/controllers/admin/repos.py:322
 msgid "An error occurred during deletion of repository users groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/admin/repos.py:339
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:347
+#: rhodecode/controllers/admin/repos.py:355
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:367
+#: rhodecode/controllers/admin/repos.py:375
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:371
+#: rhodecode/controllers/admin/repos.py:379
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:376 rhodecode/model/forms.py:54
+#: rhodecode/controllers/admin/repos.py:384 rhodecode/model/validators.py:269
 msgid "Token mismatch"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:389
+#: rhodecode/controllers/admin/repos.py:397
 msgid "Pulled from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:391
+#: rhodecode/controllers/admin/repos.py:399
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:407
+#: rhodecode/controllers/admin/repos.py:415
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:409
+#: rhodecode/controllers/admin/repos.py:417
 #, fuzzy, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "新版本库 %s 基于 %s 建立。"
 
-#: rhodecode/controllers/admin/repos.py:413
+#: rhodecode/controllers/admin/repos.py:421
 #, fuzzy
 msgid "An error occurred during this operation"
 msgstr "在搜索操作中发生异常"
@@ -519,80 +543,97 b' msgid "Updated application settings"'
 msgstr "更新应用设置"
 
 #: rhodecode/controllers/admin/settings.py:159
-#: rhodecode/controllers/admin/settings.py:226
+#: rhodecode/controllers/admin/settings.py:227
 msgid "error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:221
+#: rhodecode/controllers/admin/settings.py:222
 msgid "Updated mercurial settings"
 msgstr "更新 mercurial 设置"
 
-#: rhodecode/controllers/admin/settings.py:246
+#: rhodecode/controllers/admin/settings.py:247
 msgid "Added new hook"
 msgstr "新增钩子"
 
-#: rhodecode/controllers/admin/settings.py:258
+#: rhodecode/controllers/admin/settings.py:259
 msgid "Updated hooks"
 msgstr "更新钩子"
 
-#: rhodecode/controllers/admin/settings.py:262
+#: rhodecode/controllers/admin/settings.py:263
 msgid "error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:281
+#: rhodecode/controllers/admin/settings.py:282
 msgid "Email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:336
+#: rhodecode/controllers/admin/settings.py:337
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:367
+#: rhodecode/controllers/admin/settings.py:368
 msgid "Your account was updated successfully"
 msgstr "你的帐号已经更新完成"
 
-#: rhodecode/controllers/admin/settings.py:387
-#: rhodecode/controllers/admin/users.py:138
+#: rhodecode/controllers/admin/settings.py:388
+#: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:83
+#: rhodecode/controllers/admin/users.py:84
 #, python-format
 msgid "created user %s"
 msgstr "创建用户 %s"
 
-#: rhodecode/controllers/admin/users.py:95
+#: rhodecode/controllers/admin/users.py:96
 #, python-format
 msgid "error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:124
+#: rhodecode/controllers/admin/users.py:125
 msgid "User updated successfully"
 msgstr "用户更新成功"
 
-#: rhodecode/controllers/admin/users.py:155
+#: rhodecode/controllers/admin/users.py:159
 msgid "successfully deleted user"
 msgstr "用户删除成功"
 
-#: rhodecode/controllers/admin/users.py:160
+#: rhodecode/controllers/admin/users.py:164
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:175
+#: rhodecode/controllers/admin/users.py:178
 msgid "You can't edit this user"
 msgstr "无法编辑该用户"
 
-#: rhodecode/controllers/admin/users.py:205
+#: rhodecode/controllers/admin/users.py:210
 #: rhodecode/controllers/admin/users_groups.py:219
 msgid "Granted 'repository create' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:214
+#: rhodecode/controllers/admin/users.py:219
 #: rhodecode/controllers/admin/users_groups.py:229
 msgid "Revoked 'repository create' permission to user"
 msgstr ""
 
+#: rhodecode/controllers/admin/users.py:235
+#, python-format
+msgid "Added email %s to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:241
+#, fuzzy
+#| msgid "An error occurred during this operation"
+msgid "An error occurred during email saving"
+msgstr "在搜索操作中发生异常"
+
+#: rhodecode/controllers/admin/users.py:251
+#, fuzzy, python-format
+#| msgid "removed repos group %s"
+msgid "Removed email from user"
+msgstr "移除版本库组 %s"
+
 #: rhodecode/controllers/admin/users_groups.py:84
 #, python-format
 msgid "created users group %s"
@@ -629,137 +670,142 b' msgstr "\xe5\xbf\x85\xe9\xa1\xbb\xe6\x98\xaf\xe6\xb3\xa8\xe5\x86\x8c\xe7\x94\xa8\xe6\x88\xb7\xe6\x89\x8d\xe8\x83\xbd\xe8\xbf\x9b\xe8\xa1\x8c\xe6\xad\xa4\xe6\x93\x8d\xe4\xbd\x9c"'
 msgid "You need to be a signed in to view this page"
 msgstr "必须登录才能访问该页面"
 
-#: rhodecode/lib/diffs.py:78
+#: rhodecode/lib/diffs.py:85
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr "变更集因过大而被截断，可查看原始变更集作为替代"
 
-#: rhodecode/lib/diffs.py:88
+#: rhodecode/lib/diffs.py:95
 #, fuzzy
 msgid "No changes detected"
 msgstr "尚无修订"
 
-#: rhodecode/lib/helpers.py:415
+#: rhodecode/lib/helpers.py:369
+#, python-format
+msgid "%a, %d %b %Y %H:%M:%S"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:442
 msgid "True"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:419
+#: rhodecode/lib/helpers.py:446
 msgid "False"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:463
+#: rhodecode/lib/helpers.py:490
 #, fuzzy
 msgid "Changeset not found"
 msgstr "修改"
 
-#: rhodecode/lib/helpers.py:486
+#: rhodecode/lib/helpers.py:513
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:492
+#: rhodecode/lib/helpers.py:519
 msgid "compare view"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:512
+#: rhodecode/lib/helpers.py:539
 msgid "and"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:513
+#: rhodecode/lib/helpers.py:540
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:514 rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46
 msgid "revisions"
 msgstr "修订"
 
-#: rhodecode/lib/helpers.py:537
+#: rhodecode/lib/helpers.py:564
 msgid "fork name "
 msgstr "分支名称"
 
-#: rhodecode/lib/helpers.py:550
+#: rhodecode/lib/helpers.py:577
 msgid "[deleted] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:552 rhodecode/lib/helpers.py:562
+#: rhodecode/lib/helpers.py:579 rhodecode/lib/helpers.py:589
 msgid "[created] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:554
+#: rhodecode/lib/helpers.py:581
 #, fuzzy
 msgid "[created] repository as fork"
 msgstr "建立版本库 %s"
 
-#: rhodecode/lib/helpers.py:556 rhodecode/lib/helpers.py:564
+#: rhodecode/lib/helpers.py:583 rhodecode/lib/helpers.py:591
 msgid "[forked] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:558 rhodecode/lib/helpers.py:566
+#: rhodecode/lib/helpers.py:585 rhodecode/lib/helpers.py:593
 msgid "[updated] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:560
+#: rhodecode/lib/helpers.py:587
 msgid "[delete] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:568
-#, fuzzy, python-format
-#| msgid "created user %s"
+#: rhodecode/lib/helpers.py:595
+#, fuzzy
 msgid "[created] user"
 msgstr "创建用户 %s"
 
-#: rhodecode/lib/helpers.py:570
-#, fuzzy, python-format
-#| msgid "updated users group %s"
+#: rhodecode/lib/helpers.py:597
+#, fuzzy
 msgid "[updated] user"
 msgstr "更新用户组 %s"
 
-#: rhodecode/lib/helpers.py:572
-#, fuzzy, python-format
-#| msgid "created users group %s"
+#: rhodecode/lib/helpers.py:599
+#, fuzzy
 msgid "[created] users group"
 msgstr "建立用户组 %s"
 
-#: rhodecode/lib/helpers.py:574
-#, fuzzy, python-format
-#| msgid "updated users group %s"
+#: rhodecode/lib/helpers.py:601
+#, fuzzy
 msgid "[updated] users group"
 msgstr "更新用户组 %s"
 
-#: rhodecode/lib/helpers.py:576
+#: rhodecode/lib/helpers.py:603
 msgid "[commented] on revision in repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:578
+#: rhodecode/lib/helpers.py:605
+msgid "[commented] on pull request"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:607
 msgid "[pushed] into"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:580
+#: rhodecode/lib/helpers.py:609
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:582
+#: rhodecode/lib/helpers.py:611
 msgid "[pulled from remote] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:584
+#: rhodecode/lib/helpers.py:613
 msgid "[pulled] from"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:586
+#: rhodecode/lib/helpers.py:615
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:588
+#: rhodecode/lib/helpers.py:617
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:752
+#: rhodecode/lib/helpers.py:781
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:756
+#: rhodecode/lib/helpers.py:785
 msgid "No Files"
 msgstr "没有文件"
 
@@ -818,199 +864,343 b' msgstr "\xe7\x8e\xb0\xe5\x9c\xa8"'
 msgid "password reset link"
 msgstr "密码重置链接已经发送"
 
-#: rhodecode/model/comment.py:85
+#: rhodecode/model/comment.py:109
 #, python-format
 msgid "on line %s"
 msgstr ""
 
-#: rhodecode/model/comment.py:113
+#: rhodecode/model/comment.py:146
 msgid "[Mention]"
 msgstr ""
 
-#: rhodecode/model/forms.py:72
-msgid "Invalid username"
-msgstr "非法的用户名"
-
-#: rhodecode/model/forms.py:80
-msgid "This username already exists"
-msgstr "该用户名已经存在"
-
-#: rhodecode/model/forms.py:85
-msgid ""
-"Username may only contain alphanumeric characters underscores, periods or"
-" dashes and must begin with alphanumeric character"
-msgstr "只能使用字母、数字、下划线、小数点或减号作为用户名，且必须由数字或字母开头"
-
-#: rhodecode/model/forms.py:101
-msgid "Invalid group name"
-msgstr "非法的用户组名称"
-
-#: rhodecode/model/forms.py:111
-msgid "This users group already exists"
-msgstr "该用户组名称已经存在"
-
-#: rhodecode/model/forms.py:117
+#: rhodecode/model/db.py:1062
 #, fuzzy
-msgid ""
-"RepoGroup name may only contain  alphanumeric characters underscores, "
-"periods or dashes and must begin with alphanumeric character"
-msgstr "只能使用字母、数字、下划线、小数点或减号作为用户组名，且必须由数字或字母开头"
-
-#: rhodecode/model/forms.py:145
-msgid "Cannot assign this group as parent"
-msgstr ""
-
-#: rhodecode/model/forms.py:164
-msgid "This group already exists"
-msgstr "该组已经存在"
-
-#: rhodecode/model/forms.py:176
+#| msgid "repositories"
+msgid "Repository no access"
+msgstr "个版本库"
+
+#: rhodecode/model/db.py:1063
 #, fuzzy
-msgid "Repository with this name already exists"
+#| msgid "This repository already exists"
+msgid "Repository read access"
 msgstr "这个版本库已经存在"
 
-#: rhodecode/model/forms.py:195 rhodecode/model/forms.py:204
-#: rhodecode/model/forms.py:213
-msgid "Invalid characters in password"
-msgstr "密码含有无效字符"
-
-#: rhodecode/model/forms.py:226
-msgid "Passwords do not match"
-msgstr "密码不符"
-
-#: rhodecode/model/forms.py:232
-msgid "invalid password"
-msgstr "无效密码"
-
-#: rhodecode/model/forms.py:233
-msgid "invalid user name"
-msgstr "无效用户名"
-
-#: rhodecode/model/forms.py:234
-msgid "Your account is disabled"
-msgstr "该帐号已被禁用"
-
-#: rhodecode/model/forms.py:274
-msgid "This username is not valid"
-msgstr "该用户名不合法"
-
-#: rhodecode/model/forms.py:287
-msgid "This repository name is disallowed"
-msgstr "该版本库名称被禁用"
-
-#: rhodecode/model/forms.py:310
-#, fuzzy, python-format
-msgid "This repository already exists in a group \"%s\""
-msgstr "组中已经存在该版本库"
-
-#: rhodecode/model/forms.py:317
-#, python-format
-msgid "There is a group with this name already \"%s\""
+#: rhodecode/model/db.py:1064
+#, fuzzy
+#| msgid "repositories"
+msgid "Repository write access"
+msgstr "个版本库"
+
+#: rhodecode/model/db.py:1065
+#, fuzzy
+#| msgid "repositories"
+msgid "Repository admin access"
+msgstr "个版本库"
+
+#: rhodecode/model/db.py:1067
+#, fuzzy
+#| msgid "repositories groups"
+msgid "Repositories Group no access"
+msgstr "版本库组"
+
+#: rhodecode/model/db.py:1068
+#, fuzzy
+#| msgid "repositories groups"
+msgid "Repositories Group read access"
+msgstr "版本库组"
+
+#: rhodecode/model/db.py:1069
+#, fuzzy
+#| msgid "repositories groups"
+msgid "Repositories Group write access"
+msgstr "版本库组"
+
+#: rhodecode/model/db.py:1070
+#, fuzzy
+#| msgid "repositories groups"
+msgid "Repositories Group admin access"
+msgstr "版本库组"
+
+#: rhodecode/model/db.py:1072
+#, fuzzy
+#| msgid "Users administration"
+msgid "RhodeCode Administrator"
+msgstr "用户管理员"
+
+#: rhodecode/model/db.py:1073
+#, fuzzy
+#| msgid "Repository creation"
+msgid "Repository creation disabled"
+msgstr "建立版本库"
+
+#: rhodecode/model/db.py:1074
+#, fuzzy
+#| msgid "Repository creation"
+msgid "Repository creation enabled"
+msgstr "建立版本库"
+
+#: rhodecode/model/db.py:1075
+#, fuzzy
+#| msgid "disabled"
+msgid "Register disabled"
+msgstr "禁用"
+
+#: rhodecode/model/db.py:1076
+msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/model/forms.py:324
-msgid "This repository already exists"
-msgstr "这个版本库已经存在"
-
-#: rhodecode/model/forms.py:367
-msgid "invalid clone url"
-msgstr "无效的 clone 地址"
-
-#: rhodecode/model/forms.py:384
-msgid "Invalid clone url, provide a valid clone http\\s url"
+#: rhodecode/model/db.py:1079
+msgid "Register new user with RhodeCode with auto activation"
+msgstr ""
+
+#: rhodecode/model/db.py:1479
+msgid "Not Reviewed"
 msgstr ""
 
-#: rhodecode/model/forms.py:398
-msgid "Fork have to be the same type as original"
-msgstr "分支必须使用相同的版本库类型"
-
-#: rhodecode/model/forms.py:414
-msgid "This username or users group name is not valid"
-msgstr "用户或用户组名称无效"
-
-#: rhodecode/model/forms.py:480
-msgid "This is not a valid path"
-msgstr "不是一个合法的路径"
-
-#: rhodecode/model/forms.py:494
-msgid "This e-mail address is already taken"
-msgstr "该邮件地址已被使用"
-
-#: rhodecode/model/forms.py:507
-msgid "This e-mail address doesn't exist."
-msgstr "该邮件地址不存在"
-
-#: rhodecode/model/forms.py:530
-msgid ""
-"The LDAP Login attribute of the CN must be specified - this is the name "
-"of the attribute that is equivalent to 'username'"
+#: rhodecode/model/db.py:1480
+#, fuzzy
+#| msgid "removed"
+msgid "Approved"
+msgstr "移除"
+
+#: rhodecode/model/db.py:1481
+msgid "Rejected"
 msgstr ""
 
-#: rhodecode/model/forms.py:549
+#: rhodecode/model/db.py:1482
+msgid "Under Review"
+msgstr ""
+
+#: rhodecode/model/forms.py:43
 msgid "Please enter a login"
 msgstr "请登录"
 
-#: rhodecode/model/forms.py:550
+#: rhodecode/model/forms.py:44
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
-#: rhodecode/model/forms.py:558
+#: rhodecode/model/forms.py:52
 msgid "Please enter a password"
 msgstr "请输入密码"
 
-#: rhodecode/model/forms.py:559
+#: rhodecode/model/forms.py:53
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
-#: rhodecode/model/notification.py:175
+#: rhodecode/model/notification.py:203
 msgid "commented on commit"
 msgstr ""
 
-#: rhodecode/model/notification.py:176
+#: rhodecode/model/notification.py:204
 #, fuzzy
 msgid "sent message"
 msgstr "提交信息"
 
-#: rhodecode/model/notification.py:177
+#: rhodecode/model/notification.py:205
 msgid "mentioned you"
 msgstr ""
 
-#: rhodecode/model/notification.py:178
+#: rhodecode/model/notification.py:206
 #, fuzzy
 msgid "registered in RhodeCode"
 msgstr "成功注册到 rhodecode"
 
-#: rhodecode/model/user.py:235
+#: rhodecode/model/notification.py:207
+msgid "opened new pull request"
+msgstr ""
+
+#: rhodecode/model/notification.py:208
+msgid "commented on pull request"
+msgstr ""
+
+#: rhodecode/model/pull_request.py:75
+#, python-format
+msgid "%(user)s wants you to review pull request #%(pr_id)s"
+msgstr ""
+
+#: rhodecode/model/scm.py:489
+#, fuzzy
+#| msgid "last login"
+msgid "latest tip"
+msgstr "最后登录"
+
+#: rhodecode/model/user.py:238
 #, fuzzy
 msgid "new user registration"
 msgstr "[RhodeCode] 新用户注册"
 
-#: rhodecode/model/user.py:259 rhodecode/model/user.py:279
+#: rhodecode/model/user.py:263 rhodecode/model/user.py:284
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr "由于是系统帐号，无法编辑该用户"
 
-#: rhodecode/model/user.py:300
+#: rhodecode/model/user.py:306
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr "由于是系统帐号，无法删除该用户"
 
-#: rhodecode/model/user.py:306
+#: rhodecode/model/user.py:312
 #, fuzzy, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories. %s"
 msgstr "由于该用户拥有版本库 %s 因而无法删除，请变更版本库所有者或删除版本库"
 
+#: rhodecode/model/validators.py:52
+#, fuzzy, python-format
+#| msgid "This username already exists"
+msgid "Username \"%(username)s\" already exists"
+msgstr "该用户名已经存在"
+
+#: rhodecode/model/validators.py:54
+#, python-format
+msgid "Username \"%(username)s\" is forbidden"
+msgstr ""
+
+#: rhodecode/model/validators.py:56
+msgid ""
+"Username may only contain alphanumeric characters underscores, periods or"
+" dashes and must begin with alphanumeric character"
+msgstr "只能使用字母、数字、下划线、小数点或减号作为用户名，且必须由数字或字母开头"
+
+#: rhodecode/model/validators.py:84
+#, fuzzy, python-format
+#| msgid "This username or users group name is not valid"
+msgid "Username %(username)s is not valid"
+msgstr "用户或用户组名称无效"
+
+#: rhodecode/model/validators.py:103
+#, fuzzy
+#| msgid "invalid user name"
+msgid "Invalid users group name"
+msgstr "无效用户名"
+
+#: rhodecode/model/validators.py:104
+#, fuzzy, python-format
+#| msgid "This users group already exists"
+msgid "Users group \"%(usersgroup)s\" already exists"
+msgstr "该用户组名称已经存在"
+
+#: rhodecode/model/validators.py:106
+#, fuzzy
+#| msgid "" "RepoGroup name may only contain  alphanumeric characters
+#| underscores, " "periods or dashes and must begin with alphanumeric
+#| character"
+msgid ""
+"users group name may only contain  alphanumeric characters underscores, "
+"periods or dashes and must begin with alphanumeric character"
+msgstr "只能使用字母、数字、下划线、小数点或减号作为用户组名，且必须由数字或字母开头"
+
+#: rhodecode/model/validators.py:144
+msgid "Cannot assign this group as parent"
+msgstr ""
+
+#: rhodecode/model/validators.py:145
+#, fuzzy, python-format
+#| msgid "This username already exists"
+msgid "Group \"%(group_name)s\" already exists"
+msgstr "该用户名已经存在"
+
+#: rhodecode/model/validators.py:147
+#, fuzzy, python-format
+#| msgid "Repository with this name already exists"
+msgid "Repository with name \"%(group_name)s\" already exists"
+msgstr "这个版本库已经存在"
+
+#: rhodecode/model/validators.py:205
+#, fuzzy
+#| msgid "Invalid characters in password"
+msgid "Invalid characters (non-ascii) in password"
+msgstr "密码含有无效字符"
+
+#: rhodecode/model/validators.py:220
+msgid "Passwords do not match"
+msgstr "密码不符"
+
+#: rhodecode/model/validators.py:237
+msgid "invalid password"
+msgstr "无效密码"
+
+#: rhodecode/model/validators.py:238
+msgid "invalid user name"
+msgstr "无效用户名"
+
+#: rhodecode/model/validators.py:239
+msgid "Your account is disabled"
+msgstr "该帐号已被禁用"
+
+#: rhodecode/model/validators.py:283
+#, fuzzy, python-format
+#| msgid "This repository name is disallowed"
+msgid "Repository name %(repo)s is disallowed"
+msgstr "该版本库名称被禁用"
+
+#: rhodecode/model/validators.py:285
+#, fuzzy, python-format
+#| msgid "Repository with this name already exists"
+msgid "Repository named %(repo)s already exists"
+msgstr "这个版本库已经存在"
+
+#: rhodecode/model/validators.py:286
+#, fuzzy, python-format
+#| msgid "This repository already exists in a group \"%s\""
+msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
+msgstr "组中已经存在该版本库"
+
+#: rhodecode/model/validators.py:288
+#, fuzzy, python-format
+#| msgid "Repository with this name already exists"
+msgid "Repositories group with name \"%(repo)s\" already exists"
+msgstr "这个版本库已经存在"
+
+#: rhodecode/model/validators.py:386
+msgid "invalid clone url"
+msgstr "无效的 clone 地址"
+
+#: rhodecode/model/validators.py:387
+msgid "Invalid clone url, provide a valid clone http\\s url"
+msgstr ""
+
+#: rhodecode/model/validators.py:418
+#, fuzzy
+#| msgid "Fork have to be the same type as original"
+msgid "Fork have to be the same type as parent"
+msgstr "分支必须使用相同的版本库类型"
+
+#: rhodecode/model/validators.py:439
+msgid "This username or users group name is not valid"
+msgstr "用户或用户组名称无效"
+
+#: rhodecode/model/validators.py:509
+msgid "This is not a valid path"
+msgstr "不是一个合法的路径"
+
+#: rhodecode/model/validators.py:524
+msgid "This e-mail address is already taken"
+msgstr "该邮件地址已被使用"
+
+#: rhodecode/model/validators.py:544
+#, fuzzy, python-format
+#| msgid "This e-mail address doesn't exist."
+msgid "e-mail \"%(email)s\" does not exist."
+msgstr "该邮件地址不存在"
+
+#: rhodecode/model/validators.py:581
+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/templates/index.html:3
 msgid "Dashboard"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:6
+#: rhodecode/templates/repo_switcher_list.html:4
 #: rhodecode/templates/admin/users/user_edit_my_account.html:31
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 #: rhodecode/templates/branches/branches.html:9
-#: rhodecode/templates/journal/journal.html:31
+#: rhodecode/templates/journal/journal.html:40
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
 msgstr "快速过滤..."
@@ -1038,16 +1228,16 b' msgstr "\xe7\xbb\x84\xe5\x90\x8d"'
 #: rhodecode/templates/index_base.html:67
 #: rhodecode/templates/index_base.html:132
 #: rhodecode/templates/index_base.html:158
-#: rhodecode/templates/admin/repos/repo_add_base.html:47
-#: rhodecode/templates/admin/repos/repo_edit.html:66
+#: rhodecode/templates/admin/repos/repo_add_base.html:56
+#: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:37
 #: rhodecode/templates/admin/repos/repos.html:84
 #: 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:49
+#: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:57
-#: rhodecode/templates/summary/summary.html:100
+#: rhodecode/templates/summary/summary.html:105
 msgid "Description"
 msgstr "描述"
 
@@ -1062,20 +1252,21 b' msgstr "\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93\xe7\xbb\x84"'
 #: rhodecode/templates/admin/repos/repo_edit.html:32
 #: rhodecode/templates/admin/repos/repos.html:36
 #: rhodecode/templates/admin/repos/repos.html:82
+#: rhodecode/templates/admin/users/user_edit.html:170
 #: rhodecode/templates/admin/users/user_edit_my_account.html:49
 #: rhodecode/templates/admin/users/user_edit_my_account.html:99
 #: rhodecode/templates/admin/users/user_edit_my_account.html:165
 #: rhodecode/templates/admin/users/user_edit_my_account.html:200
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:36
+#: rhodecode/templates/branches/branches.html:51
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:50
-#: rhodecode/templates/journal/journal.html:98
-#: rhodecode/templates/journal/journal.html:177
+#: rhodecode/templates/journal/journal.html:59
+#: rhodecode/templates/journal/journal.html:107
+#: rhodecode/templates/journal/journal.html:186
 #: rhodecode/templates/settings/repo_settings.html:31
-#: rhodecode/templates/summary/summary.html:38
-#: rhodecode/templates/summary/summary.html:114
+#: rhodecode/templates/summary/summary.html:43
+#: rhodecode/templates/summary/summary.html:119
 #: rhodecode/templates/tags/tags.html:36
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
@@ -1091,26 +1282,24 b' msgstr "\xe6\x9c\x80\xe5\x90\x8e\xe4\xbf\xae\xe6\x94\xb9"'
 #: rhodecode/templates/admin/repos/repos.html:39
 #: rhodecode/templates/admin/repos/repos.html:87
 #: rhodecode/templates/admin/users/user_edit_my_account.html:167
-#: rhodecode/templates/journal/journal.html:179
+#: rhodecode/templates/journal/journal.html:188
 msgid "Tip"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:70
 #: rhodecode/templates/index_base.html:163
-#: rhodecode/templates/admin/repos/repo_edit.html:103
+#: rhodecode/templates/admin/repos/repo_edit.html:112
 #: rhodecode/templates/admin/repos/repos.html:89
 msgid "Owner"
 msgstr "所有者"
 
 #: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/journal/public_journal.html:20
-#: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:46
+#: rhodecode/templates/summary/summary.html:48
+#: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:72
-#: rhodecode/templates/journal/public_journal.html:23
 msgid "Atom"
 msgstr ""
 
@@ -1136,8 +1325,8 b' msgstr "\xe7\xbb\x84\xe5\x90\x8d"'
 #: rhodecode/templates/admin/repos/repos.html:112
 #: rhodecode/templates/admin/users/user_edit_my_account.html:186
 #: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:60
-#: rhodecode/templates/journal/journal.html:202
+#: rhodecode/templates/branches/branches.html:77
+#: rhodecode/templates/journal/journal.html:211
 #: rhodecode/templates/tags/tags.html:60
 msgid "Click to sort ascending"
 msgstr ""
@@ -1147,8 +1336,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:113
 #: rhodecode/templates/admin/users/user_edit_my_account.html:187
 #: rhodecode/templates/bookmarks/bookmarks.html:61
-#: rhodecode/templates/branches/branches.html:61
-#: rhodecode/templates/journal/journal.html:203
+#: rhodecode/templates/branches/branches.html:78
+#: rhodecode/templates/journal/journal.html:212
 #: rhodecode/templates/tags/tags.html:61
 msgid "Click to sort descending"
 msgstr ""
@@ -1163,8 +1352,8 b' msgstr "\xe6\x9c\x80\xe5\x90\x8e\xe4\xbf\xae\xe6\x94\xb9"'
 #: rhodecode/templates/admin/repos/repos.html:114
 #: rhodecode/templates/admin/users/user_edit_my_account.html:188
 #: rhodecode/templates/bookmarks/bookmarks.html:62
-#: rhodecode/templates/branches/branches.html:62
-#: rhodecode/templates/journal/journal.html:204
+#: rhodecode/templates/branches/branches.html:79
+#: rhodecode/templates/journal/journal.html:213
 #: rhodecode/templates/tags/tags.html:62
 msgid "No records found."
 msgstr ""
@@ -1173,8 +1362,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:115
 #: rhodecode/templates/admin/users/user_edit_my_account.html:189
 #: rhodecode/templates/bookmarks/bookmarks.html:63
-#: rhodecode/templates/branches/branches.html:63
-#: rhodecode/templates/journal/journal.html:205
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:214
 #: rhodecode/templates/tags/tags.html:63
 msgid "Data error."
 msgstr ""
@@ -1183,8 +1372,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:116
 #: rhodecode/templates/admin/users/user_edit_my_account.html:190
 #: rhodecode/templates/bookmarks/bookmarks.html:64
-#: rhodecode/templates/branches/branches.html:64
-#: rhodecode/templates/journal/journal.html:206
+#: rhodecode/templates/branches/branches.html:81
+#: rhodecode/templates/journal/journal.html:215
 #: rhodecode/templates/tags/tags.html:64
 #, fuzzy
 msgid "Loading..."
@@ -1204,7 +1393,7 b' msgstr "\xe7\x99\xbb\xe5\xbd\x95\xe5\x88\xb0"'
 #: 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:113
+#: rhodecode/templates/summary/summary.html:118
 msgid "Username"
 msgstr "帐号"
 
@@ -1278,7 +1467,7 b' msgstr "\xe5\xa7\x93"'
 #: rhodecode/templates/admin/users/user_add.html:77
 #: rhodecode/templates/admin/users/user_edit.html:104
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:115
+#: rhodecode/templates/summary/summary.html:120
 msgid "Email"
 msgstr "电子邮件"
 
@@ -1291,8 +1480,8 b' msgid "Your account must wait for activa'
 msgstr "管理员审核后，你注册的帐号将被启用"
 
 #: rhodecode/templates/repo_switcher_list.html:11
-#: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:76
+#: rhodecode/templates/admin/repos/repo_add_base.html:65
+#: rhodecode/templates/admin/repos/repo_edit.html:85
 #: rhodecode/templates/settings/repo_settings.html:67
 msgid "Private repository"
 msgstr "私有版本库"
@@ -1307,7 +1496,7 b' msgid "branches"'
 msgstr "分支"
 
 #: rhodecode/templates/switch_to_list.html:10
-#: rhodecode/templates/branches/branches_data.html:51
+#: rhodecode/templates/branches/branches_data.html:57
 msgid "There are no branches yet"
 msgstr "没有任何分支"
 
@@ -1343,8 +1532,8 b' msgstr "\xe7\xae\xa1\xe7\x90\x86\xe5\x91\x98\xe6\x97\xa5\xe5\xbf\x97"'
 #: rhodecode/templates/admin/repos/repos.html:90
 #: rhodecode/templates/admin/users/user_edit_my_account.html:51
 #: rhodecode/templates/admin/users/user_edit_my_account.html:52
-#: rhodecode/templates/journal/journal.html:52
-#: rhodecode/templates/journal/journal.html:53
+#: rhodecode/templates/journal/journal.html:61
+#: rhodecode/templates/journal/journal.html:62
 msgid "Action"
 msgstr "操作"
 
@@ -1355,7 +1544,7 b' msgstr "\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93"'
 #: 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:37
+#: rhodecode/templates/branches/branches.html:52
 #: rhodecode/templates/tags/tags.html:37
 #: rhodecode/templates/tags/tags_data.html:7
 msgid "Date"
@@ -1458,10 +1647,26 b' msgid "My Notifications"'
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:29
+msgid "All"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:30
+#, fuzzy
+#| msgid "commits"
+msgid "Comments"
+msgstr "提交"
+
+#: rhodecode/templates/admin/notifications/notifications.html:31
+#: rhodecode/templates/base/base.html:251
+#: rhodecode/templates/base/base.html:253
+msgid "Pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:35
 msgid "Mark all read"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/notifications_data.html:38
+#: rhodecode/templates/admin/notifications/notifications_data.html:34
 #, fuzzy
 msgid "No notifications here yet"
 msgstr "尚无操作"
@@ -1482,7 +1687,7 b' msgid "Permissions administration"'
 msgstr "权限管理"
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:116
+#: rhodecode/templates/admin/repos/repo_edit.html:125
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
 #: rhodecode/templates/admin/users/user_edit.html:139
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
@@ -1522,7 +1727,7 b' msgid "Repository creation"'
 msgstr "建立版本库"
 
 #: rhodecode/templates/admin/permissions/permissions.html:71
-#: rhodecode/templates/admin/repos/repo_edit.html:218
+#: rhodecode/templates/admin/repos/repo_edit.html:227
 msgid "set"
 msgstr "设置"
 
@@ -1539,8 +1744,8 b' msgid "Repositories"'
 msgstr "版本库"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:90
-#: rhodecode/templates/summary/summary.html:91
+#: rhodecode/templates/summary/summary.html:95
+#: rhodecode/templates/summary/summary.html:96
 msgid "Clone from"
 msgstr "clone 自"
 
@@ -1553,15 +1758,14 b' 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:41
+#: 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/admin/repos/repo_edit.html:53
-#: rhodecode/templates/settings/repo_settings.html:52
-msgid "Optional select a group to put this repository into."
+#: 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
@@ -1574,21 +1778,37 b' msgstr "\xe7\xb1\xbb\xe5\x9e\x8b"'
 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
+#, fuzzy
+#| msgid "next revision"
+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
+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:61
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:80
+#: 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:71
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:64
+#: rhodecode/templates/admin/repos/repo_add_base.html:73
 msgid "add"
 msgstr "新增"
 
@@ -1604,8 +1824,8 b' msgstr "\xe7\xbc\x96\xe8\xbe\x91\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93"'
 #: rhodecode/templates/admin/users/user_edit.html:13
 #: rhodecode/templates/admin/users/user_edit_my_account.html:71
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/files/files_source.html:32
-#: rhodecode/templates/journal/journal.html:72
+#: rhodecode/templates/files/files_source.html:44
+#: rhodecode/templates/journal/journal.html:81
 msgid "edit"
 msgstr "编辑"
 
@@ -1614,103 +1834,115 b' msgstr "\xe7\xbc\x96\xe8\xbe\x91"'
 msgid "Clone uri"
 msgstr "clone 地址"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:85
-msgid "Enable statistics"
-msgstr "启用统计"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:89
-msgid "Enable statistics window on summary page."
+#: 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 downloads"
-msgstr "启用下载"
+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:108
+#: rhodecode/templates/admin/repos/repo_edit.html:117
 #, fuzzy
 msgid "Change owner of this repository."
 msgstr "%s 库的修改"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:134
+#: rhodecode/templates/admin/repos/repo_edit.html:143
 msgid "Administration"
 msgstr "管理"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:137
+#: rhodecode/templates/admin/repos/repo_edit.html:146
 msgid "Statistics"
 msgstr "统计"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos/repo_edit.html:150
 msgid "Reset current statistics"
 msgstr "重置统计"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos/repo_edit.html:150
 msgid "Confirm to remove current statistics"
 msgstr "确认移除当前统计"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:144
+#: rhodecode/templates/admin/repos/repo_edit.html:153
 msgid "Fetched to rev"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:145
+#: rhodecode/templates/admin/repos/repo_edit.html:154
 msgid "Stats gathered"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:153
+#: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Remote"
 msgstr "远程"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:157
+#: rhodecode/templates/admin/repos/repo_edit.html:166
 msgid "Pull changes from remote location"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:157
+#: rhodecode/templates/admin/repos/repo_edit.html:166
 msgid "Confirm to pull changes from remote side"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:168
+#: rhodecode/templates/admin/repos/repo_edit.html:177
 msgid "Cache"
 msgstr "缓存"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:172
+#: rhodecode/templates/admin/repos/repo_edit.html:181
 msgid "Invalidate repository cache"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:172
+#: rhodecode/templates/admin/repos/repo_edit.html:181
 msgid "Confirm to invalidate repository cache"
 msgstr "确认清除版本库缓存"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:183
+#: rhodecode/templates/admin/repos/repo_edit.html:186
+#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:319
+msgid "Public journal"
+msgstr "公共日志"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:192
 msgid "Remove from public journal"
 msgstr "从公共日志删除"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:185
+#: rhodecode/templates/admin/repos/repo_edit.html:194
 msgid "Add to public journal"
 msgstr "添加到公共日志"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:190
+#: rhodecode/templates/admin/repos/repo_edit.html:199
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:197
-#: rhodecode/templates/changeset/changeset_file_comment.html:19
+#: rhodecode/templates/admin/repos/repo_edit.html:206
+#: rhodecode/templates/changeset/changeset_file_comment.html:26
 msgid "Delete"
 msgstr "删除"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:201
+#: rhodecode/templates/admin/repos/repo_edit.html:210
 msgid "Remove this repository"
 msgstr "删除版本库"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:201
+#: rhodecode/templates/admin/repos/repo_edit.html:210
 msgid "Confirm to delete this repository"
 msgstr "确认删除版本库"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:205
+#: rhodecode/templates/admin/repos/repo_edit.html:214
 msgid ""
 "This repository will be renamed in a special way in order to be "
 "unaccesible for RhodeCode and VCS systems.\n"
@@ -1718,12 +1950,12 b' msgid ""'
 "please do it manually"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:213
-msgid "Set as fork"
+#: rhodecode/templates/admin/repos/repo_edit.html:222
+msgid "Set as fork of"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:222
-msgid "Manually set this repository as a fork of another"
+#: rhodecode/templates/admin/repos/repo_edit.html:231
+msgid "Manually set this repository as a fork of another from the list"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
@@ -1755,11 +1987,19 b' msgstr "\xe6\x88\x90\xe5\x91\x98"'
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
 #: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/journal/journal.html:123
-#: rhodecode/templates/summary/summary.html:71
+#: rhodecode/templates/journal/journal.html:132
+#: rhodecode/templates/summary/summary.html:76
 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
+#, fuzzy
+#| msgid "delete"
+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
@@ -1787,12 +2027,13 b' msgid "Repositories administration"'
 msgstr "版本库管理员"
 
 #: rhodecode/templates/admin/repos/repos.html:40
-#: rhodecode/templates/summary/summary.html:107
+#: rhodecode/templates/summary/summary.html:112
 msgid "Contact"
 msgstr "联系方式"
 
 #: rhodecode/templates/admin/repos/repos.html:68
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+#: rhodecode/templates/admin/users/user_edit.html:222
 #: rhodecode/templates/admin/users/users.html:55
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 msgid "delete"
@@ -1850,10 +2091,12 b' msgstr "\xe7\xbc\x96\xe8\xbe\x91\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93\xe7\xbb\x84"'
 #: rhodecode/templates/admin/settings/settings.html:177
 #: rhodecode/templates/admin/users/user_edit.html:130
 #: rhodecode/templates/admin/users/user_edit.html:155
+#: rhodecode/templates/admin/users/user_edit.html:245
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:116
 #: rhodecode/templates/files/files_add.html:82
 #: rhodecode/templates/files/files_edit.html:68
+#: rhodecode/templates/pullrequests/pullrequest.html:135
 #: rhodecode/templates/settings/repo_settings.html:85
 msgid "Reset"
 msgstr "重置"
@@ -1893,7 +2136,6 b' msgstr "\xe8\xae\xbe\xe7\xbd\xae\xe7\xae\xa1\xe7\x90\x86\xe5\x91\x98"'
 
 #: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:9
-#: rhodecode/templates/settings/repo_settings.html:5
 #: rhodecode/templates/settings/repo_settings.html:13
 msgid "Settings"
 msgstr "设置"
@@ -2112,6 +2354,37 b' msgstr ""'
 msgid "Create repositories"
 msgstr "创建版本库"
 
+#: rhodecode/templates/admin/users/user_edit.html:171
+#: rhodecode/templates/admin/users/user_edit_my_account.html:100
+#: rhodecode/templates/admin/users/user_edit_my_account.html:201
+#, fuzzy
+msgid "Permission"
+msgstr "权限"
+
+#: rhodecode/templates/admin/users/user_edit.html:210
+#, fuzzy
+#| msgid "Email address"
+msgid "Email addresses"
+msgstr "邮件地址"
+
+#: rhodecode/templates/admin/users/user_edit.html:223
+#, fuzzy, python-format
+#| msgid "Confirm to delete this user: %s"
+msgid "Confirm to delete this email: %s"
+msgstr "确认删除该用户"
+
+#: rhodecode/templates/admin/users/user_edit.html:237
+#, fuzzy
+#| msgid "Email address"
+msgid "New email address"
+msgstr "邮件地址"
+
+#: rhodecode/templates/admin/users/user_edit.html:244
+#, fuzzy
+#| msgid "add"
+msgid "Add"
+msgstr "新增"
+
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
 #: rhodecode/templates/base/base.html:124
 msgid "My account"
@@ -2122,7 +2395,7 b' msgid "My Account"'
 msgstr "我的账户"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:32
-#: rhodecode/templates/journal/journal.html:32
+#: rhodecode/templates/journal/journal.html:41
 #, fuzzy
 msgid "My repos"
 msgstr "空版本库"
@@ -2133,7 +2406,7 b' msgid "My permissions"'
 msgstr "权限"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:37
-#: rhodecode/templates/journal/journal.html:37
+#: rhodecode/templates/journal/journal.html:46
 #, fuzzy
 msgid "ADD"
 msgstr "新增"
@@ -2141,34 +2414,28 b' msgstr "\xe6\x96\xb0\xe5\xa2\x9e"'
 #: rhodecode/templates/admin/users/user_edit_my_account.html:50
 #: rhodecode/templates/bookmarks/bookmarks.html:40
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:40
-#: rhodecode/templates/journal/journal.html:51
+#: rhodecode/templates/branches/branches.html:55
+#: rhodecode/templates/journal/journal.html:60
 #: rhodecode/templates/tags/tags.html:40
 #: rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr "修订"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:71
-#: rhodecode/templates/journal/journal.html:72
+#: rhodecode/templates/journal/journal.html:81
 msgid "private"
 msgstr "私有"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:81
-#: rhodecode/templates/journal/journal.html:85
+#: rhodecode/templates/journal/journal.html:94
 msgid "No repositories yet"
 msgstr "没有任何版本库"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:83
-#: rhodecode/templates/journal/journal.html:87
+#: rhodecode/templates/journal/journal.html:96
 msgid "create one now"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:100
-#: rhodecode/templates/admin/users/user_edit_my_account.html:201
-#, fuzzy
-msgid "Permission"
-msgstr "权限"
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "用户管理员"
@@ -2239,6 +2506,7 b' msgid "Choosen group members"'
 msgstr "选择组成员"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:61
+#: rhodecode/templates/pullrequests/pullrequest.html:81
 msgid "Remove all elements"
 msgstr "移除全部项目"
 
@@ -2247,6 +2515,7 b' msgid "Available members"'
 msgstr "启用成员"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:79
+#: rhodecode/templates/pullrequests/pullrequest.html:99
 msgid "Add all elements"
 msgstr "添加全部项目"
 
@@ -2299,18 +2568,37 b' msgid "Inbox"'
 msgstr ""
 
 #: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:289
-#: rhodecode/templates/base/base.html:291
-#: rhodecode/templates/base/base.html:293
+#: rhodecode/templates/base/base.html:297
+#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:301
+#: 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:298
-#: rhodecode/templates/base/base.html:300
-#: rhodecode/templates/base/base.html:302
+#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:308
+#: rhodecode/templates/base/base.html:310
 #: rhodecode/templates/journal/journal.html:4
-#: rhodecode/templates/journal/journal.html:17
+#: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr "日志"
@@ -2338,14 +2626,12 b' msgstr ""'
 #: rhodecode/templates/data_table/_dt_elements.html:9
 #: rhodecode/templates/data_table/_dt_elements.html:11
 #: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/summary/summary.html:4
 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:6
 #: rhodecode/templates/changelog/changelog.html:15
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
@@ -2365,7 +2651,6 b' msgstr "\xe5\x88\x87\xe6\x8d\xa2\xe5\x88\xb0"'
 #: rhodecode/templates/data_table/_dt_elements.html:25
 #: rhodecode/templates/data_table/_dt_elements.html:27
 #: rhodecode/templates/data_table/_dt_elements.html:29
-#: rhodecode/templates/files/files.html:4
 #: rhodecode/templates/files/files.html:40
 msgid "Files"
 msgstr "档案"
@@ -2391,10 +2676,6 b' msgstr ""'
 msgid "search"
 msgstr "搜索"
 
-#: rhodecode/templates/base/base.html:217
-msgid "journal"
-msgstr "日志"
-
 #: rhodecode/templates/base/base.html:219
 msgid "repositories groups"
 msgstr "版本库组"
@@ -2413,22 +2694,18 b' msgstr "\xe6\x9d\x83\xe9\x99\x90"'
 
 #: rhodecode/templates/base/base.html:235
 #: rhodecode/templates/base/base.html:237
-#: rhodecode/templates/followers/followers.html:5
 msgid "Followers"
 msgstr "跟随者"
 
 #: rhodecode/templates/base/base.html:243
 #: rhodecode/templates/base/base.html:245
-#: rhodecode/templates/forks/forks.html:5
 msgid "Forks"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:316
-#: rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:320
-#: rhodecode/templates/search/search.html:4
-#: rhodecode/templates/search/search.html:24
-#: rhodecode/templates/search/search.html:46
+#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:328
+#: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "搜索"
 
@@ -2438,13 +2715,13 b' msgid "add another comment"'
 msgstr "添加成员"
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:111
-#: rhodecode/templates/summary/summary.html:52
+#: rhodecode/templates/journal/journal.html:120
+#: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr "停止跟随该版本库"
 
 #: rhodecode/templates/base/root.html:44
-#: rhodecode/templates/summary/summary.html:56
+#: rhodecode/templates/summary/summary.html:61
 msgid "Start following this repository"
 msgstr "开始跟随该版本库"
 
@@ -2452,19 +2729,48 b' msgstr "\xe5\xbc\x80\xe5\xa7\x8b\xe8\xb7\x9f\xe9\x9a\x8f\xe8\xaf\xa5\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93"'
 msgid "Group"
 msgstr "组"
 
+#: rhodecode/templates/base/root.html:47
+msgid "search truncated"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:48
+msgid "no matching files"
+msgstr "没有符合的文件"
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
-msgid "Bookmarks"
+#, python-format
+msgid "%s Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.html:39
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:39
+#: rhodecode/templates/branches/branches.html:54
 #: rhodecode/templates/tags/tags.html:39
 #: rhodecode/templates/tags/tags_data.html:8
 #, fuzzy
 msgid "Author"
 msgstr "作者"
 
+#: rhodecode/templates/branches/branches.html:5
+#, fuzzy, python-format
+#| msgid "branches"
+msgid "%s Branches"
+msgstr "分支"
+
+#: rhodecode/templates/branches/branches.html:29
+#, fuzzy
+#| msgid "branches"
+msgid "Compare branches"
+msgstr "分支"
+
+#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/compare/compare_diff.html:5
+#: rhodecode/templates/compare/compare_diff.html:13
+#, fuzzy
+#| msgid "Compare View"
+msgid "Compare"
+msgstr "比较显示"
+
 #: rhodecode/templates/branches/branches_data.html:7
 msgid "date"
 msgstr "日期"
@@ -2479,42 +2785,80 b' msgstr "\xe4\xbd\x9c\xe8\x80\x85"'
 msgid "revision"
 msgstr "修订"
 
+#: rhodecode/templates/branches/branches_data.html:10
+#, fuzzy
+#| msgid "Compare View"
+msgid "compare"
+msgstr "比较显示"
+
+#: rhodecode/templates/changelog/changelog.html:6
+#, fuzzy, python-format
+#| msgid "Changelog"
+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] ""
 
-#: rhodecode/templates/changelog/changelog.html:38
+#: rhodecode/templates/changelog/changelog.html:37
+#, python-format
+msgid "compare fork with %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:37
+msgid "Compare fork"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:39
+msgid "Open new pull request"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:44
 msgid "Show"
 msgstr "显示"
 
-#: rhodecode/templates/changelog/changelog.html:64
-#: rhodecode/templates/summary/summary.html:352
+#: rhodecode/templates/changelog/changelog.html:70
+#: rhodecode/templates/summary/summary.html:357
 msgid "show more"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:68
+#: rhodecode/templates/changelog/changelog.html:74
 msgid "Affected number of files, click to show more details"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:82
-#: rhodecode/templates/changeset/changeset.html:72
+#: rhodecode/templates/changelog/changelog.html:87
+#: rhodecode/templates/changeset/changeset.html:38
+#: rhodecode/templates/changeset/changeset_file_comment.html:20
+#: rhodecode/templates/changeset/changeset_range.html:46
+#, fuzzy
+#| msgid "Changesets"
+msgid "Changeset status"
+msgstr "变更集"
+
+#: rhodecode/templates/changelog/changelog.html:90
+msgid "Click to open associated pull request"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:100
+#: rhodecode/templates/changeset/changeset.html:78
 msgid "Parent"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:88
-#: rhodecode/templates/changeset/changeset.html:78
+#: rhodecode/templates/changelog/changelog.html:106
+#: rhodecode/templates/changeset/changeset.html:84
 msgid "No parents"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:93
-#: rhodecode/templates/changeset/changeset.html:82
+#: rhodecode/templates/changelog/changelog.html:111
+#: rhodecode/templates/changeset/changeset.html:88
 msgid "merge"
 msgstr "合并"
 
-#: rhodecode/templates/changelog/changelog.html:96
-#: rhodecode/templates/changeset/changeset.html:85
+#: rhodecode/templates/changelog/changelog.html:114
+#: rhodecode/templates/changeset/changeset.html:91
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_add.html:33
 #: rhodecode/templates/files/files_edit.html:33
@@ -2522,134 +2866,158 b' msgstr "\xe5\x90\x88\xe5\xb9\xb6"'
 msgid "branch"
 msgstr "分支"
 
-#: rhodecode/templates/changelog/changelog.html:102
+#: rhodecode/templates/changelog/changelog.html:120
 msgid "bookmark"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:108
-#: rhodecode/templates/changeset/changeset.html:90
+#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changeset/changeset.html:96
 msgid "tag"
 msgstr "标签"
 
-#: rhodecode/templates/changelog/changelog.html:144
+#: rhodecode/templates/changelog/changelog.html:162
 msgid "Show selected changes __S -> __E"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:235
+#: rhodecode/templates/changelog/changelog.html:253
 msgid "There are no changes yet"
 msgstr "没有任何变更"
 
-#: rhodecode/templates/changelog/changelog_details.html:2
-#: rhodecode/templates/changeset/changeset.html:60
+#: rhodecode/templates/changelog/changelog_details.html:4
+#: rhodecode/templates/changeset/changeset.html:66
 msgid "removed"
 msgstr "移除"
 
-#: rhodecode/templates/changelog/changelog_details.html:3
-#: rhodecode/templates/changeset/changeset.html:61
+#: rhodecode/templates/changelog/changelog_details.html:5
+#: rhodecode/templates/changeset/changeset.html:67
 msgid "changed"
 msgstr "修改"
 
-#: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:62
+#: rhodecode/templates/changelog/changelog_details.html:6
+#: rhodecode/templates/changeset/changeset.html:68
 msgid "added"
 msgstr "添加"
 
-#: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changelog/changelog_details.html:7
 #: rhodecode/templates/changelog/changelog_details.html:8
-#: rhodecode/templates/changeset/changeset.html:64
-#: rhodecode/templates/changeset/changeset.html:65
-#: rhodecode/templates/changeset/changeset.html:66
+#: 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
 #, python-format
 msgid "affected %s files"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:6
+#, fuzzy, python-format
+#| msgid "No changes"
+msgid "%s Changeset"
+msgstr "无变更"
+
 #: rhodecode/templates/changeset/changeset.html:14
 msgid "Changeset"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:37
+#: rhodecode/templates/changeset/changeset.html:43
 #: rhodecode/templates/changeset/diff_block.html:20
 msgid "raw diff"
 msgstr "原始 diff"
 
-#: rhodecode/templates/changeset/changeset.html:38
+#: rhodecode/templates/changeset/changeset.html:44
 #: rhodecode/templates/changeset/diff_block.html:21
 msgid "download diff"
 msgstr "下载 diff"
 
-#: rhodecode/templates/changeset/changeset.html:42
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+#: rhodecode/templates/changeset/changeset.html:48
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, fuzzy, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "提交"
 
-#: rhodecode/templates/changeset/changeset.html:42
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+#: rhodecode/templates/changeset/changeset.html:48
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
 msgstr[0] ""
 
-#: rhodecode/templates/changeset/changeset.html:97
+#: rhodecode/templates/changeset/changeset.html:103
 #, python-format
 msgid "%s files affected with %s insertions and %s deletions:"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:113
+#: rhodecode/templates/changeset/changeset.html:119
 msgid "Changeset was too big and was cut off..."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:35
+#: rhodecode/templates/changeset/changeset_file_comment.html:42
 msgid "Submitting..."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:38
+#: rhodecode/templates/changeset/changeset_file_comment.html:45
 msgid "Commenting on line {1}."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:39
-#: rhodecode/templates/changeset/changeset_file_comment.html:102
+#: rhodecode/templates/changeset/changeset_file_comment.html:46
+#: rhodecode/templates/changeset/changeset_file_comment.html:115
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:41
-#: rhodecode/templates/changeset/changeset_file_comment.html:104
+#: rhodecode/templates/changeset/changeset_file_comment.html:48
+#: rhodecode/templates/changeset/changeset_file_comment.html:117
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:49
-#: rhodecode/templates/changeset/changeset_file_comment.html:110
+#: rhodecode/templates/changeset/changeset_file_comment.html:59
+#: rhodecode/templates/changeset/changeset_file_comment.html:132
 #, fuzzy
 msgid "Comment"
 msgstr "提交"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:50
-#: rhodecode/templates/changeset/changeset_file_comment.html:61
+#: 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:57
+#: rhodecode/templates/changeset/changeset_file_comment.html:67
 #, fuzzy
 msgid "You need to be logged in to comment."
 msgstr "必须登录才能访问该页面"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:57
+#: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "Login now"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:99
+#: rhodecode/templates/changeset/changeset_file_comment.html:112
 msgid "Leave a comment"
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset_file_comment.html:118
+msgid "Check this to change current status of code-review for this changeset"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:118
+#, fuzzy
+#| msgid "Changesets"
+msgid "change status"
+msgstr "变更集"
+
+#: rhodecode/templates/changeset/changeset_range.html:5
+#, fuzzy, python-format
+#| msgid "Changesets"
+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:49
+#: rhodecode/templates/changeset/changeset_range.html:54
+#: rhodecode/templates/compare/compare_diff.html:41
+#: rhodecode/templates/pullrequests/pullrequest_show.html:71
 msgid "Files affected"
 msgstr ""
 
@@ -2662,34 +3030,45 b' msgstr ""'
 msgid "show inline comments"
 msgstr "文件内容"
 
+#: rhodecode/templates/compare/compare_cs.html:5
+#, fuzzy
+#| msgid "No changesets yet"
+msgid "No changesets"
+msgstr "尚无修订"
+
+#: rhodecode/templates/compare/compare_diff.html:37
+#, fuzzy
+#| msgid "No changesets yet"
+msgid "Outgoing changesets"
+msgstr "尚无修订"
+
 #: rhodecode/templates/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 #: rhodecode/templates/data_table/_dt_elements.html:37
-#: rhodecode/templates/forks/fork.html:5
 msgid "Fork"
 msgstr "分支"
 
 #: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/journal/journal.html:117
-#: rhodecode/templates/summary/summary.html:63
+#: rhodecode/templates/journal/journal.html:126
+#: rhodecode/templates/summary/summary.html:68
 msgid "Mercurial repository"
 msgstr "Mercurial 版本库"
 
 #: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/journal/journal.html:119
-#: rhodecode/templates/summary/summary.html:66
+#: rhodecode/templates/journal/journal.html:128
+#: rhodecode/templates/summary/summary.html:71
 msgid "Git repository"
 msgstr "Git 版本库"
 
 #: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/journal/journal.html:125
-#: rhodecode/templates/summary/summary.html:73
+#: rhodecode/templates/journal/journal.html:134
+#: rhodecode/templates/summary/summary.html:78
 msgid "public repository"
 msgstr "公共版本库"
 
 #: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/summary/summary.html:82
-#: rhodecode/templates/summary/summary.html:83
+#: rhodecode/templates/summary/summary.html:87
+#: rhodecode/templates/summary/summary.html:88
 msgid "Fork of"
 msgstr ""
 
@@ -2701,32 +3080,37 b' msgstr "\xe5\xb0\x9a\xe6\x97\xa0\xe4\xbf\xae\xe8\xae\xa2"'
 msgid "This is an notification from RhodeCode."
 msgstr ""
 
-#: rhodecode/templates/errors/error_document.html:44
+#: 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
+#, fuzzy, python-format
+#| msgid "File diff"
+msgid "%s File diff"
+msgstr "文件 diff"
+
 #: rhodecode/templates/files/file_diff.html:12
 msgid "File diff"
 msgstr "文件 diff"
 
+#: rhodecode/templates/files/files.html:4
+#, fuzzy, python-format
+#| msgid "files"
+msgid "%s Files"
+msgstr "文件"
+
 #: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:328
+#: rhodecode/templates/summary/summary.html:333
 msgid "files"
 msgstr "文件"
 
-#: rhodecode/templates/files/files.html:44
-msgid "search truncated"
-msgstr ""
-
-#: rhodecode/templates/files/files.html:45
-msgid "no matching files"
-msgstr "没有符合的文件"
-
 #: rhodecode/templates/files/files_add.html:4
 #: rhodecode/templates/files/files_edit.html:4
-msgid "Edit file"
+#, fuzzy, python-format
+#| msgid "edit file"
+msgid "%s Edit file"
 msgstr "编辑文件"
 
 #: rhodecode/templates/files/files_add.html:19
@@ -2838,18 +3222,18 b' msgid "edit file"'
 msgstr "编辑文件"
 
 #: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:26
+#: rhodecode/templates/files/files_source.html:38
 msgid "show annotation"
 msgstr "显示注释"
 
 #: rhodecode/templates/files/files_edit.html:50
-#: rhodecode/templates/files/files_source.html:28
-#: rhodecode/templates/files/files_source.html:56
+#: rhodecode/templates/files/files_source.html:40
+#: rhodecode/templates/files/files_source.html:68
 msgid "show as raw"
 msgstr "显示原始文件"
 
 #: rhodecode/templates/files/files_edit.html:51
-#: rhodecode/templates/files/files_source.html:29
+#: rhodecode/templates/files/files_source.html:41
 msgid "download as raw"
 msgstr "下载原始文件"
 
@@ -2867,20 +3251,39 b' msgstr "\xe7\xbc\x96\xe8\xbe\x91\xe6\x96\x87\xe4\xbb\xb6"'
 msgid "History"
 msgstr "历史"
 
-#: rhodecode/templates/files/files_source.html:24
+#: rhodecode/templates/files/files_source.html:9
+#, fuzzy
+#| msgid "next revision"
+msgid "diff to revision"
+msgstr "下一个修订"
+
+#: rhodecode/templates/files/files_source.html:10
+#, fuzzy
+#| msgid "next revision"
+msgid "show at revision"
+msgstr "下一个修订"
+
+#: rhodecode/templates/files/files_source.html:14
+#, fuzzy, python-format
+#| msgid "author"
+msgid "%s author"
+msgid_plural "%s authors"
+msgstr[0] "作者"
+
+#: rhodecode/templates/files/files_source.html:36
 msgid "show source"
 msgstr "显示代码"
 
-#: rhodecode/templates/files/files_source.html:47
+#: rhodecode/templates/files/files_source.html:59
 #, python-format
 msgid "Binary file (%s)"
 msgstr "二进制文件（%s）"
 
-#: rhodecode/templates/files/files_source.html:56
+#: rhodecode/templates/files/files_source.html:68
 msgid "File is too big to display"
 msgstr "文件过大，不能显示"
 
-#: rhodecode/templates/files/files_source.html:112
+#: rhodecode/templates/files/files_source.html:124
 msgid "Selection link"
 msgstr ""
 
@@ -2897,35 +3300,63 b' msgstr ""'
 msgid "No files at given path"
 msgstr ""
 
+#: rhodecode/templates/followers/followers.html:5
+#, fuzzy, python-format
+#| msgid "followers"
+msgid "%s Followers"
+msgstr "跟随者"
+
 #: rhodecode/templates/followers/followers.html:13
 msgid "followers"
 msgstr "跟随者"
 
 #: rhodecode/templates/followers/followers_data.html:12
-msgid "Started following"
+#, fuzzy
+#| msgid "Started following"
+msgid "Started following -"
 msgstr "开始跟随"
 
+#: rhodecode/templates/forks/fork.html:5
+#, fuzzy, python-format
+#| msgid "forks"
+msgid "%s Fork"
+msgstr "分支"
+
 #: rhodecode/templates/forks/fork.html:31
 msgid "Fork name"
 msgstr "分支名"
 
-#: rhodecode/templates/forks/fork.html:57
+#: rhodecode/templates/forks/fork.html:68
 msgid "Private"
 msgstr "私有"
 
-#: rhodecode/templates/forks/fork.html:65
+#: rhodecode/templates/forks/fork.html:77
 #, fuzzy
 msgid "Copy permissions"
 msgstr "权限"
 
-#: rhodecode/templates/forks/fork.html:73
+#: 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:80
+#: 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
+#, fuzzy, python-format
+#| msgid "forks"
+msgid "%s Forks"
+msgstr "分支"
+
 #: rhodecode/templates/forks/forks.html:13
 msgid "forks"
 msgstr "分支"
@@ -2938,24 +3369,49 b' msgstr "\xe5\xb7\xb2\xe6\x9c\x89\xe5\x88\x86\xe6\x94\xaf"'
 msgid "There are no forks yet"
 msgstr "尚未有任何分支"
 
-#: rhodecode/templates/journal/journal.html:20
+#: rhodecode/templates/journal/journal.html:13
+#, fuzzy, python-format
+#| msgid "%s public journal %s feed"
+msgid "ATOM journal feed"
+msgstr "公共日志 %s %s 订阅"
+
+#: rhodecode/templates/journal/journal.html:14
+#, fuzzy, python-format
+#| msgid "%s public journal %s feed"
+msgid "RSS journal feed"
+msgstr "公共日志 %s %s 订阅"
+
+#: rhodecode/templates/journal/journal.html:24
+#: rhodecode/templates/pullrequests/pullrequest.html:27
 msgid "Refresh"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:32
+#: rhodecode/templates/journal/journal.html:27
+#: rhodecode/templates/journal/public_journal.html:24
+#, fuzzy, python-format
+#| msgid "%s %s feed"
+msgid "RSS feed"
+msgstr "%s %s 订阅"
+
+#: rhodecode/templates/journal/journal.html:30
+#: rhodecode/templates/journal/public_journal.html:27
+msgid "ATOM feed"
+msgstr ""
+
+#: rhodecode/templates/journal/journal.html:41
 #, fuzzy
 msgid "Watched"
 msgstr "缓存"
 
-#: rhodecode/templates/journal/journal.html:105
+#: rhodecode/templates/journal/journal.html:114
 msgid "following user"
 msgstr "跟随中用户"
 
-#: rhodecode/templates/journal/journal.html:105
+#: rhodecode/templates/journal/journal.html:114
 msgid "user"
 msgstr "用户"
 
-#: rhodecode/templates/journal/journal.html:138
+#: rhodecode/templates/journal/journal.html:147
 msgid "You are not following any users or repositories"
 msgstr "尚未跟随任何用户或版本库"
 
@@ -2963,33 +3419,147 b' msgstr "\xe5\xb0\x9a\xe6\x9c\xaa\xe8\xb7\x9f\xe9\x9a\x8f\xe4\xbb\xbb\xe4\xbd\x95\xe7\x94\xa8\xe6\x88\xb7\xe6\x88\x96\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93"'
 msgid "No entries yet"
 msgstr ""
 
-#: rhodecode/templates/journal/public_journal.html:17
+#: rhodecode/templates/journal/public_journal.html:13
+#, fuzzy, python-format
+#| msgid "%s public journal %s feed"
+msgid "ATOM public journal feed"
+msgstr "公共日志 %s %s 订阅"
+
+#: rhodecode/templates/journal/public_journal.html:14
+#, fuzzy, python-format
+#| msgid "%s public journal %s feed"
+msgid "RSS public journal feed"
+msgstr "公共日志 %s %s 订阅"
+
+#: rhodecode/templates/journal/public_journal.html:21
 msgid "Public Journal"
 msgstr "公共日志"
 
-#: rhodecode/templates/search/search.html:7
-#: rhodecode/templates/search/search.html:26
-msgid "in repository: "
+#: rhodecode/templates/pullrequests/pullrequest.html:4
+#: rhodecode/templates/pullrequests/pullrequest.html:12
+msgid "New pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:28
+msgid "refresh overview"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:66
+#, fuzzy
+#| msgid "Compare View"
+msgid "Detailed compare view"
+msgstr "比较显示"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:70
+#: rhodecode/templates/pullrequests/pullrequest_show.html:40
+msgid "Pull request reviewers"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:78
+msgid "Chosen reviewers"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:95
+#, fuzzy
+#| msgid "Available members"
+msgid "Available reviewers"
+msgstr "启用成员"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:108
+#, fuzzy
+#| msgid "Create new file"
+msgid "Create new pull request"
+msgstr "创建用户 %s"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:117
+#: rhodecode/templates/pullrequests/pullrequest_show.html:23
+#, fuzzy
+#| msgid "write"
+msgid "Title"
+msgstr "写"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:126
+#, fuzzy
+#| msgid "Description"
+msgid "description"
+msgstr "描述"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:134
+msgid "Send pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:4
+#: rhodecode/templates/pullrequests/pullrequest_show.html:12
+#, python-format
+msgid "Pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:26
+msgid "Pull request status"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:33
+#, fuzzy
+#| msgid "[created] user"
+msgid "Created on"
+msgstr "创建用户 %s"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:63
+#, fuzzy
+#| msgid "Compare View"
+msgid "Compare view"
+msgstr "比较显示"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:67
+#, fuzzy
+#| msgid "No changesets yet"
+msgid "Incoming changesets"
+msgstr "尚无修订"
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
+msgid "All pull requests"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:6
+#, fuzzy, python-format
+#| msgid "in repository: "
+msgid "Search \"%s\" in repository: %s"
 msgstr "在版本库："
 
-#: rhodecode/templates/search/search.html:9
-#: rhodecode/templates/search/search.html:28
-msgid "in all repositories"
+#: rhodecode/templates/search/search.html:8
+#, fuzzy, python-format
+#| msgid "in all repositories"
+msgid "Search \"%s\" in all repositories"
 msgstr "在所有的版本库"
 
-#: rhodecode/templates/search/search.html:42
+#: rhodecode/templates/search/search.html:12
+#: rhodecode/templates/search/search.html:32
+#, fuzzy, python-format
+#| msgid "in repository: "
+msgid "Search in repository: %s"
+msgstr "在版本库："
+
+#: rhodecode/templates/search/search.html:14
+#: rhodecode/templates/search/search.html:34
+#, fuzzy
+#| msgid "in all repositories"
+msgid "Search in all repositories"
+msgstr "在所有的版本库"
+
+#: rhodecode/templates/search/search.html:48
 msgid "Search term"
 msgstr "搜索短语"
 
-#: rhodecode/templates/search/search.html:54
+#: rhodecode/templates/search/search.html:60
 msgid "Search in"
 msgstr "搜索范围"
 
-#: rhodecode/templates/search/search.html:57
+#: rhodecode/templates/search/search.html:63
 msgid "File contents"
 msgstr "文件内容"
 
-#: rhodecode/templates/search/search.html:59
+#: rhodecode/templates/search/search.html:65
 msgid "File names"
 msgstr "文件名"
 
@@ -2998,9 +3568,16 b' msgstr "\xe6\x96\x87\xe4\xbb\xb6\xe5\x90\x8d"'
 msgid "Permission denied"
 msgstr "权限不足"
 
+#: rhodecode/templates/settings/repo_settings.html:5
+#, fuzzy, python-format
+#| msgid "settings"
+msgid "%s Settings"
+msgstr "设置"
+
 #: rhodecode/templates/shortlog/shortlog.html:5
-#: rhodecode/templates/summary/summary.html:209
-msgid "Shortlog"
+#, fuzzy, python-format
+#| msgid "shortlog"
+msgid "%s Shortlog"
 msgstr "简短日志"
 
 #: rhodecode/templates/shortlog/shortlog.html:14
@@ -3029,125 +3606,184 b' msgstr ""'
 msgid "Existing repository?"
 msgstr "Git 版本库"
 
+#: rhodecode/templates/summary/summary.html:4
+#, fuzzy, python-format
+#| msgid "summary"
+msgid "%s Summary"
+msgstr "概要"
+
 #: rhodecode/templates/summary/summary.html:12
 msgid "summary"
 msgstr "概要"
 
-#: rhodecode/templates/summary/summary.html:44
-#: rhodecode/templates/summary/summary.html:47
+#: rhodecode/templates/summary/summary.html:20
+#, fuzzy, python-format
+#| msgid "Subscribe to %s atom feed"
+msgid "repo %s ATOM feed"
+msgstr "订阅 atom %s"
+
+#: rhodecode/templates/summary/summary.html:21
+#, fuzzy, python-format
+#| msgid "Subscribe to %s rss feed"
+msgid "repo %s RSS feed"
+msgstr "订阅 rss %s"
+
+#: rhodecode/templates/summary/summary.html:49
+#: rhodecode/templates/summary/summary.html:52
 #, fuzzy
 msgid "ATOM"
 msgstr "作者"
 
-#: rhodecode/templates/summary/summary.html:77
+#: rhodecode/templates/summary/summary.html:82
 #, fuzzy, python-format
 msgid "Non changable ID %s"
 msgstr "无变更"
 
-#: rhodecode/templates/summary/summary.html:82
+#: rhodecode/templates/summary/summary.html:87
 msgid "public"
 msgstr "公共"
 
-#: rhodecode/templates/summary/summary.html:90
+#: rhodecode/templates/summary/summary.html:95
 msgid "remote clone"
 msgstr "远程 clone"
 
-#: rhodecode/templates/summary/summary.html:121
+#: rhodecode/templates/summary/summary.html:126
 msgid "Clone url"
 msgstr "clone 地址"
 
-#: rhodecode/templates/summary/summary.html:124
+#: rhodecode/templates/summary/summary.html:129
 msgid "Show by Name"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:125
+#: rhodecode/templates/summary/summary.html:130
 msgid "Show by ID"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:133
+#: rhodecode/templates/summary/summary.html:138
 #, fuzzy
 msgid "Trending files"
 msgstr "编辑文件"
 
-#: rhodecode/templates/summary/summary.html:141
-#: rhodecode/templates/summary/summary.html:157
-#: rhodecode/templates/summary/summary.html:185
+#: rhodecode/templates/summary/summary.html:146
+#: rhodecode/templates/summary/summary.html:162
+#: rhodecode/templates/summary/summary.html:190
 msgid "enable"
 msgstr "启用"
 
-#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/templates/summary/summary.html:154
 msgid "Download"
 msgstr "下载"
 
-#: rhodecode/templates/summary/summary.html:153
+#: rhodecode/templates/summary/summary.html:158
 msgid "There are no downloads yet"
 msgstr "尚无任何下载"
 
-#: rhodecode/templates/summary/summary.html:155
+#: rhodecode/templates/summary/summary.html:160
 msgid "Downloads are disabled for this repository"
 msgstr "这个版本库的下载已经禁用"
 
-#: rhodecode/templates/summary/summary.html:164
+#: rhodecode/templates/summary/summary.html:166
+#, fuzzy
+#| msgid "download as raw"
+msgid "Download as zip"
+msgstr "下载原始文件"
+
+#: rhodecode/templates/summary/summary.html:169
 msgid "Check this to download archive with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:164
+#: rhodecode/templates/summary/summary.html:169
 msgid "with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:177
+#: rhodecode/templates/summary/summary.html:182
 msgid "Commit activity by day / author"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:188
+#: rhodecode/templates/summary/summary.html:193
 msgid "Stats gathered: "
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:211
+#: rhodecode/templates/summary/summary.html:214
+msgid "Shortlog"
+msgstr "简短日志"
+
+#: rhodecode/templates/summary/summary.html:216
 #, fuzzy
 msgid "Quick start"
 msgstr "快速过滤..."
 
-#: rhodecode/templates/summary/summary.html:281
+#: rhodecode/templates/summary/summary.html:286
 #, python-format
 msgid "Download %s as %s"
 msgstr "下载 %s 作为 %s"
 
-#: rhodecode/templates/summary/summary.html:638
+#: rhodecode/templates/summary/summary.html:643
 msgid "commits"
 msgstr "提交"
 
-#: rhodecode/templates/summary/summary.html:639
+#: rhodecode/templates/summary/summary.html:644
 msgid "files added"
 msgstr "文件已添加"
 
-#: rhodecode/templates/summary/summary.html:640
+#: rhodecode/templates/summary/summary.html:645
 msgid "files changed"
 msgstr "文件已更改"
 
-#: rhodecode/templates/summary/summary.html:641
+#: rhodecode/templates/summary/summary.html:646
 msgid "files removed"
 msgstr "文件已删除"
 
-#: rhodecode/templates/summary/summary.html:644
+#: rhodecode/templates/summary/summary.html:649
 msgid "commit"
 msgstr "提交"
 
-#: rhodecode/templates/summary/summary.html:645
+#: rhodecode/templates/summary/summary.html:650
 msgid "file added"
 msgstr "文件已添加"
 
-#: rhodecode/templates/summary/summary.html:646
+#: rhodecode/templates/summary/summary.html:651
 msgid "file changed"
 msgstr "文件已更改"
 
-#: rhodecode/templates/summary/summary.html:647
+#: rhodecode/templates/summary/summary.html:652
 msgid "file removed"
 msgstr "文件已删除"
 
-#~ msgid "[committed via RhodeCode] into"
+#: rhodecode/templates/tags/tags.html:5
+#, fuzzy, python-format
+#| msgid "%s ago"
+msgid "%s Tags"
+msgstr "之前"
+
+#~ msgid "Invalid username"
+#~ msgstr "非法的用户名"
+
+#~ msgid "Invalid group name"
+#~ msgstr "非法的用户组名称"
+
+#~ msgid "This group already exists"
+#~ msgstr "该组已经存在"
+
+#~ msgid "This username is not valid"
+#~ msgstr "该用户名不合法"
+
+#~ msgid "There is a group with this name already \"%s\""
 #~ msgstr ""
 
-#~ msgid "[pulled from remote] into"
+#~ msgid ""
+#~ "The LDAP Login attribute of the CN"
+#~ " must be specified - this is "
+#~ "the name of the attribute that is"
+#~ " equivalent to 'username'"
 #~ msgstr ""
 
+#~ msgid "Set as fork"
+#~ msgstr ""
+
+#~ msgid "Manually set this repository as a fork of another"
+#~ msgstr ""
+
+#~ msgid "Edit file"
+#~ msgstr "编辑文件"
+