diff --git a/kallithea/i18n/kallithea.pot b/kallithea/i18n/kallithea.pot
--- a/kallithea/i18n/kallithea.pot
+++ b/kallithea/i18n/kallithea.pot
@@ -1,14 +1,14 @@
 # Translations template for Kallithea.
-# Copyright (C) 2015 Various authors, licensing as GPLv3
+# Copyright (C) 2017 Various authors, licensing as GPLv3
 # This file is distributed under the same license as the Kallithea project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Kallithea 0.3\n"
+"Project-Id-Version: Kallithea 0.3.2\n"
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
-"POT-Creation-Date: 2015-09-08 10:34+0200\n"
+"POT-Creation-Date: 2017-07-25 16:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "There are no changesets yet"
 msgstr ""
 
-#: kallithea/controllers/changelog.py:166
+#: kallithea/controllers/changelog.py:165
 #: kallithea/controllers/admin/permissions.py:61
 #: kallithea/controllers/admin/permissions.py:65
 #: kallithea/controllers/admin/permissions.py:69
@@ -33,7 +33,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196
+#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196
 msgid "(closed)"
 msgstr ""
 
@@ -142,7 +142,7 @@ msgid "This repository has been locked b
 msgstr ""
 
 #: kallithea/controllers/files.py:317
-msgid "You can only delete files with revision being a valid branch "
+msgid "You can only delete files with revision being a valid branch"
 msgstr ""
 
 #: kallithea/controllers/files.py:328
@@ -161,7 +161,7 @@ msgid "Error occurred during commit"
 msgstr ""
 
 #: kallithea/controllers/files.py:377
-msgid "You can only edit files with revision being a valid branch "
+msgid "You can only edit files with revision being a valid branch"
 msgstr ""
 
 #: kallithea/controllers/files.py:391
@@ -280,23 +280,23 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197
+#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192
 msgid "Bad captcha"
 msgstr ""
 
-#: kallithea/controllers/login.py:157
+#: kallithea/controllers/login.py:152
 msgid "You have successfully registered into Kallithea"
 msgstr ""
 
-#: kallithea/controllers/login.py:202
+#: kallithea/controllers/login.py:197
 msgid "A password reset confirmation code has been sent"
 msgstr ""
 
+#: kallithea/controllers/login.py:246
+msgid "Invalid password reset token"
+msgstr ""
+
 #: kallithea/controllers/login.py:251
-msgid "Invalid password reset token"
-msgstr ""
-
-#: kallithea/controllers/login.py:256
 #: kallithea/controllers/admin/my_account.py:167
 msgid "Successfully updated password"
 msgstr ""
@@ -342,7 +342,7 @@ msgstr ""
 
 #: kallithea/controllers/pullrequests.py:366
 #: kallithea/controllers/pullrequests.py:453
-#: kallithea/controllers/pullrequests.py:509
+#: kallithea/controllers/pullrequests.py:510
 #, python-format
 msgid "Invalid reviewer \"%s\" specified"
 msgstr ""
@@ -384,46 +384,46 @@ msgstr ""
 msgid "Pull request update created"
 msgstr ""
 
-#: kallithea/controllers/pullrequests.py:513
+#: kallithea/controllers/pullrequests.py:514
 msgid "Pull request updated"
 msgstr ""
 
-#: kallithea/controllers/pullrequests.py:528
+#: kallithea/controllers/pullrequests.py:529
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: kallithea/controllers/pullrequests.py:594
+#: kallithea/controllers/pullrequests.py:595
 #, python-format
 msgid "This pull request has already been merged to %s."
 msgstr ""
 
-#: kallithea/controllers/pullrequests.py:596
+#: kallithea/controllers/pullrequests.py:597
 msgid "This pull request has been closed and can not be updated."
 msgstr ""
 
-#: kallithea/controllers/pullrequests.py:614
+#: kallithea/controllers/pullrequests.py:615
 #, python-format
 msgid "This pull request can be updated with changes on %s:"
 msgstr ""
 
-#: kallithea/controllers/pullrequests.py:617
+#: kallithea/controllers/pullrequests.py:619
 msgid "No changesets found for updating this pull request."
 msgstr ""
 
-#: kallithea/controllers/pullrequests.py:625
+#: kallithea/controllers/pullrequests.py:627
 #, python-format
 msgid "Note: Branch %s has another head: %s."
 msgstr ""
 
-#: kallithea/controllers/pullrequests.py:631
+#: kallithea/controllers/pullrequests.py:633
 msgid "Git pull requests don't support updates yet."
 msgstr ""
 
-#: kallithea/controllers/pullrequests.py:722
+#: kallithea/controllers/pullrequests.py:724
 msgid "No permission to change pull request status"
 msgstr ""
 
-#: kallithea/controllers/pullrequests.py:727
+#: kallithea/controllers/pullrequests.py:729
 msgid "Closing."
 msgstr ""
 
@@ -657,7 +657,7 @@ msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655
-#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701
+#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702
 msgid "Manual activation of external account"
 msgstr ""
 
@@ -669,7 +669,7 @@ msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656
-#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702
+#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703
 msgid "Automatic activation of external account"
 msgstr ""
 
@@ -882,48 +882,53 @@ msgid "Unable to activate hgsubversion s
 msgstr ""
 
 #: kallithea/controllers/admin/settings.py:180
-#: kallithea/controllers/admin/settings.py:277
+#: kallithea/controllers/admin/settings.py:284
 msgid "Error occurred while updating application settings"
 msgstr ""
 
-#: kallithea/controllers/admin/settings.py:216
+#: kallithea/controllers/admin/settings.py:211
 #, python-format
 msgid "Repositories successfully rescanned. Added: %s. Removed: %s."
 msgstr ""
 
-#: kallithea/controllers/admin/settings.py:273
+#: kallithea/controllers/admin/settings.py:226
+#, python-format
+msgid "Invalidated %s repositories"
+msgstr ""
+
+#: kallithea/controllers/admin/settings.py:280
 msgid "Updated application settings"
 msgstr ""
 
-#: kallithea/controllers/admin/settings.py:330
+#: kallithea/controllers/admin/settings.py:337
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: kallithea/controllers/admin/settings.py:335
+#: kallithea/controllers/admin/settings.py:342
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
-#: kallithea/controllers/admin/settings.py:361
+#: kallithea/controllers/admin/settings.py:368
 msgid "Please enter email address"
 msgstr ""
 
-#: kallithea/controllers/admin/settings.py:376
+#: kallithea/controllers/admin/settings.py:383
 msgid "Send email task created"
 msgstr ""
 
-#: kallithea/controllers/admin/settings.py:407
+#: kallithea/controllers/admin/settings.py:414
 msgid "Added new hook"
 msgstr ""
 
-#: kallithea/controllers/admin/settings.py:421
+#: kallithea/controllers/admin/settings.py:428
 msgid "Updated hooks"
 msgstr ""
 
-#: kallithea/controllers/admin/settings.py:425
+#: kallithea/controllers/admin/settings.py:432
 msgid "Error occurred during hook creation"
 msgstr ""
 
-#: kallithea/controllers/admin/settings.py:451
+#: kallithea/controllers/admin/settings.py:458
 msgid "Whoosh reindex task scheduled"
 msgstr ""
 
@@ -1012,20 +1017,24 @@ msgstr ""
 msgid "Removed IP address from user whitelist"
 msgstr ""
 
-#: kallithea/lib/auth.py:743
+#: kallithea/lib/auth.py:744
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 
-#: kallithea/lib/auth.py:756
+#: kallithea/lib/auth.py:757
 msgid "Invalid API key"
 msgstr ""
 
-#: kallithea/lib/auth.py:812
+#: kallithea/lib/auth.py:785
+msgid "CSRF token leak has been detected - all form tokens have been expired"
+msgstr ""
+
+#: kallithea/lib/auth.py:832
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: kallithea/lib/auth.py:844
+#: kallithea/lib/auth.py:864
 msgid "You need to be signed in to view this page"
 msgstr ""
 
@@ -1033,8 +1042,9 @@ msgstr ""
 msgid "Repository not found in the filesystem"
 msgstr ""
 
-#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622
-msgid "Changeset not found"
+#: kallithea/lib/base.py:516
+#, python-format
+msgid "Changeset for %s %s not found in %s"
 msgstr ""
 
 #: kallithea/lib/diffs.py:66
@@ -1049,160 +1059,165 @@ msgstr ""
 msgid "No changes detected"
 msgstr ""
 
-#: kallithea/lib/helpers.py:609
+#: kallithea/lib/helpers.py:610
 #, python-format
 msgid "Deleted branch: %s"
 msgstr ""
 
-#: kallithea/lib/helpers.py:611
+#: kallithea/lib/helpers.py:612
 #, python-format
 msgid "Created tag: %s"
 msgstr ""
 
-#: kallithea/lib/helpers.py:671
+#: kallithea/lib/helpers.py:623
+#, python-format
+msgid "Changeset %s not found"
+msgstr ""
+
+#: kallithea/lib/helpers.py:672
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr ""
 
-#: kallithea/lib/helpers.py:677
+#: kallithea/lib/helpers.py:678
 msgid "Compare view"
 msgstr ""
 
-#: kallithea/lib/helpers.py:696
-msgid "and"
-msgstr ""
-
 #: kallithea/lib/helpers.py:697
+msgid "and"
+msgstr ""
+
+#: kallithea/lib/helpers.py:698
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44
+#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44
 msgid "revisions"
 msgstr ""
 
-#: kallithea/lib/helpers.py:722
+#: kallithea/lib/helpers.py:723
 #, python-format
 msgid "Fork name %s"
 msgstr ""
 
-#: kallithea/lib/helpers.py:742
+#: kallithea/lib/helpers.py:743
 #, python-format
 msgid "Pull request %s"
 msgstr ""
 
-#: kallithea/lib/helpers.py:752
+#: kallithea/lib/helpers.py:753
 msgid "[deleted] repository"
 msgstr ""
 
-#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766
+#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767
 msgid "[created] repository"
 msgstr ""
 
-#: kallithea/lib/helpers.py:756
+#: kallithea/lib/helpers.py:757
 msgid "[created] repository as fork"
 msgstr ""
 
-#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768
+#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769
 msgid "[forked] repository"
 msgstr ""
 
-#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770
+#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771
 msgid "[updated] repository"
 msgstr ""
 
-#: kallithea/lib/helpers.py:762
+#: kallithea/lib/helpers.py:763
 msgid "[downloaded] archive from repository"
 msgstr ""
 
-#: kallithea/lib/helpers.py:764
+#: kallithea/lib/helpers.py:765
 msgid "[delete] repository"
 msgstr ""
 
-#: kallithea/lib/helpers.py:772
+#: kallithea/lib/helpers.py:773
 msgid "[created] user"
 msgstr ""
 
-#: kallithea/lib/helpers.py:774
+#: kallithea/lib/helpers.py:775
 msgid "[updated] user"
 msgstr ""
 
-#: kallithea/lib/helpers.py:776
+#: kallithea/lib/helpers.py:777
 msgid "[created] user group"
 msgstr ""
 
-#: kallithea/lib/helpers.py:778
+#: kallithea/lib/helpers.py:779
 msgid "[updated] user group"
 msgstr ""
 
-#: kallithea/lib/helpers.py:780
+#: kallithea/lib/helpers.py:781
 msgid "[commented] on revision in repository"
 msgstr ""
 
-#: kallithea/lib/helpers.py:782
+#: kallithea/lib/helpers.py:783
 msgid "[commented] on pull request for"
 msgstr ""
 
-#: kallithea/lib/helpers.py:784
+#: kallithea/lib/helpers.py:785
 msgid "[closed] pull request for"
 msgstr ""
 
-#: kallithea/lib/helpers.py:786
+#: kallithea/lib/helpers.py:787
 msgid "[pushed] into"
 msgstr ""
 
-#: kallithea/lib/helpers.py:788
+#: kallithea/lib/helpers.py:789
 msgid "[committed via Kallithea] into repository"
 msgstr ""
 
-#: kallithea/lib/helpers.py:790
+#: kallithea/lib/helpers.py:791
 msgid "[pulled from remote] into repository"
 msgstr ""
 
-#: kallithea/lib/helpers.py:792
+#: kallithea/lib/helpers.py:793
 msgid "[pulled] from"
 msgstr ""
 
-#: kallithea/lib/helpers.py:794
+#: kallithea/lib/helpers.py:795
 msgid "[started following] repository"
 msgstr ""
 
-#: kallithea/lib/helpers.py:796
+#: kallithea/lib/helpers.py:797
 msgid "[stopped following] repository"
 msgstr ""
 
-#: kallithea/lib/helpers.py:1124
+#: kallithea/lib/helpers.py:1125
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: kallithea/lib/helpers.py:1128
+#: kallithea/lib/helpers.py:1129
 #: kallithea/templates/compare/compare_diff.html:65
 #: kallithea/templates/pullrequests/pullrequest_show.html:326
 msgid "No files"
 msgstr ""
 
-#: kallithea/lib/helpers.py:1194
+#: kallithea/lib/helpers.py:1195
 msgid "new file"
 msgstr ""
 
-#: kallithea/lib/helpers.py:1197
+#: kallithea/lib/helpers.py:1198
 msgid "mod"
 msgstr ""
 
-#: kallithea/lib/helpers.py:1200
+#: kallithea/lib/helpers.py:1201
 msgid "del"
 msgstr ""
 
-#: kallithea/lib/helpers.py:1203
+#: kallithea/lib/helpers.py:1204
 msgid "rename"
 msgstr ""
 
-#: kallithea/lib/helpers.py:1208
+#: kallithea/lib/helpers.py:1209
 msgid "chmod"
 msgstr ""
 
-#: kallithea/lib/helpers.py:1444
+#: kallithea/lib/helpers.py:1445
 #, 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 ""
@@ -1368,7 +1383,7 @@ msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
-#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665
+#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666
 msgid "Kallithea Administrator"
 msgstr ""
 
@@ -1479,7 +1494,7 @@ msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155
-#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229
+#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239
 msgid "Approved"
 msgstr ""
 
@@ -1494,7 +1509,7 @@ msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156
-#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230
+#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240
 msgid "Rejected"
 msgstr ""
 
@@ -1521,7 +1536,7 @@ msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471
-#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514
+#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515
 msgid "top level"
 msgstr ""
 
@@ -1668,7 +1683,7 @@ msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651
-#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697
+#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698
 msgid "Registration disabled"
 msgstr ""
 
@@ -1695,12 +1710,12 @@ msgid "User Registration with automatic 
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645
-#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691
+#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692
 msgid "Repository creation enabled with write permission to a repository group"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646
-#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692
+#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693
 msgid "Repository creation disabled with write permission to a repository group"
 msgstr ""
 
@@ -1713,99 +1728,99 @@ msgstr ""
 msgid "[Mention]"
 msgstr ""
 
-#: kallithea/model/db.py:1667
+#: kallithea/model/db.py:1668
 msgid "Default user has no access to new repositories"
 msgstr ""
 
-#: kallithea/model/db.py:1668
-msgid "Default user has read access to new repositories"
-msgstr ""
-
 #: kallithea/model/db.py:1669
-msgid "Default user has write access to new repositories"
+msgid "Default user has read access to new repositories"
 msgstr ""
 
 #: kallithea/model/db.py:1670
+msgid "Default user has write access to new repositories"
+msgstr ""
+
+#: kallithea/model/db.py:1671
 msgid "Default user has admin access to new repositories"
 msgstr ""
 
-#: kallithea/model/db.py:1672
-msgid "Default user has no access to new repository groups"
-msgstr ""
-
 #: kallithea/model/db.py:1673
-msgid "Default user has read access to new repository groups"
+msgid "Default user has no access to new repository groups"
 msgstr ""
 
 #: kallithea/model/db.py:1674
-msgid "Default user has write access to new repository groups"
+msgid "Default user has read access to new repository groups"
 msgstr ""
 
 #: kallithea/model/db.py:1675
+msgid "Default user has write access to new repository groups"
+msgstr ""
+
+#: kallithea/model/db.py:1676
 msgid "Default user has admin access to new repository groups"
 msgstr ""
 
-#: kallithea/model/db.py:1677
-msgid "Default user has no access to new user groups"
-msgstr ""
-
 #: kallithea/model/db.py:1678
-msgid "Default user has read access to new user groups"
+msgid "Default user has no access to new user groups"
 msgstr ""
 
 #: kallithea/model/db.py:1679
-msgid "Default user has write access to new user groups"
+msgid "Default user has read access to new user groups"
 msgstr ""
 
 #: kallithea/model/db.py:1680
+msgid "Default user has write access to new user groups"
+msgstr ""
+
+#: kallithea/model/db.py:1681
 msgid "Default user has admin access to new user groups"
 msgstr ""
 
-#: kallithea/model/db.py:1682
-msgid "Only admins can create repository groups"
-msgstr ""
-
 #: kallithea/model/db.py:1683
+msgid "Only admins can create repository groups"
+msgstr ""
+
+#: kallithea/model/db.py:1684
 msgid "Non-admins can create repository groups"
 msgstr ""
 
-#: kallithea/model/db.py:1685
-msgid "Only admins can create user groups"
-msgstr ""
-
 #: kallithea/model/db.py:1686
+msgid "Only admins can create user groups"
+msgstr ""
+
+#: kallithea/model/db.py:1687
 msgid "Non-admins can create user groups"
 msgstr ""
 
-#: kallithea/model/db.py:1688
-msgid "Only admins can create top level repositories"
-msgstr ""
-
 #: kallithea/model/db.py:1689
+msgid "Only admins can create top level repositories"
+msgstr ""
+
+#: kallithea/model/db.py:1690
 msgid "Non-admins can create top level repositories"
 msgstr ""
 
-#: kallithea/model/db.py:1694
-msgid "Only admins can fork repositories"
-msgstr ""
-
 #: kallithea/model/db.py:1695
-msgid "Non-admins can can fork repositories"
-msgstr ""
-
-#: kallithea/model/db.py:1698
-msgid "User registration with manual account activation"
+msgid "Only admins can fork repositories"
+msgstr ""
+
+#: kallithea/model/db.py:1696
+msgid "Non-admins can fork repositories"
 msgstr ""
 
 #: kallithea/model/db.py:1699
+msgid "User registration with manual account activation"
+msgstr ""
+
+#: kallithea/model/db.py:1700
 msgid "User registration with automatic account activation"
 msgstr ""
 
-#: kallithea/model/db.py:2228
+#: kallithea/model/db.py:2238
 msgid "Not reviewed"
 msgstr ""
 
-#: kallithea/model/db.py:2231
+#: kallithea/model/db.py:2241
 msgid "Under review"
 msgstr ""
 
@@ -1831,87 +1846,87 @@ msgstr ""
 msgid "Name must not contain only digits"
 msgstr ""
 
-#: kallithea/model/notification.py:254
+#: kallithea/model/notification.py:255
 #, python-format
 msgid "%(user)s commented on changeset %(age)s"
 msgstr ""
 
-#: kallithea/model/notification.py:255
-#, python-format
-msgid "%(user)s sent message %(age)s"
-msgstr ""
-
 #: kallithea/model/notification.py:256
 #, python-format
-msgid "%(user)s mentioned you %(age)s"
+msgid "%(user)s sent message %(age)s"
 msgstr ""
 
 #: kallithea/model/notification.py:257
 #, python-format
-msgid "%(user)s registered in Kallithea %(age)s"
+msgid "%(user)s mentioned you %(age)s"
 msgstr ""
 
 #: kallithea/model/notification.py:258
 #, python-format
-msgid "%(user)s opened new pull request %(age)s"
+msgid "%(user)s registered in Kallithea %(age)s"
 msgstr ""
 
 #: kallithea/model/notification.py:259
 #, python-format
+msgid "%(user)s opened new pull request %(age)s"
+msgstr ""
+
+#: kallithea/model/notification.py:260
+#, python-format
 msgid "%(user)s commented on pull request %(age)s"
 msgstr ""
 
-#: kallithea/model/notification.py:266
-#, python-format
-msgid "%(user)s commented on changeset at %(when)s"
-msgstr ""
-
 #: kallithea/model/notification.py:267
 #, python-format
-msgid "%(user)s sent message at %(when)s"
+msgid "%(user)s commented on changeset at %(when)s"
 msgstr ""
 
 #: kallithea/model/notification.py:268
 #, python-format
-msgid "%(user)s mentioned you at %(when)s"
+msgid "%(user)s sent message at %(when)s"
 msgstr ""
 
 #: kallithea/model/notification.py:269
 #, python-format
-msgid "%(user)s registered in Kallithea at %(when)s"
+msgid "%(user)s mentioned you at %(when)s"
 msgstr ""
 
 #: kallithea/model/notification.py:270
 #, python-format
-msgid "%(user)s opened new pull request at %(when)s"
+msgid "%(user)s registered in Kallithea at %(when)s"
 msgstr ""
 
 #: kallithea/model/notification.py:271
 #, python-format
+msgid "%(user)s opened new pull request at %(when)s"
+msgstr ""
+
+#: kallithea/model/notification.py:272
+#, python-format
 msgid "%(user)s commented on pull request at %(when)s"
 msgstr ""
 
-#: kallithea/model/notification.py:302
+#: kallithea/model/notification.py:303
 #, python-format
 msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s"
 msgstr ""
 
-#: kallithea/model/notification.py:305
+#: kallithea/model/notification.py:306
 #, python-format
 msgid "New user %(new_username)s registered"
 msgstr ""
 
-#: kallithea/model/notification.py:307
-#, python-format
-msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s"
-msgstr ""
-
 #: kallithea/model/notification.py:308
 #, python-format
+msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s"
+msgstr ""
+
+#: kallithea/model/notification.py:309
+#, python-format
 msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s"
 msgstr ""
 
-#: kallithea/model/notification.py:321
+#: kallithea/model/notification.py:322
 msgid "Closing"
 msgstr ""
 
@@ -3476,6 +3491,11 @@ msgstr ""
 msgid "Unlock Repository"
 msgstr ""
 
+#: kallithea/templates/admin/repos/repo_edit_advanced.html:56
+#, python-format
+msgid "Locked by %s on %s"
+msgstr ""
+
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:60
 msgid "Confirm to lock repository."
 msgstr ""
@@ -4605,7 +4625,7 @@ msgstr ""
 msgid "Branch %s"
 msgstr ""
 
-#: kallithea/templates/changelog/changelog.html:310
+#: kallithea/templates/changelog/changelog.html:309
 msgid "There are no changes yet"
 msgstr ""
 
@@ -5551,7 +5571,7 @@ msgstr ""
 
 #: kallithea/templates/pullrequests/pullrequest_show_all.html:11
 #, python-format
-msgid "Pull Requests from %s'"
+msgid "Pull Requests from '%s'"
 msgstr ""
 
 #: kallithea/templates/pullrequests/pullrequest_show_all.html:13